ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent geometry level from removing objects

Browse Source 
The latest version was bugged as it removed all standard objects, but removing only objects marked by track-makers removed almost nothing of note, and bugs would sometimes remove normal objects. Fix #5052. Fix #5066. This makes #5063 moot.
This commit is contained in:
Alayan 2024-05-06 22:59:58 +02:00
parent df803c18b8
commit 553595fa63
No known key found for this signature in database
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/states_screens/dialogs/custom_video_settings.cpp
View File

@ -72,7 +72,7 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
particles_effects->setValue(UserConfigParams::m_particles_effects); particles_effects->setValue(UserConfigParams::m_particles_effects);
SpinnerWidget* geometry_level = getWidget<SpinnerWidget>("geometry_detail"); SpinnerWidget* geometry_level = getWidget<SpinnerWidget>("geometry_detail");
//I18N: Geometry level disabled : lowest level, no details, Level-of-Details distances are low //I18N: Geometry level disabled : lowest level, Level-of-Details distances are very low
geometry_level->addLabel(_("Very Low")); geometry_level->addLabel(_("Very Low"));
//I18N: Geometry level low : everything is displayed, Level-of-Details distances are low //I18N: Geometry level low : everything is displayed, Level-of-Details distances are low
geometry_level->addLabel(_("Low")); geometry_level->addLabel(_("Low"));

7
src/tracks/track.cpp
View File

@ -2376,13 +2376,6 @@ void Track::loadObjects(const XMLNode* root, const std::string& path,
if (name == "track" || name == "default-start") continue; if (name == "track" || name == "default-start") continue;
if (name == "object" || name == "library") if (name == "object" || name == "library")
{ {
int geo_level = 0;
node->get("geometry-level", &geo_level);
// Only remove objects in the "very low" geometry detail level.
// Other levels are used for LoD distance
if (UserConfigParams::m_geometry_level == 2 && geo_level >= 0 &&
!NetworkConfig::get()->isNetworking())
continue;
m_track_object_manager->add(*node, parent, model_def_loader, parent_library); m_track_object_manager->add(*node, parent, model_def_loader, parent_library);
} }
else if (name == "water") else if (name == "water")