immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused LOD level setting

master
krzys-h 2015-08-06 18:35:56 +02:00
parent 69c6e9d4be
commit ec3ded75b8
12 changed files with 12 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
po/colobot.pot
View File

@ -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 ""

6
po/de.po
View File

@ -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:"

6
po/fr.po
View File

@ -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 :"

6
po/pl.po
View File

@ -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?"

6
po/ru.po
View File

@ -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 "Разработка :"

1
src/common/event.cpp
View File

@ -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";

1
src/common/event.h
View File

@ -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,

1
src/common/restext.cpp
View File

@ -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");

4
src/common/settings.cpp
View File

@ -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);

13
src/graphics/engine/engine.cpp
View File

@ -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;

7
src/graphics/engine/engine.h
View File

@ -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;

35
src/ui/screen/screen_setup_graphics.cpp
View File

@ -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<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_DETAIL));
if ( pv != 0 )
{
value = m_engine->GetObjectDetail();
pv->SetValue(value);
}
pv = static_cast<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_GADGET));
if ( pv != 0 )
{
@ -553,13 +530,6 @@ void CScreenSetupGraphics::ChangeSetupButtons()
m_engine->SetClippingDistance(value);
}
pv = static_cast<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_DETAIL));
if ( pv != 0 )
{
value = pv->GetValue();
m_engine->SetObjectDetail(value);
}
pv = static_cast<CEditValue*>(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;