[Orxonox-commit 2339] r7054 - in code/branches/presentation3: data/levels/templates src/orxonox/graphics

[kolibri7 at orxonox.net]

Author: kolibri7
Date: 2010-05-31 16:03:06 +0200 (Mon, 31 May 2010)
New Revision: 7054

Modified:
   code/branches/presentation3/data/levels/templates/lodinformation.oxt
   code/branches/presentation3/src/orxonox/graphics/Model.cc
Log:
* slightly changed the algorithm for computing the distvalues for lod
* added some standard lodinformation

Modified: code/branches/presentation3/data/levels/templates/lodinformation.oxt
===================================================================
--- code/branches/presentation3/data/levels/templates/lodinformation.oxt	2010-05-31 13:51:52 UTC (rev 7053)
+++ code/branches/presentation3/data/levels/templates/lodinformation.oxt	2010-05-31 14:03:06 UTC (rev 7054)
@@ -7,6 +7,12 @@
       <MeshLodInformation mesh=laserbeam.mesh enabled=false />
       <MeshLodInformation mesh=HXY.mesh enabled=true numLevels=8 />
       <MeshLodInformation mesh=Transporter.mesh enabled=true numLevels=8 />
+      <MeshLodInformation mesh=CuboidConnBody.mesh enabled=false/>
+      <MeshLodInformation mesh=CuboidBody.mesh enabled=false/>
+      <MeshLodInformation mesh=DoubleCuboidBody.mesh enabled=false/>
+      <MeshLodInformation mesh=SemiCircleCockpit.mesh enabled=false/>
+      <MeshLodInformation mesh=SolarPanel.mesh enabled=false/>
+      <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
     </lodinformation>
   </Level>
 </Template>

Modified: code/branches/presentation3/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/Model.cc	2010-05-31 13:51:52 UTC (rev 7053)
+++ code/branches/presentation3/src/orxonox/graphics/Model.cc	2010-05-31 14:03:06 UTC (rev 7054)
@@ -142,7 +142,7 @@
                         if( lodLevel_>0 )
                         {
     //                         float factor = scaleFactor*5/lodLevel_;
-                            float factor = volume*5/lodLevel_;
+                            float factor = pow(volume,2.0/3.0)*15/lodLevel_;
                             
                             COUT(4) << "LodLevel set with factor: " << factor << endl;