From ec3ded75b8b7ad2ab4d596a68755b6d4c2d5abc0 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 6 Aug 2015 18:35:56 +0200 Subject: [PATCH] Removed unused LOD level setting --- po/colobot.pot | 3 --- po/de.po | 6 ++--- po/fr.po | 6 ++--- po/pl.po | 6 ++--- po/ru.po | 6 ++--- src/common/event.cpp | 1 - src/common/event.h | 1 - src/common/restext.cpp | 1 - src/common/settings.cpp | 4 --- src/graphics/engine/engine.cpp | 13 --------- src/graphics/engine/engine.h | 7 ----- src/ui/screen/screen_setup_graphics.cpp | 35 ------------------------- 12 files changed, 12 insertions(+), 77 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 9dddaae3..d850ee55 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -354,9 +354,6 @@ msgstr "" msgid "Render distance\\Maximum visibility" msgstr "" -msgid "Details\\Visual quality of 3D objects" -msgstr "" - msgid "Num of decorative objects\\Number of purely ornamental objects" msgstr "" diff --git a/po/de.po b/po/de.po index d4f60ade..404aabf2 100644 --- a/po/de.po +++ b/po/de.po @@ -485,9 +485,6 @@ msgstr "Gebäude sprengen" msgid "Destroyer" msgstr "Einstampfer" -msgid "Details\\Visual quality of 3D objects" -msgstr "Details\\Detailliertheit der Objekte in 3D" - msgid "Device\\Driver and resolution settings" msgstr "Bildschirm\\Driver und Bildschirmauflösung" @@ -1854,6 +1851,9 @@ msgstr "www.epsitec.com" #~ msgid "Delete" #~ msgstr "Zerstören" +#~ msgid "Details\\Visual quality of 3D objects" +#~ msgstr "Details\\Detailliertheit der Objekte in 3D" + #~ msgid "Developed by :" #~ msgstr "Entwickelt von:" diff --git a/po/fr.po b/po/fr.po index 11e05097..06d5b3cd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -480,9 +480,6 @@ msgstr "Démolit le bâtiment" msgid "Destroyer" msgstr "Destructeur" -msgid "Details\\Visual quality of 3D objects" -msgstr "Détails des objets\\Qualité des objets en 3D" - msgid "Device\\Driver and resolution settings" msgstr "Affichage\\Pilote et résolution d'affichage" @@ -1850,6 +1847,9 @@ msgstr "www.epsitec.com" #~ msgid "Delete" #~ msgstr "Détruire" +#~ msgid "Details\\Visual quality of 3D objects" +#~ msgstr "Détails des objets\\Qualité des objets en 3D" + #~ msgid "Developed by :" #~ msgstr "Développé par :" diff --git a/po/pl.po b/po/pl.po index 9d745c9b..299d62ea 100644 --- a/po/pl.po +++ b/po/pl.po @@ -487,9 +487,6 @@ msgstr "Zniszcz budynek" msgid "Destroyer" msgstr "Destroyer" -msgid "Details\\Visual quality of 3D objects" -msgstr "Szczegóły\\Jakość wizualna obiektów 3D" - msgid "Device\\Driver and resolution settings" msgstr "Urządzenie\\Ustawienia sterownika i rozdzielczości" @@ -1845,6 +1842,9 @@ msgstr "www.epsitec.com" #~ msgid "Delete" #~ msgstr "Usuń" +#~ msgid "Details\\Visual quality of 3D objects" +#~ msgstr "Szczegóły\\Jakość wizualna obiektów 3D" + #~ msgid "Do you want to quit Colobot: Gold Edition?" #~ msgstr "Czy na pewno chcesz opuścić grę Colobot: Gold Edition?" diff --git a/po/ru.po b/po/ru.po index 236a23eb..69582c78 100644 --- a/po/ru.po +++ b/po/ru.po @@ -479,9 +479,6 @@ msgstr "Уничтожить здание" msgid "Destroyer" msgstr "Уничтожитель" -msgid "Details\\Visual quality of 3D objects" -msgstr "Детали\\Визуальное качество 3D-объектов" - msgid "Device\\Driver and resolution settings" msgstr "Устройство\\Драйвер и настройки разрешения" @@ -1846,6 +1843,9 @@ msgstr "www.epsitec.com" #~ msgid "Delete" #~ msgstr "Удалить" +#~ msgid "Details\\Visual quality of 3D objects" +#~ msgstr "Детали\\Визуальное качество 3D-объектов" + #~ msgid "Developed by :" #~ msgstr "Разработка :" diff --git a/src/common/event.cpp b/src/common/event.cpp index b34cc958..c7fc4e35 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -200,7 +200,6 @@ void InitializeEventTypeTexts() EVENT_TYPE_TEXT[EVENT_INTERFACE_LIGHT] = "EVENT_INTERFACE_LIGHT"; EVENT_TYPE_TEXT[EVENT_INTERFACE_PARTI] = "EVENT_INTERFACE_PARTI"; EVENT_TYPE_TEXT[EVENT_INTERFACE_CLIP] = "EVENT_INTERFACE_CLIP"; - EVENT_TYPE_TEXT[EVENT_INTERFACE_DETAIL] = "EVENT_INTERFACE_DETAIL"; EVENT_TYPE_TEXT[EVENT_INTERFACE_RAIN] = "EVENT_INTERFACE_RAIN"; EVENT_TYPE_TEXT[EVENT_INTERFACE_GLINT] = "EVENT_INTERFACE_GLINT"; EVENT_TYPE_TEXT[EVENT_INTERFACE_TOOLTIP] = "EVENT_INTERFACE_TOOLTIP"; diff --git a/src/common/event.h b/src/common/event.h index 63a56281..bc8f1629 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -222,7 +222,6 @@ enum EventType EVENT_INTERFACE_LIGHT = 457, EVENT_INTERFACE_PARTI = 458, EVENT_INTERFACE_CLIP = 459, - EVENT_INTERFACE_DETAIL = 460, EVENT_INTERFACE_RAIN = 462, EVENT_INTERFACE_GLINT = 463, EVENT_INTERFACE_TOOLTIP = 464, diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 92e43993..6dae1e71 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -189,7 +189,6 @@ void InitializeRestext() stringsEvent[EVENT_INTERFACE_LIGHT] = TR("Dynamic lighting\\Mobile light sources"); stringsEvent[EVENT_INTERFACE_PARTI] = TR("Number of particles\\Explosions, dust, reflections, etc."); stringsEvent[EVENT_INTERFACE_CLIP] = TR("Render distance\\Maximum visibility"); - stringsEvent[EVENT_INTERFACE_DETAIL] = TR("Details\\Visual quality of 3D objects"); stringsEvent[EVENT_INTERFACE_GADGET] = TR("Num of decorative objects\\Number of purely ornamental objects"); stringsEvent[EVENT_INTERFACE_RAIN] = TR("Particles in the interface\\Steam clouds and sparks in the interface"); stringsEvent[EVENT_INTERFACE_GLINT] = TR("Reflections on the buttons \\Shiny buttons"); diff --git a/src/common/settings.cpp b/src/common/settings.cpp index e986198a..6fc73400 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -98,7 +98,6 @@ void CSettings::SaveSettings() GetConfigFile().SetIntProperty("Setup", "UseJoystick", app->GetJoystickEnabled() ? app->GetJoystick().index : -1); GetConfigFile().SetFloatProperty("Setup", "ParticleDensity", engine->GetParticleDensity()); GetConfigFile().SetFloatProperty("Setup", "ClippingDistance", engine->GetClippingDistance()); - GetConfigFile().SetFloatProperty("Setup", "ObjectDetail", engine->GetObjectDetail()); GetConfigFile().SetFloatProperty("Setup", "GadgetQuantity", engine->GetGadgetQuantity()); GetConfigFile().SetIntProperty("Setup", "AudioVolume", sound->GetAudioVolume()); GetConfigFile().SetIntProperty("Setup", "MusicVolume", sound->GetMusicVolume()); @@ -249,9 +248,6 @@ void CSettings::LoadSettings() if (GetConfigFile().GetFloatProperty("Setup", "ClippingDistance", fValue)) engine->SetClippingDistance(fValue); - if (GetConfigFile().GetFloatProperty("Setup", "ObjectDetail", fValue)) - engine->SetObjectDetail(fValue); - if (GetConfigFile().GetFloatProperty("Setup", "GadgetQuantity", fValue)) engine->SetGadgetQuantity(fValue); diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index bb1e987a..4f3dca53 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -128,7 +128,6 @@ CEngine::CEngine(CApplication *app) m_particleDensity = 1.0f; m_lastClippingDistance = 1.0f; m_clippingDistance = 1.0f; - m_objectDetail = 1.0f; m_terrainVision = 1000.0f; m_gadgetQuantity = 1.0f; m_textureMipmapLevel = 1; @@ -2838,18 +2837,6 @@ float CEngine::GetClippingDistance() return m_clippingDistance; } -void CEngine::SetObjectDetail(float value) -{ - if ( value < 0.0f ) value = 0.0f; - if ( value > 2.0f ) value = 2.0f; - m_objectDetail = value; -} - -float CEngine::GetObjectDetail() -{ - return m_objectDetail; -} - void CEngine::SetGadgetQuantity(float value) { if (value < 0.0f) value = 0.0f; diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h index 19492b8e..dbd59fce 100644 --- a/src/graphics/engine/engine.h +++ b/src/graphics/engine/engine.h @@ -1055,12 +1055,6 @@ public: float GetClippingDistance(); //@} - //@{ - //! Management of objects detals. - void SetObjectDetail(float value); - float GetObjectDetail(); - //@} - //@{ //! The amount of management objects gadgets void SetGadgetQuantity(float value); @@ -1407,7 +1401,6 @@ protected: float m_particleDensity; float m_clippingDistance; float m_lastClippingDistance; - float m_objectDetail; float m_terrainVision; float m_gadgetQuantity; bool m_totoMode; diff --git a/src/ui/screen/screen_setup_graphics.cpp b/src/ui/screen/screen_setup_graphics.cpp index 17fd6f39..0ffdd49c 100644 --- a/src/ui/screen/screen_setup_graphics.cpp +++ b/src/ui/screen/screen_setup_graphics.cpp @@ -152,21 +152,6 @@ void CScreenSetupGraphics::CreateInterface() pos.y = 0.53f; ddim.x = dim.x*2.2f; ddim.y = 18.0f/480.0f; - pv = pw->CreateEditValue(pos, ddim, 0, EVENT_INTERFACE_DETAIL); - pv->SetState(STATE_SHADOW); - pv->SetMinValue(0.0f); - pv->SetMaxValue(2.0f); - pos.x += 0.13f; - pos.y -= 0.015f; - ddim.x = 0.40f; - GetResource(RES_EVENT, EVENT_INTERFACE_DETAIL, name); - pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, name); - pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); - - pos.x = ox+sx*8.5f; - pos.y = 0.47f; - ddim.x = dim.x*2.2f; - ddim.y = 18.0f/480.0f; pv = pw->CreateEditValue(pos, ddim, 0, EVENT_INTERFACE_GADGET); pv->SetState(STATE_SHADOW); if ( m_simulationSetup ) @@ -349,7 +334,6 @@ bool CScreenSetupGraphics::EventProcess(const Event &event) case EVENT_INTERFACE_PARTI: case EVENT_INTERFACE_CLIP: - case EVENT_INTERFACE_DETAIL: case EVENT_INTERFACE_GADGET: ChangeSetupButtons(); break; @@ -512,13 +496,6 @@ void CScreenSetupGraphics::UpdateSetupButtons() pv->SetValue(value); } - pv = static_cast(pw->SearchControl(EVENT_INTERFACE_DETAIL)); - if ( pv != 0 ) - { - value = m_engine->GetObjectDetail(); - pv->SetValue(value); - } - pv = static_cast(pw->SearchControl(EVENT_INTERFACE_GADGET)); if ( pv != 0 ) { @@ -553,13 +530,6 @@ void CScreenSetupGraphics::ChangeSetupButtons() m_engine->SetClippingDistance(value); } - pv = static_cast(pw->SearchControl(EVENT_INTERFACE_DETAIL)); - if ( pv != 0 ) - { - value = pv->GetValue(); - m_engine->SetObjectDetail(value); - } - pv = static_cast(pw->SearchControl(EVENT_INTERFACE_GADGET)); if ( pv != 0 ) { @@ -646,11 +616,6 @@ void CScreenSetupGraphics::ChangeSetupQuality(int quality) if ( quality > 0 ) value = 2.0f; m_engine->SetClippingDistance(value); - if ( quality < 0 ) value = 0.0f; - if ( quality == 0 ) value = 1.0f; - if ( quality > 0 ) value = 2.0f; - m_engine->SetObjectDetail(value); - if ( quality < 0 ) value = 0.5f; if ( quality == 0 ) value = 1.0f; if ( quality > 0 ) value = 1.0f;