Changeset 6881 for code/branches

Timestamp:

May 10, 2010, 4:00:52 PM (15 years ago)

Author:

kolibri7

Message:

*lodLevel is a float now
*gametype_underattack.oxw includes the lodlevel template now

Location:

code/branches/lod

Files:

• data/levels/gametype_underattack.oxw (modified) (2 diffs)
• data/levels/templates/lodinformation.oxt (modified) (1 diff)
• src/orxonox/graphics/MeshLodInformation.cc (modified) (1 diff)
• src/orxonox/graphics/MeshLodInformation.h (modified) (2 diffs)

code/branches/lod/data/levels/gametype_underattack.oxw

@@ -4 +4 @@
   include("underattackhud.oxo")
   include("templates/spaceship_assff.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -11 +12 @@
  gametype     = UnderAttack
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
-  <lodinformation>
-    <MeshLodInformation mesh=Carrier.mesh lodQuality=1 />
-  </lodinformation>
-  
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

code/branches/lod/data/levels/templates/lodinformation.oxt

@@ -2 +2 @@
   <Level>
         <lodinformation>
-          <MeshLodInformation mesh=ast1.mesh lodQuality=1 />
+          <MeshLodInformation mesh=Carrier.mesh lodQuality=2.4 />
         </lodinformation>
   </Level>

code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc

@@ -62 +62 @@
     }
         
-        void MeshLodInformation::setLodLevel(unsigned int lodLevel)
+        void MeshLodInformation::setLodLevel(float lodLevel)
         {
-                lodLevel_=lodLevel;
+        if(lodLevel>=0)
+                    lodLevel_=lodLevel;
         }
-        int MeshLodInformation::getLodLevel()
+        float MeshLodInformation::getLodLevel()
         {
                 return lodLevel_;

code/branches/lod/src/orxonox/graphics/MeshLodInformation.h

@@ -41 +41 @@
     {
                 private:
-                        void setLodLevel(unsigned int lodLevel);
+                        void setLodLevel(float lodLevel);
                         void setMeshSource(std::string meshSource);
                         std::string getMeshSource();
                         std::string meshSource_;
-                        int lodLevel_;
+                        float lodLevel_;
                 
         public:
@@ -51 +51 @@
             virtual ~MeshLodInformation();
             
-                        int getLodLevel();
+                        float getLodLevel();
             std::string getMeshName();