Changeset 7127 for code/branches/presentation3/src/orxonox/graphics

Timestamp:

Jun 9, 2010, 9:32:58 PM (15 years ago)

Author:

rgrieder

Message:

Removed excess white space at the end of lines.

Location:

code/branches/presentation3/src/orxonox/graphics

Files:

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

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

@@ -40 +40 @@
     CreateFactory(MeshLodInformation);
 
-    MeshLodInformation::MeshLodInformation(BaseObject* creator) 
+    MeshLodInformation::MeshLodInformation(BaseObject* creator)
     : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
     {
@@ -59 +59 @@
         XMLPortParam(MeshLodInformation, "reductionRate", setReductionRate, getReductionRate, xmlelement, mode);
     }
-    
+
     std::string MeshLodInformation::getMeshName()
     {
         return MeshLodInformation::getMeshSource();
     }
-    
+
     void MeshLodInformation::setLodLevel(float lodLevel)
     {
@@ -73 +73 @@
     {
         return lodLevel_;
-    } 
+    }
     void MeshLodInformation::setMeshSource(std::string meshSource)
     {
@@ -82 +82 @@
         return meshSource_;
     }
- 
+
 }

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

@@ -43 +43 @@
             MeshLodInformation(BaseObject* creator);
             virtual ~MeshLodInformation();
-            
+
             float getLodLevel();
             std::string getMeshName();
@@ -49 +49 @@
             unsigned int getNumLevels(){ return this->numLevels_; }
             float getReductionRate(){ return this->reductionRate_; }
-            
+
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 

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

@@ -42 +42 @@
     CreateFactory(Model);
 
-    Model::Model(BaseObject* creator) : 
+    Model::Model(BaseObject* creator) :
         StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15)
     {
@@ -59 +59 @@
     {
         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);
@@ -81 +81 @@
         return scaleFactor;
     }
-    
+
     void Model::changedMesh()
     {
@@ -88 +88 @@
             if (this->mesh_.getEntity())
                 this->detachOgreObject(this->mesh_.getEntity());
-            
+
             this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
@@ -96 +96 @@
                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
                 this->mesh_.setVisible(this->isVisible());
-                
-                
+
+
                 //LOD
                 if( this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1 )
                 {
                     Level* level = this->getLevel();
-                  
+
                     assert( level != 0 );
-                    
+
                     MeshLodInformation* lodInfo = level->getLodInfo(this->meshSrc_);
                     if( lodInfo )
@@ -122 +122 @@
                         float volume = this->mesh_.getEntity()->getBoundingBox().volume();
     //                     float scaleFactor = 1;
-                        
+
     //                     BaseObject* creatorPtr = this;
-    //                     
+    //
     //                     while(creatorPtr!=NULL&&orxonox_cast<WorldEntity*>(creatorPtr))
     //                     {
@@ -131 +131 @@
     //                     }
     //                     COUT(0) << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
-                        
+
                         COUT(4) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << std::endl;
 
@@ -144 +144 @@
     //                         float factor = scaleFactor*5/lodLevel_;
                             float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
-                            
+
                             COUT(4) << "LodLevel set with factor: " << factor << endl;
 
@@ -160 +160 @@
                                 distList.pop_back();
 
-                            
+
                             //Generiert LOD-Levels
                             this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, this->lodReductionRate_);
@@ -171 +171 @@
                             else
                                 what = "<0";
-                            
+
                             COUT(4)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"." << endl;
                         }

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

@@ -61 +61 @@
             inline bool getCastShadows() const
                 { return this->bCastShadows_; }
-                
+
         protected:
             void changedMesh();
             void changedShadows();
-            
+
             //LoD
             inline void setLodLevel(float lodLevel)
@@ -76 +76 @@
             Mesh mesh_;
             bool bCastShadows_;
-            
+
             //LoD
             float lodLevel_;
@@ -82 +82 @@
             unsigned int numLodLevels_;
             float lodReductionRate_;
-            
+
     };
 }