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

Timestamp:

May 10, 2010, 3:35:48 PM (15 years ago)

Author:

kolibri7

Message:

*everything works now; setting the lodlevels and also the XML-Port.
*added lod information for Carrier.mesh in gametype_underattack.oxw

Location:

code/branches/lod/src/orxonox/graphics

Files:

• MeshLodInformation.cc (modified) (1 diff)
• Model.cc (modified) (6 diffs)

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

@@ -53 +53 @@
         SUPER(MeshLodInformation, XMLPort, xmlelement, mode);
 
-        XMLPortParam(MeshLodInformation, "lodQuality", setLodLevel, getLodLevel, xmlelement, mode).defaultValues(5);
         XMLPortParam(MeshLodInformation, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
+        XMLPortParam(MeshLodInformation, "lodQuality", setLodLevel, getLodLevel, xmlelement, mode);
     }
     

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

@@ -61 +61 @@
         SUPER(Model, XMLPort, xmlelement, mode);
         
-        //LoD
         XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode).defaultValues(5);
         
@@ -103 +102 @@
                     &&this->meshSrc_!="laserbeam.mesh")
                 {
-                    float scaleFactor = getBiggestScale(this->getScale3D());
-                    BaseObject* creatorPtr = this->getCreator();
-                                        //TODO Doesn't work...
-                    while(creatorPtr!=0&&typeid(creatorPtr)!=typeid(new WorldEntity*))
+                    float scaleFactor = 1;
+                    BaseObject* creatorPtr = this;
+                    
+                    while(creatorPtr!=NULL&&orxonox_cast<WorldEntity*>(creatorPtr))
                     {
                         scaleFactor *= getBiggestScale(((WorldEntity*) creatorPtr)->getScale3D());
-                        creatorPtr = this->getCreator();
+                        creatorPtr = creatorPtr->getCreator();
                     }
                     
@@ -115 +114 @@
                     
                     MeshLodInformation* lodInfo = level_->getLodInfo(this->meshSrc_);
+                    
                     if(lodInfo!=0)
                         setLodLevel(lodInfo->getLodLevel());
@@ -126 +126 @@
 #endif
 
-                    if(lodLevel_>0)
+                    if(lodLevel_>0&&lodLevel_<=5)
                     {
                         float factor = scaleFactor*5/lodLevel_;
@@ -143 +143 @@
                         distList.push_back(330.0f*factor);
 
-                        float reductionValue = 0.2f;
+                        float reductionValue = 0.15f;
 
                         
@@ -151 +151 @@
                     else
                     {
-                        COUT(0)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was < 0."<<std::endl;
+                        std::string what;
+                        if(lodLevel_>5)
+                            what = ">5";
+                        else
+                            what = "<0";
+                        
+                        COUT(0)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"."<<std::endl;
                     }
                 }