Changeset 7039 for code/branches/presentation3/src/orxonox

Timestamp:

May 31, 2010, 9:33:09 AM (14 years ago)

Author:

rgrieder

Message:

Removed some tabs.

Location:

code/branches/presentation3/src/orxonox

Files:

• Level.h (modified) (1 diff)
• graphics/MeshLodInformation.cc (modified) (2 diffs)
• worldentities/Drone.cc (modified) (3 diffs)
• worldentities/Drone.h (modified) (1 diff)

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

@@ -57 +57 @@
             void playerEntered(PlayerInfo* player);
             void playerLeft(PlayerInfo* player);
-                        
+
             MeshLodInformation* getLodInfo(std::string meshName) const;
 

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

@@ -41 +41 @@
 
     MeshLodInformation::MeshLodInformation(BaseObject* creator) 
-        : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
+    : BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
     {
         RegisterObject(MeshLodInformation);
@@ -62 +62 @@
     std::string MeshLodInformation::getMeshName()
     {
-                return MeshLodInformation::getMeshSource();
+        return MeshLodInformation::getMeshSource();
     }
-        
-        void MeshLodInformation::setLodLevel(float lodLevel)
-        {
+    
+    void MeshLodInformation::setLodLevel(float lodLevel)
+    {
         if(lodLevel>=0)
-                    lodLevel_=lodLevel;
-        }
-        float MeshLodInformation::getLodLevel()
-        {
-                return lodLevel_;
-        } 
-        void MeshLodInformation::setMeshSource(std::string meshSource)
-        {
-                meshSource_ = meshSource;
-        }
-        std::string MeshLodInformation::getMeshSource()
-        {
-                return meshSource_;
-        }
+            lodLevel_=lodLevel;
+    }
+    float MeshLodInformation::getLodLevel()
+    {
+        return lodLevel_;
+    } 
+    void MeshLodInformation::setMeshSource(std::string meshSource)
+    {
+        meshSource_ = meshSource;
+    }
+    std::string MeshLodInformation::getMeshSource()
+    {
+        return meshSource_;
+    }
  
 }

code/branches/presentation3/src/orxonox/worldentities/Drone.cc

@@ -1 @@
-
-
-
-
-
-
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -47 +41 @@
     Drone::Drone(BaseObject* creator) : Pawn(creator)
     {
-        RegisterObject(Drone);
+        RegisterObject(Drone);
 
         this->myController_ = 0;
@@ -80 +74 @@
         SUPER(Drone, XMLPort, xmlelement, mode);
 
-        XMLPortParam(Drone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
-        XMLPortParam(Drone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
-        XMLPortParam(Drone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
+        XMLPortParam(Drone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
+        XMLPortParam(Drone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
+        XMLPortParam(Drone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
         XMLPortParam(Drone, "maxDistanceToOwner_", setMaxDistanceToOwner, getMaxDistanceToOwner, xmlelement, mode);
         XMLPortParam(Drone, "minDistanceToOwner_", setMinDistanceToOwner, getMinDistanceToOwner, xmlelement, mode);

code/branches/presentation3/src/orxonox/worldentities/Drone.h

@@ -114 +114 @@
             inline void setMinDistanceToOwner( float distance)
                 { this->minDistanceToOwner_=distance; }
-                        
+
             
             /**
             @brief Gets the primary thrust to the input amount.
-            @preturn The amount of thrust.
+            @return The amount of thrust.
             */
             inline float getPrimaryThrust()
                 { return this->primaryThrust_; }
-            inline float getAuxilaryThrust()
+            inline float getAuxilaryThrust()
                 { return this->auxilaryThrust_; }
-            inline float getRotationThrust()
+            inline float getRotationThrust()
                 { return this->rotationThrust_; }
-            inline float getMaxDistanceToOwner()
+            inline float getMaxDistanceToOwner()
                 { return this->maxDistanceToOwner_; }
             inline float getMinDistanceToOwner()