Changeset 6926 for code/branches/presentation3

Timestamp:

May 20, 2010, 10:23:22 AM (14 years ago)

Author:

scheusso

Message:

merging lod branch into presentation3 merger branch

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• data/levels/empty_level.oxw (modified) (2 diffs)
• data/levels/gametype_asteroids.oxw (modified) (2 diffs)
• data/levels/gametype_underattack.oxw (modified) (2 diffs)
• data/levels/presentationLOD.oxw (copied) (copied from code/branches/lod/data/levels/presentationLOD.oxw)
• data/levels/presentationLODdif.oxw (copied) (copied from code/branches/lod/data/levels/presentationLODdif.oxw)
• data/levels/teambasematchlevel.oxw (modified) (2 diffs)
• data/levels/teamdeathmatch.oxw (modified) (2 diffs)
• data/levels/templates/lodinformation.oxt (copied) (copied from code/branches/lod/data/levels/templates/lodinformation.oxt)
• src/libraries/core/BaseObject.cc (modified) (2 diffs)
• src/libraries/core/BaseObject.h (modified) (3 diffs)
• src/orxonox/Level.cc (modified) (4 diffs)
• src/orxonox/Level.h (modified) (3 diffs)
• src/orxonox/LevelManager.cc (modified) (2 diffs)
• src/orxonox/graphics/CMakeLists.txt (modified) (1 diff)
• src/orxonox/graphics/MeshLodInformation.cc (copied) (copied from code/branches/lod/src/orxonox/graphics/MeshLodInformation.cc)
• src/orxonox/graphics/MeshLodInformation.h (copied) (copied from code/branches/lod/src/orxonox/graphics/MeshLodInformation.h)
• src/orxonox/graphics/Model.cc (modified) (6 diffs)
• src/orxonox/graphics/Model.h (modified) (1 diff)

code/branches/presentation3/data/levels/empty_level.oxw

@@ -2 +2 @@
   include("stats.oxo")
   include("hudtemplates3.oxo")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -13 +14 @@
  description  = "Just a few tests"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
     ambientlight = "0.8, 0.8, 0.8"

code/branches/presentation3/data/levels/gametype_asteroids.oxw

@@ -3 +3 @@
   include("stats.oxo")
   include("templates/spaceship_assff.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -10 +11 @@
  gametype     =  Asteroids
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
 <Scene
  ambientlight = "0.5, 0.5, 0.5"

code/branches/presentation3/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>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

code/branches/presentation3/data/levels/teambasematchlevel.oxw

@@ -5 +5 @@
   include("templates/spaceship_assff.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -12 +13 @@
  gametype     = TeamBaseMatch
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

code/branches/presentation3/data/levels/teamdeathmatch.oxw

@@ -5 +5 @@
   include("templates/spaceship_H2.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -12 +13 @@
  gametype     = TeamDeathmatch
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.7, 0.6, 0.6"

code/branches/presentation3/src/libraries/core/BaseObject.cc

@@ -75 +75 @@
             this->setScene(this->creator_->getScene(), this->creator_->getSceneID());
             this->setGametype(this->creator_->getGametype());
+            this->setLevel(this->creator_->getLevel());
         }
         else
@@ -83 +84 @@
             this->sceneID_ = OBJECTID_UNKNOWN;
             this->gametype_ = 0;
+            this->level_ = 0;
         }
     }

code/branches/presentation3/src/libraries/core/BaseObject.h

@@ -51 +51 @@
     class Scene;
     class Gametype;
+    class Level;
 
     //! The BaseObject is the parent of all classes representing an instance in the game.
@@ -153 +154 @@
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
+            
+            inline void setLevel(const SmartPtr<Level>& level)
+            {
+                if (level != this->level_)
+                {
+                    this->level_ = level;
+                    this->changedLevel();
+                }
+            }
+            inline const SmartPtr<Level>& getLevel() const { return this->level_; }
+            virtual void changedLevel() {}
 
             void addEventSource(BaseObject* source, const std::string& state);
@@ -209 +221 @@
             SmartPtr<Gametype>     gametype_;
             Gametype*              oldGametype_;
+            SmartPtr<Level>        level_;
             std::set<Template*>    templates_;
 

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

@@ -49 +49 @@
         RegisterObject(Level);
 
+        
         this->registerVariables();
         this->xmlfilename_ = this->getFilename();
@@ -72 +73 @@
         XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-
+            
+        XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
-    }
+}
 
     void Level::registerVariables()
@@ -125 +127 @@
         this->objects_.push_back(object);
         object->setGametype(this->getGametype());
+    object->setLevel(this);
     }
 
@@ -136 +139 @@
             ++i;
         }
