Changeset 6838 for code/branches/lod/src/orxonox/graphics

Timestamp:

May 3, 2010, 2:29:27 PM (15 years ago)

Author:

kolibri7

Message:

implemented the XMLPort for additional lod information.

Location:

code/branches/lod/src/orxonox/graphics

Files:

• MeshLodInformation.h (modified) (2 diffs)
• Model.cc (modified) (4 diffs)

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

@@ -42 +42 @@
                 private:
                         void setLodLevel(unsigned int lodLevel);
-                        int getLodLevel();
                         void setMeshSource(std::string meshSource);
                         std::string getMeshSource();
@@ -52 +51 @@
             virtual ~MeshLodInformation();
             
+                        int getLodLevel();
             std::string getMeshName();
 

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

@@ -29 +29 @@
 #include "Model.h"
 
-#include <OGRE/OgreEntity.h>
+// What's this? With the directory in front the filename, my compiler can't find the file...
+//#include <OGRE/OgreEntity.h>
+#include <OgreEntity.h>
 
 #include "core/CoreIncludes.h"
@@ -35 +37 @@
 #include "core/XMLPort.h"
 #include "Scene.h"
+#include "graphics/MeshLodInformation.h"
+#include "Level.h"
 
 namespace orxonox
@@ -58 +62 @@
     {
         SUPER(Model, XMLPort, xmlelement, mode);
-                
-                //LoD
+        
+        //LoD
         XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode).defaultValues(5);
-                
+        
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
         XMLPortParam(Model, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
@@ -98 +102 @@
                     if(scale3d.z>scaleFactor)
                         scaleFactor = scale3d.z;
-
+                    
+                    Level* level_ = this->getLevel();
+                    
+                    MeshLodInformation* lodInfo = level_->getLodInfo(this->meshSrc_);
+                    if(lodInfo!=0)
+                        setLodLevel(lodInfo->getLodLevel());
+                    
                     COUT(0) << this->meshSrc_<< " lodLevel_: " << this->lodLevel_ <<" scale: "<< scaleFactor << std::endl;
                     //Fuer Asteroiden perfekt