Changeset 6691

Timestamp:

Apr 12, 2010, 3:48:24 PM (15 years ago)

Author:

kolibri7

Message:

implementing the XMLPort function for LoD; getting some erreors from gcc…

Location:

code/branches/lod

Files:

• data/levels/presentationLOD.oxw (added)
• data/levels/presentationLODdif.oxw (added)
• src/orxonox/Level.cc (modified) (3 diffs)
• src/orxonox/Level.h (modified) (3 diffs)
• src/orxonox/graphics/CMakeLists.txt (modified) (1 diff)
• src/orxonox/graphics/MeshLodInformation.cc (added)
• src/orxonox/graphics/MeshLodInformation.h (added)
• src/orxonox/graphics/Model.cc (modified) (3 diffs)
• src/orxonox/graphics/Model.h (modified) (1 diff)

code/branches/lod/src/orxonox/Level.cc

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/Loader.h"
-#include "core/Template.h"
+#include "core/template.h"
 #include "core/XMLFile.h"
 #include "core/XMLPort.h"
@@ -73 +73 @@
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
 
-        XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
-    }
+        XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);            
+        XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
+}
 
     void Level::registerVariables()
@@ -138 +139 @@
         return 0;
     }
+    
+    //LoD
+    void Level::addLodInfo(const MeshLodInformation* lodInformation)
+    {
+//              std::pair<std::map<std::string,MeshLodInformation*>::iterator,bool> it 
+//                  = new std::pair<lodInformation->getMeshName(),lodInformation>;
+        this->lodInformation_.insert(std::pair<lodInformation->getMeshName(),lodInformation>);
+    }
+
+    MeshLodInformation* Level::getLodInfo(string meshName) const
+    {
+        if(this->lodInformation_.find(meshName)!=std::map::end)
+            return this->lodInformation_.find(meshName);
+        
+        return 0;
+        
+        
+        /*
+        unsigned int i = 0;
+        for (std::map<MeshLodInformation*>::const_iterator it = this->lodInformation_.begin(); it != this->lodInformation_.end(); ++it)
+        {
+            if (i == index)
+                return (*it);
+            ++i;
+        }
+        return 0;*/
+    }
 
     void Level::playerEntered(PlayerInfo* player)

code/branches/lod/src/orxonox/Level.h

@@ -34 +34 @@
 #include <list>
 #include <string>
+#include <map>
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
+#include "graphics/MeshLodInformation.h"
 
 namespace orxonox
@@ -60 +62 @@
             BaseObject* getObject(unsigned int index) const;
 
+            void addLodInfo(const MeshLodInformation* object);
+            MeshLodInformation* getLodInfo(unsigned int index) const;
+
             void setGametypeString(const std::string& gametype);
             inline const std::string& getGametypeString() const
@@ -66 +71 @@
             void networkcallback_applyXMLFile();
 
-            std::string            description_;
-            std::string            gametype_;
-            std::string            xmlfilename_;
-            XMLFile*               xmlfile_;
-            std::list<BaseObject*> objects_;
+            std::string                    description_;
+            std::string                    gametype_;
+            std::string                    xmlfilename_;
+            XMLFile*                       xmlfile_;
+            std::list<BaseObject*>         objects_;
+            std::map<std::string,MeshLodInformation*>  lodInformation_;
     };
 }

code/branches/lod/src/orxonox/graphics/CMakeLists.txt

@@ -4 +4 @@
   FadingBillboard.cc
   GlobalShader.cc
+  MeshLodInformation.cc
   Model.cc
   ParticleEmitter.cc

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

@@ -58 +58 @@
     {
         SUPER(Model, XMLPort, xmlelement, mode);
-
+                
+                //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);
@@ -75 +78 @@
             if (this->mesh_.getEntity())
                 this->detachOgreObject(this->mesh_.getEntity());
-
+            
             this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
@@ -83 +86 @@
                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
                 this->mesh_.setVisible(this->isVisible());
+                
+                //LOD
+                if(this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1
+                    &&this->meshSrc_!="laserbeam.mesh"
+                    &&this->lodLevel_!=0)
+                {
+                    float scaleFactor = this->getScale();
+                    COUT(0) << this->meshSrc_<< " lodLevel_: " << this->lodLevel_ <<" scale: "<< scaleFactor << std::endl;
+                    //Für Asteroiden perfekt
+
+#if OGRE_VERSION >= 0x010700
+                    Ogre::Mesh::LodValueList distList;
+#else
+                    Ogre::Mesh::LodDistanceList distList;
+#endif
+
+                    distList.push_back(70.0f*scaleFactor);
+                    distList.push_back(140.0f*scaleFactor);
+                    distList.push_back(170.0f*scaleFactor);
+                    distList.push_back(200.0f*scaleFactor);
+                    distList.push_back(230.0f*scaleFactor);
+                    distList.push_back(250.0f*scaleFactor);
+                    distList.push_back(270.0f*scaleFactor);
+                    distList.push_back(290.0f*scaleFactor);
+                    distList.push_back(310.0f*scaleFactor);
+                    distList.push_back(330.0f*scaleFactor);
+
+                    float reductionValue = 0.2f;
+
+                    
+                    //Generiert LOD-Levels
+                    this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
+                }
             }
         }

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

@@ -61 +61 @@
             inline bool getCastShadows() const
                 { return this->bCastShadows_; }
-
+                                
         private:
             void changedMesh();
             void changedShadows();
+                        
+                        //LoD
+                        inline void setLodLevel(unsigned short lodLevel)
+                                { this->lodLevel_ =  lodLevel; }
+                        inline unsigned short getLodLevel() const
+                                { return this->lodLevel_; }
 
             std::string meshSrc_;
             Mesh mesh_;
             bool bCastShadows_;
+                        
+                        //LoD
+                        unsigned short lodLevel_;
     };
 }