Changeset 7036 for code/branches/presentation3

Timestamp:

May 31, 2010, 9:02:48 AM (14 years ago)

Author:

scheusso

Message:

some changes regarding lod:

• added lodtemplate in different levels
• trying to avoid sigabrt's because of models with too much lod levels

Location:

code/branches/presentation3

Files:

• data/levels/Level(Deathmatch).oxw (modified) (2 diffs)
• data/levels/Level(UnderAttack).oxw (modified) (2 diffs)
• data/levels/Quest_PirateAttack.oxw (modified) (2 diffs)
• data/levels/events.oxw (modified) (2 diffs)
• data/levels/mylevel.oxw (modified) (1 diff)
• data/levels/pickups.oxw (modified) (2 diffs)
• data/levels/presentation.oxw (modified) (2 diffs)
• data/levels/presentation09.oxw (modified) (2 diffs)
• data/levels/presentation09b.oxw (modified) (2 diffs)
• data/levels/presentationHS09.oxw (modified) (2 diffs)
• data/levels/presentationHS09b.oxw (modified) (2 diffs)
• data/levels/presentationLOD.oxw (modified) (2 diffs)
• data/levels/presentationLODdif.oxw (modified) (1 diff)
• data/levels/presentation_dm.oxw (modified) (2 diffs)
• data/levels/presentation_pong.oxw (modified) (1 diff)
• data/levels/princessaeryn.oxw (modified) (2 diffs)
• data/levels/quest_test.oxw (modified) (2 diffs)
• data/levels/sound.oxw (modified) (2 diffs)
• data/levels/templates/lodinformation.oxt (modified) (1 diff)
• data/levels/test_ghost.oxw (modified) (2 diffs)
• data/levels/test_stars.oxw (modified) (1 diff)
• data/levels/tutorial.oxw (modified) (1 diff)
• data/levels/waypoints.oxw (modified) (2 diffs)
• src/orxonox/Level.cc (modified) (1 diff)
• src/orxonox/graphics/MeshLodInformation.cc (modified) (2 diffs)
• src/orxonox/graphics/MeshLodInformation.h (modified) (2 diffs)
• src/orxonox/graphics/Model.cc (modified) (6 diffs)
• src/orxonox/graphics/Model.h (modified) (1 diff)

code/branches/presentation3/data/levels/Level(Deathmatch).oxw

@@ -1 +1 @@
 <?lua
-        include("stats.oxo")
-        include("hudtemplates3.oxo")
-        include("underattackhud.oxo")
-        include("templates/spaceship_assff.oxt")
-        include("templates/spaceship_pirate.oxt")
-        include("templates/spaceship_Transporter.oxt")
+  include("stats.oxo")
+  include("hudtemplates3.oxo")
+  include("underattackhud.oxo")
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceship_Transporter.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -60 +61 @@
   gametype=TeamDeathmatch
 >
-    <lodinformation>
-            <MeshLodInformation mesh=Transporter.mesh lodQuality=10 />
-    </lodinformation>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
         <!-- Ausgang: Szene ===> ambientlight/skybox -->

code/branches/presentation3/data/levels/Level(UnderAttack).oxw

@@ -1 +1 @@
 <?lua
-        include("stats.oxo")
-        include("hudtemplates3.oxo")
-        include("underattackhud.oxo")
-        include("templates/spaceship_assff.oxt")
-        include("templates/spaceship_pirate.oxt")
-        include("templates/spaceship_destroyer.oxt")
+  include("stats.oxo")
+  include("hudtemplates3.oxo")
+  include("underattackhud.oxo")
+  include("templates/spaceship_assff.oxt")
+  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceship_destroyer.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -14 +15 @@
   gametype=UnderAttack
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
         <!-- Ausgang: Szene ===> ambientlight/skybox -->

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