+        return 0;
+    }
+    
+    void Level::addLodInfo(MeshLodInformation* lodInformation)
+    {
+        std::string meshName = lodInformation->getMeshName();
+        this->lodInformation_.insert(std::make_pair(meshName,lodInformation));
+    }
+
+    MeshLodInformation* Level::getLodInfo(std::string meshName) const
+    {
+        if(this->lodInformation_.find(meshName)!=this->lodInformation_.end())
+            return this->lodInformation_.find(meshName)->second;
+        
         return 0;
     }

code/branches/presentation3/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
@@ -55 +57 @@
             void playerEntered(PlayerInfo* player);
             void playerLeft(PlayerInfo* player);
+                        
+            MeshLodInformation* getLodInfo(std::string meshName) const;
+
 
         private:
             void addObject(BaseObject* object);
             BaseObject* getObject(unsigned int index) const;
+
+            void addLodInfo(MeshLodInformation* object);
+//            const MeshLodInformation* getLodInfo(std::string meshName) const;
+//            MeshLodInformation* getLodInfo(unsigned int index) const;
 
             void setGametypeString(const std::string& gametype);
@@ -66 +75 @@
             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/presentation3/src/orxonox/LevelManager.cc

@@ -70 +70 @@
     void LevelManager::requestActivity(Level* level)
     {
+        COUT(0) << "pushing level into level list: " << level << endl;
         this->levels_s.push_back(level);
         if (this->levels_s.size() == 1)
@@ -77 +78 @@
     void LevelManager::releaseActivity(Level* level)
     {
+        COUT(0) << "poping level from level list: " << level << endl;
         if (this->levels_s.size() > 0)
         {

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

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

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

@@ -35 +35 @@
 #include "core/XMLPort.h"
 #include "Scene.h"
+#include "graphics/MeshLodInformation.h"
+#include "Level.h"
 
 namespace orxonox
@@ -47 +49 @@
 
         this->registerVariables();
+        //LoD
+        this->lodLevel_=5;
     }
 
@@ -58 +62 @@
     {
         SUPER(Model, XMLPort, xmlelement, mode);
-
+        
+        XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode);
+        
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
         XMLPortParam(Model, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
@@ -69 +75 @@
     }
 
+    float Model::getBiggestScale(Vector3 scale3d)
+    {
+        float scaleFactor = scale3d.x;
+        if(scale3d.y>scaleFactor)
+            scaleFactor = scale3d.y;
+        if(scale3d.z>scaleFactor)
+            scaleFactor = scale3d.z;
+        return scaleFactor;
+    }
+    
     void Model::changedMesh()
     {
@@ -75 +91 @@
             if (this->mesh_.getEntity())
                 this->detachOgreObject(this->mesh_.getEntity());
-
+            
             this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
@@ -83 +99 @@
                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
                 this->mesh_.setVisible(this->isVisible());
+                
+                //LOD
+                if(this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1
+                    &&this->meshSrc_!="laserbeam.mesh")
+                {
+                    float scaleFactor = 1;
+                    BaseObject* creatorPtr = this;
+                    
+                    while(creatorPtr!=NULL&&orxonox_cast<WorldEntity*>(creatorPtr))
+                    {
+                        scaleFactor *= getBiggestScale(((WorldEntity*) creatorPtr)->getScale3D());
+                        creatorPtr = creatorPtr->getCreator();
+                    }
+                    
+                    Level* level_ = this->getLevel();
+                    
+                    MeshLodInformation* lodInfo = level_->getLodInfo(this->meshSrc_);
+                    
+                    if(lodInfo!=0)
+                        setLodLevel(lodInfo->getLodLevel());
+                    
+                    COUT(0) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and scale: "<< scaleFactor << ":" << std::endl;
+
+#if OGRE_VERSION >= 0x010700
+                    Ogre::Mesh::LodValueList distList;
+#else
+                    Ogre::Mesh::LodDistanceList distList;
+#endif
+
+                    if(lodLevel_>0&&lodLevel_<=5)
+                    {
+                        float factor = scaleFactor*5/lodLevel_;
+                        
+                        COUT(0)<<"LodLevel set with factor: "<<factor<<std::endl;
+
+                        distList.push_back(70.0f*factor);
+                        distList.push_back(140.0f*factor);
+                        distList.push_back(170.0f*factor);
+                        distList.push_back(200.0f*factor);
+                        distList.push_back(230.0f*factor);
+                        distList.push_back(250.0f*factor);
+                        distList.push_back(270.0f*factor);
+                        distList.push_back(290.0f*factor);
+                        distList.push_back(310.0f*factor);
+                        distList.push_back(330.0f*factor);
+
+                        float reductionValue = 0.15f;
+
+                        
+                        //Generiert LOD-Levels
+                        this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
+                    }
+                    else
+                    {
+                        std::string what;
+                        if(lodLevel_>5)
+                            what = ">5";
+                        else
+                            what = "<0";
+                        
+                        COUT(0)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"."<<std::endl;
+                    }
+                }
             }
         }

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

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