Changeset 8034 for code/branches

Timestamp:

Mar 6, 2011, 3:29:16 PM (14 years ago)

Author:

landauf

Message:

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)

Location:

code/branches/usability

Files:

• data/gui/layouts/GraphicsMenu.layout (modified) (1 diff)
• data/gui/scripts/GraphicsMenu.lua (modified) (2 diffs)
• src/orxonox/graphics/Model.cc (modified) (1 diff)

code/branches/usability/data/gui/layouts/GraphicsMenu.layout

@@ -181 +181 @@
                         <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}}" />

code/branches/usability/data/gui/scripts/GraphicsMenu.lua

@@ -145 +145 @@
     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
-    end
-    CEGUI.toCheckbox(modelLodCheckbox):setSelected(hasModelLod)
+    -- 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(meshLodCheckbox):setSelected(hasMeshLod)
 
     -- motion blur checkbox
@@ -403 +403 @@
     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

code/branches/usability/src/orxonox/graphics/Model.cc

@@ -60 +60 @@
     void Model::setConfigValues()
     {
-        SetConfigValueExternal(bGlobalEnableLod_, "GraphicsSettings", "enableModelLoD", true)
+        SetConfigValueExternal(bGlobalEnableLod_, "GraphicsSettings", "enableMeshLoD", true)
             .description("Enable level of detail for models");
     }