@@ -5 +5 @@
   include("templates/spaceship_HXY_SL.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -35 +36 @@
 gametype=TeamDeathmatch
 >
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
     <Scene

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

@@ -4 +4 @@
   include("templates/spaceship_assff.oxt")
   include("templates/spaceship_H2.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -10 +11 @@
  description  = "A simple level to test the event-system (with comments)"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -6 +6 @@
   include("templates/spaceship_pirate.oxt")
   include("templates/spaceship_Transporter.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 

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

@@ -8 +8 @@
   include("templates/spaceship_pirate.oxt")
   include("templates/pickup_representation_templates.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -14 +15 @@
  description  = "Just a few tests"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
     ambientlight = "0.8, 0.8, 0.8"

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

@@ -3 +3 @@
   include("stats.oxo")
   include("templates/spaceship_assff.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -9 +10 @@
  description  = "Just a few tests"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.3, 0.3, 0.3"

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

@@ -4 +4 @@
   include("templates/spaceship_assff.oxt")
   include("templates/spaceship_H2.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -11 +12 @@
 
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -6 +6 @@
   include("templates/spaceship_pirate.oxt")
   include("templates/pickup_representation_templates.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -13 +14 @@
  gametype     = TeamDeathmatch
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -6 +6 @@
   include("templates/spaceship_pirate.oxt")
   include("templates/pickup_representation_templates.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -14 +15 @@
  hasPhysics = true
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.6, 0.4, 0.4"

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

@@ -2 +2 @@
   include("stats.oxo")
   include("hudtemplates3.oxo")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -19 +20 @@
  gametype     = TeamDeathmatch
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
     ambientlight = "0.8, 0.8, 0.8"

code/branches/presentation3/data/levels/presentationLOD.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/presentationLODdif.oxw

@@ -14 +14 @@
  description  = "Just a few tests"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
   <lodinformation>

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

@@ -4 +4 @@
   include("templates/spaceship_assff.oxt")
   include("templates/spaceship_H2.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -10 +11 @@
  description  = "A simple testlevel"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -3 +3 @@
   include("stats.oxo")
   include("ponghud.oxo")
+  include("templates/lodinformation.oxt")
 ?>
 

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

@@ -3 +3 @@
   include("stats.oxo")
   include("templates/spaceship_assff.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -22 +23 @@
    width  = 50
   />
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
   <Scene

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

@@ -5 +5 @@
   include("templates/spaceship_HXY_SL.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -32 +33 @@
              width    = 50
     />
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
 
     <Scene

code/branches/presentation3/data/levels/sound.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/templates/lodinformation.oxt

@@ -1 +1 @@
 <Template name=lodtemplate_default defaults=false>
   <Level>
-        <lodinformation>
-          <MeshLodInformation mesh=Carrier.mesh lodQuality=1.8 />
-          <MeshLodInformation mesh=assff.mesh lodQuality=3 />
-          <MeshLodInformation mesh=Transporter.mesh lodQuality=5 />
-          <MeshLodInformation mesh=rocket.mesh lodQuality=5 enabled=true />
-        </lodinformation>
+    <lodinformation>
+      <MeshLodInformation mesh=Carrier.mesh lodQuality=1.8 />
+      <MeshLodInformation mesh=assff.mesh lodQuality=3 />
+      <MeshLodInformation mesh=rocket.mesh lodQuality=5 enabled=true />
+      <MeshLodInformation mesh=laserbeam.mesh enabled=false />
+      <MeshLodInformation mesh=HXY.mesh enabled=true numLevels=8 />
+      <MeshLodInformation mesh=Transporter.mesh enabled=true numLevels=8 />
+    </lodinformation>
   </Level>
 </Template>

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

@@ -4 +4 @@
   include("templates/spaceship_ghost.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -11 +12 @@
 
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -13 +13 @@
  description  = "Just a few tests"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
     ambientlight = "0.8, 0.8, 0.8"

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

@@ -9 +9 @@
  description  = "A simple testlevel"
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -5 +5 @@
   include("templates/spaceship_H2.oxt")
   include("templates/spaceship_pirate.oxt")
+  include("templates/lodinformation.oxt")
 ?>
 
@@ -11 +12 @@
  description  = "Testing waypoings for AI controlled spaceships."
 >
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
   <Scene
    ambientlight = "0.5, 0.5, 0.5"

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

@@ -145 +145 @@
     {
         std::string meshName = lodInformation->getMeshName();
-        this->lodInformation_.insert(std::make_pair(meshName,lodInformation));
+//         this->lodInformation_.insert(std::make_pair(meshName,lodInformation));
+        if( this->lodInformation_.find(meshName) != this->lodInformation_.end())
+          CCOUT(4) << "replacing lod information for " << meshName << endl;
+        this->lodInformation_[meshName] = lodInformation;
     }
 

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

@@ -41 +41 @@
 
     MeshLodInformation::MeshLodInformation(BaseObject* creator) 
-        : BaseObject(creator), lodLevel_(-1), bEnabled_(true)
+        : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
     {
         RegisterObject(MeshLodInformation);
@@ -56 +56 @@
         XMLPortParam(MeshLodInformation, "lodQuality", setLodLevel, getLodLevel, xmlelement, mode);
         XMLPortParam(MeshLodInformation, "enabled", setEnabled, getEnabled, xmlelement, mode);
+        XMLPortParam(MeshLodInformation, "numLevels", setNumLevels, getNumLevels, xmlelement, mode);
+        XMLPortParam(MeshLodInformation, "reductionRate", setReductionRate, getReductionRate, xmlelement, mode);
     }
     

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

@@ -47 +47 @@
             std::string getMeshName();
             bool getEnabled(){ return this->bEnabled_; }
+            unsigned int getNumLevels(){ return this->numLevels_; }
+            float getReductionRate(){ return this->reductionRate_; }
             
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -53 +55 @@
             void setLodLevel(float lodLevel);
             void setMeshSource(std::string meshSource);
-            void setEnabled( bool enabled ){ this->bEnabled_ = true; }
+            void setEnabled( bool enabled ){ this->bEnabled_ = enabled; }
+            void setNumLevels( unsigned int num ){ this->numLevels_ = num; }
+            void setReductionRate( float rate ){ this->reductionRate_ = rate; }
             std::string getMeshSource();
             std::string meshSource_;
             float lodLevel_;
             bool bEnabled_;
+            unsigned int numLevels_;
+            float reductionRate_;
 
     };

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

@@ -42 +42 @@
     CreateFactory(Model);
 
-    Model::Model(BaseObject* creator) : StaticEntity(creator)
+    Model::Model(BaseObject* creator) : 
+        StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15)
     {
         RegisterObject(Model);
 
-        this->bCastShadows_ = true;
-
         this->registerVariables();
-        //LoD
-        this->lodLevel_=5;
     }
 
@@ -102 +99 @@
                 
                 //LOD
-                if(this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1
-                    &&this->meshSrc_!="laserbeam.mesh")
+                if( this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1 )
                 {
                     Level* level = this->getLevel();
@@ -109 +105 @@
                     assert( level != 0 );
                     
-                    if( level->getLodInfo(this->meshSrc_)!=0 )
-                        setLodLevel(level->getLodInfo(this->meshSrc_)->getLodLevel());
-                    if( level->getLodInfo(this->meshSrc_)==0 || level->getLodInfo(this->meshSrc_)->getEnabled() )
+                    MeshLodInformation* lodInfo = level->getLodInfo(this->meshSrc_);
+                    if( lodInfo )
                     {
-
+                        setLodLevel(lodInfo->getLodLevel());
+                        this->bLodEnabled_ = lodInfo->getEnabled();
+                        this->numLodLevels_ = lodInfo->getNumLevels();
+                        this->lodReductionRate_ = lodInfo->getReductionRate();
+                    }
+                    if( this->numLodLevels_>10 )
+                    {
+                        CCOUT(2) << "More than 10 LoD levels requested. Creating only 10." << endl;
+                        this->numLodLevels_ = 10;
+                    }
+                    if( this->bLodEnabled_ )
+                    {
                         float volume = this->mesh_.getEntity()->getBoundingBox().volume();
     //                     float scaleFactor = 1;
@@ -139 +145 @@
                             float factor = volume/3/lodLevel_;
                             
-                            COUT(4)<<"LodLevel set with factor: "<<factor<<std::endl;
+                            COUT(4) << "LodLevel set with factor: " << factor << endl;
 
                             distList.push_back(70.0f*factor);
@@ -151 +157 @@
                             distList.push_back(310.0f*factor);
                             distList.push_back(330.0f*factor);
-
-                            float reductionValue = 0.15f;
+                            while(distList.size()>this->numLodLevels_)
+                                distList.pop_back();
 
                             
                             //Generiert LOD-Levels
-                            this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
+                            this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, this->lodReductionRate_);
                         }
                         else
@@ -166 +172 @@
                                 what = "<0";
                             
-                            COUT(4)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"."<<std::endl;
+                            COUT(4)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"." << endl;
                         }
                     }
+                    else
+                        COUT(4) << "LodLevel for " << this->meshSrc_ << " not set because is disabled." << endl;
                 }
             }

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

@@ -79 +79 @@
             //LoD
             float lodLevel_;
+            bool bLodEnabled_;
+            unsigned int numLodLevels_;
+            float lodReductionRate_;
+            
     };
 }