[Orxonox-commit 3346] r8034 - in code/branches/usability: data/gui/layouts data/gui/scripts src/orxonox/graphics

[landauf at orxonox.net]

Author: landauf
Date: 2011-03-06 15:29:16 +0100 (Sun, 06 Mar 2011)
New Revision: 8034

Modified:
   code/branches/usability/data/gui/layouts/GraphicsMenu.layout
   code/branches/usability/data/gui/scripts/GraphicsMenu.lua
   code/branches/usability/src/orxonox/graphics/Model.cc
Log:
renamed enableModelLoD config value as enableMeshLoD (also renamed it in the graphics menu) because thats technically more accurate (thanks to Oli for pointing this out)

Modified: code/branches/usability/data/gui/layouts/GraphicsMenu.layout
===================================================================
--- code/branches/usability/data/gui/layouts/GraphicsMenu.layout	2011-03-06 13:30:24 UTC (rev 8033)
+++ code/branches/usability/data/gui/layouts/GraphicsMenu.layout	2011-03-06 14:29:16 UTC (rev 8034)
@@ -180,8 +180,8 @@
                         <Property Name="UnifiedAreaRect" Value="{{0.5,0},{0.29,0},{0.7,0},{0.725,0}}" />
                         <Property Name="MaxEditTextLength" Value="1073741823" />
                     </Window>
-                    <Window Type="MenuWidgets/Checkbox" Name="orxonox/Settings/ModelLodCheckbox" >
-                        <Property Name="Text" Value="Enable model LOD" />
+                    <Window Type="MenuWidgets/Checkbox" Name="orxonox/Settings/MeshLodCheckbox" >
+                        <Property Name="Text" Value="Enable mesh LOD" />
                         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                         <Property Name="UnifiedAreaRect" Value="{{0.035,0},{0.44,0},{0.5,0},{0.51,0}}" />
                     </Window>

Modified: code/branches/usability/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/usability/data/gui/scripts/GraphicsMenu.lua	2011-03-06 13:30:24 UTC (rev 8033)
+++ code/branches/usability/data/gui/scripts/GraphicsMenu.lua	2011-03-06 14:29:16 UTC (rev 8034)
@@ -144,15 +144,15 @@
         end
     end
 
-    -- model lod checkbox
-    local modelLodCheckbox = winMgr:getWindow("orxonox/Settings/ModelLodCheckbox")
-    local hasModelLod = orxonox.CommandExecutor:query("getConfig GraphicsSettings enableModelLoD")
-    if hasModelLod == "true" then
-        hasModelLod = true
-    elseif hasModelLod == "false" then
-        hasModelLod = false
+    -- mesh lod checkbox
+    local meshLodCheckbox = winMgr:getWindow("orxonox/Settings/MeshLodCheckbox")
+    local hasMeshLod = orxonox.CommandExecutor:query("getConfig GraphicsSettings enableMeshLoD")
+    if hasMeshLod == "true" then
+        hasMeshLod = true
+    elseif hasMeshLod == "false" then
+        hasMeshLod = false
     end
-    CEGUI.toCheckbox(modelLodCheckbox):setSelected(hasModelLod)
+    CEGUI.toCheckbox(meshLodCheckbox):setSelected(hasMeshLod)
 
     -- motion blur checkbox
     local motionBlurCheckbox = winMgr:getWindow("orxonox/Settings/MotionBlurCheckbox")
@@ -402,9 +402,9 @@
         orxonox.CommandExecutor:execute("config GraphicsSettings particlesDetailLevel " .. particleLodCombobox:getItemIndex(item))
     end
 
-    -- model lod
-    local modelLodCheckbox = winMgr:getWindow("orxonox/Settings/ModelLodCheckbox")
-    orxonox.CommandExecutor:execute("config GraphicsSettings enableModelLoD " .. tostring(CEGUI.toCheckbox(modelLodCheckbox):isSelected()))
+    -- mesh lod
+    local meshLodCheckbox = winMgr:getWindow("orxonox/Settings/MeshLodCheckbox")
+    orxonox.CommandExecutor:execute("config GraphicsSettings enableMeshLoD " .. tostring(CEGUI.toCheckbox(meshLodCheckbox):isSelected()))
 
     -- motion blur
     local motionBlurCheckbox = winMgr:getWindow("orxonox/Settings/MotionBlurCheckbox")

Modified: code/branches/usability/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/usability/src/orxonox/graphics/Model.cc	2011-03-06 13:30:24 UTC (rev 8033)
+++ code/branches/usability/src/orxonox/graphics/Model.cc	2011-03-06 14:29:16 UTC (rev 8034)
@@ -59,7 +59,7 @@
 
     void Model::setConfigValues()
     {
-        SetConfigValueExternal(bGlobalEnableLod_, "GraphicsSettings", "enableModelLoD", true)
+        SetConfigValueExternal(bGlobalEnableLod_, "GraphicsSettings", "enableMeshLoD", true)
             .description("Enable level of detail for models");
     }