Changeset 7039 for code/branches/presentation3

Timestamp:

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

Author:

rgrieder

Message:

Removed some tabs.

Location:

code/branches/presentation3/src

Files:

• libraries/network/ChatListener.h (modified) (1 diff)
• modules/designtools/CreateStars.cc (modified) (1 diff)
• modules/designtools/ScreenshotManager.cc (modified) (6 diffs)
• modules/designtools/ScreenshotManager.h (modified) (1 diff)
• modules/designtools/SkyboxGenerator.cc (modified) (1 diff)
• modules/pickup/items/ShieldPickup.h (modified) (1 diff)
• modules/weapons/RocketController.h (modified) (1 diff)
• modules/weapons/projectiles/SimpleRocket.h (modified) (4 diffs)
• orxonox/Level.h (modified) (1 diff)
• orxonox/graphics/MeshLodInformation.cc (modified) (2 diffs)
• orxonox/worldentities/Drone.cc (modified) (3 diffs)
• orxonox/worldentities/Drone.h (modified) (1 diff)

code/branches/presentation3/src/libraries/network/ChatListener.h

@@ -38 +38 @@
     {
         public:
-            /* constructor, destructor */
+            /* constructor, destructor */
             ChatListener();
             virtual ~ChatListener() {}

code/branches/presentation3/src/modules/designtools/CreateStars.cc

@@ -121 +121 @@
         XMLPortParam(CreateStars, "radiusDiff", setRadiusDiff, getRadiusDiff, xmlelement, mode);
         XMLPortParam(CreateStars, "radius", setRadius, getRadius, xmlelement, mode);
-        }
+    }
 
 }

code/branches/presentation3/src/modules/designtools/ScreenshotManager.cc

@@ -25 +25 @@
         mDisableOverlays  = overlayFlag;
         //get current window size
-        mWindowWidth     = pRenderWindow->getWidth();
-        mWindowHeight    = pRenderWindow->getHeight();
+        mWindowWidth   = pRenderWindow->getWidth();
+        mWindowHeight  = pRenderWindow->getHeight();
         //create temporary texture
         mTempTex = Ogre::TextureManager::getSingleton().createManual("ScreenShotTex", 
@@ -64 +64 @@
         //set the viewport settings
         Ogre::Viewport *vp = mRT->getViewport(0);
-        vp->setClearEveryFrame(true);   
+        vp->setClearEveryFrame(true);  
         vp->setOverlaysEnabled(false);
 
@@ -78 +78 @@
             // Simple case where the contents of the screen are taken directly
             // Also used when an invalid value is passed within gridSize (zero or negative grid size)
-            mRT->update();              //render
+            mRT->update();    //render
 
             //write the file on the Harddisk
@@ -91 +91 @@
             
             // compute the Stepsize for the drid
-            Ogre::Real frustumGridStepHorizontal        = (originalFrustumRight * 2) / mGridSize;
-            Ogre::Real frustumGridStepVertical  = (originalFrustumTop * 2) / mGridSize;
+            Ogre::Real frustumGridStepHorizontal  = (originalFrustumRight * 2) / mGridSize;
+            Ogre::Real frustumGridStepVertical  = (originalFrustumTop * 2) / mGridSize;
 
             // process each grid
@@ -103 +103 @@
                 // Shoggoth frustum extents setting
                 // compute the new frustum extents
-                frustumLeft             = originalFrustumLeft + frustumGridStepHorizontal * x;
-                frustumRight    = frustumLeft + frustumGridStepHorizontal;
-                frustumTop              = originalFrustumTop - frustumGridStepVertical * y;
-                frustumBottom   = frustumTop - frustumGridStepVertical;
+                frustumLeft    = originalFrustumLeft + frustumGridStepHorizontal * x;
+                frustumRight  = frustumLeft + frustumGridStepHorizontal;
+                frustumTop    = originalFrustumTop - frustumGridStepVertical * y;
+                frustumBottom  = frustumTop - frustumGridStepVertical;
                 
                 // set the frustum extents value to the camera
@@ -113 +113 @@
                 // ignore time duration between frames
                 Ogre::Root::getSingletonPtr()->clearEventTimes();
-                mRT->update();          //render
+                mRT->update();    //render
                 
                 //define the current 

code/branches/presentation3/src/modules/designtools/ScreenshotManager.h

@@ -40 +40 @@
       
     protected:
-        std::string      mFileExtension;
+        std::string    mFileExtension;
         unsigned int   mGridSize, mWindowWidth, mWindowHeight;
         bool           mDisableOverlays;

code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc

@@ -151 +151 @@
         }
     }
-        
-        void SkyboxGenerator::createSkybox( ) 
-        {
+
+    void SkyboxGenerator::createSkybox( ) 
+    {
         SkyboxGenerator::getInstance().takeScreenshot_ = true;
         CommandExecutor::execute("pause");
-        }
+    }
 }

code/branches/presentation3/src/modules/pickup/items/ShieldPickup.h

@@ -50 +50 @@
         A Pickup which can add a Shield to the Pawn.
 
-        1) The percentage: The percentage the shield takes from the damage dealt to a Pawn
-        2) The hit points: The amount of damage points a shield can teake before collapsing
+        1) The percentage: The percentage the shield takes from the damage dealt to a Pawn
+        2) The hit points: The amount of damage points a shield can teake before collapsing
         3) The activation type: 'immediate' or 'onUse'. defines if the item is used when it's picked up or only after the player chooses to use it.
         4) The duration: the activation time of the pickup.

code/branches/presentation3/src/modules/weapons/RocketController.h

@@ -49 +49 @@
         public:
             RocketController(BaseObject* creator);
-                        virtual ~RocketController();
+            virtual ~RocketController();
             
             virtual void tick(float dt);
-                        SimpleRocket* getRocket() const
+            SimpleRocket* getRocket() const
              {  return this->rocket_;  };
-                        void setTarget(WorldEntity* target);
+            void setTarget(WorldEntity* target);
         protected:
-                        void moveToPosition(const Vector3& target);
-                        void setTargetPosition();
-                        void moveToTargetPosition();
+            void moveToPosition(const Vector3& target);
+            void setTargetPosition();
+            void moveToTargetPosition();
 
         private:
-                        SimpleRocket* rocket_; //!<The Rocket it controlls
-                        Vector3 targetPosition_;
-                        WeakPtr<PlayerInfo> player_;
-                                                
-                        WeakPtr<WorldEntity> target_;
+            SimpleRocket* rocket_; //!<The Rocket it controlls
+            Vector3 targetPosition_;
+            WeakPtr<PlayerInfo> player_;
+                        
+            WeakPtr<WorldEntity> target_;
 
 

code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h

@@ -51 +51 @@
             SimpleRocket(BaseObject* creator);
             virtual ~SimpleRocket();
-                        virtual void tick(float dt);
+            virtual void tick(float dt);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a SimpleRocket through XML.
 
@@ -66 +66 @@
             virtual void rotatePitch(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
-                        void setDestroy();
+            void setDestroy();
 
             /**
@@ -99 +99 @@
             inline void rotatePitch(float value)
             {   
-                                this->rotatePitch(Vector2(value, 0)); }
+                this->rotatePitch(Vector2(value, 0)); }
             /**
             @brief Rotates the SimpleRocket around the z-axis by the specifed amount.
@@ -106 +106 @@
             inline void rotateRoll(float value)
             { 
-                                this->rotateRoll(Vector2(value, 0)); }
+                this->rotateRoll(Vector2(value, 0)); }
 
             void setOwner(Pawn* owner);

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()