Skip to content

Fix #4070: Prevent vehicle tuning models from spinning when created via createBuilding #5360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iManGaaX wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

Fix #4070: Prevent vehicle tuning models from spinning when created via createBuilding #5360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Client/game_sa/CBuildingsPoolSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ CBuilding* CBuildingsPoolSA::AddBuilding(CClientBuilding* pClientBuilding, uint1
if (prevGroup != MODEL_PROPERTIES_GROUP_STATIC)
modelInfo->SetObjectPropertiesGroup(MODEL_PROPERTIES_GROUP_STATIC);

// Fix vehicle tuning models (e.g. exh_*) spinning endlessly. Their model info flags get misread as special types (like CRANE) in LoadObjectInstance,
// causing PreRender to rewrite their matrix each frame.
auto* pModelInterface = modelInfo->GetInterface();
const bool bVehicleTuningPart = pModelInterface && modelInfo->GetModelType() == eModelInfoType::ATOMIC && pModelInterface->bWetRoadReflection;
const auto prevSpecialType = bVehicleTuningPart ? pModelInterface->eSpecialModelType : eModelSpecialType::NONE;

if (prevSpecialType != eModelSpecialType::NONE)
pModelInterface->eSpecialModelType = eModelSpecialType::NONE;

// Load building
SFileObjectInstance instance{};
instance.modelID = modelId;
Expand All @@ -99,9 +108,11 @@ CBuilding* CBuildingsPoolSA::AddBuilding(CClientBuilding* pClientBuilding, uint1
pBuilding->m_pLod = nullptr;
pBuilding->m_iplIndex = 0;

// Restore changed properties group
// Restore changed properties group and special model type
if (prevGroup != MODEL_PROPERTIES_GROUP_STATIC)
modelInfo->SetObjectPropertiesGroup(prevGroup);
if (prevSpecialType != eModelSpecialType::NONE)
pModelInterface->eSpecialModelType = prevSpecialType;

// Always stream model collosion
// TODO We can setup collison bounding box and use GTA streamer for it
Expand Down
Loading