Changeset 9945 for code/trunk/src/modules

Timestamp:

Jan 3, 2014, 1:50:22 PM (10 years ago)

Author:

landauf

Message:

replaced tabs with spaces. no changes in code

Location:

code/trunk/src/modules

Files:

• docking/Dock.cc (modified) (1 diff)
• docking/MoveToDockingTarget.cc (modified) (1 diff)
• gametypes/SpaceRaceController.cc (modified) (1 diff)
• invader/InvaderWeaponEnemy.cc (modified) (1 diff)
• objects/ForceField.cc (modified) (1 diff)
• objects/Turret.cc (modified) (2 diffs)
• overlays/hud/HUDRadar.cc (modified) (6 diffs)
• overlays/hud/HUDRadar.h (modified) (1 diff)
• pong/PongBall.cc (modified) (5 diffs)
• tetris/TetrisBrick.cc (modified) (5 diffs)
• tetris/TetrisScore.cc (modified) (1 diff)
• weapons/weaponmodes/HsW01.cc (modified) (1 diff)
• weapons/weaponmodes/HsW01.h (modified) (2 diffs)

code/trunk/src/modules/docking/Dock.cc

@@ -86 +86 @@
     {
 
-        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
-
-        // Check whether it is a player trigger and extract pawn from it
-        if(pTrigger != NULL)
-        {
-              if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
-              orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
-              return false;
-              }
-              player = pTrigger->getTriggeringPlayer();
-        }
-        else
-        {
-              orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
-              return false;
-        }
-        if(player == NULL)
-        {
-              orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
-              return false;
-        }
-
-            if(bTriggered)
-        {
-              // Add player to this Docks candidates
-              candidates_.insert(player);
-
-              // Show docking dialog
-              this->showUndockingDialogHelper(player);
-        }
-        else
-        {
-              // Remove player from candidates list
-              candidates_.erase(player);
-        }
-
-        return true;
+        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
+        PlayerInfo* player = NULL;
+
+        // Check whether it is a player trigger and extract pawn from it
+        if(pTrigger != NULL)
+        {
+            if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
+            orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
+            return false;
+            }
+            player = pTrigger->getTriggeringPlayer();
+        }
+        else
+        {
+            orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
+            return false;
+        }
+        if(player == NULL)
+        {
+            orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
+            return false;
+        }
+
+        if(bTriggered)
+        {
+            // Add player to this Docks candidates
+            candidates_.insert(player);
+
+            // Show docking dialog
+            this->showUndockingDialogHelper(player);
+        }
+        else
+        {
+            // Remove player from candidates list
+            candidates_.erase(player);
+        }
+
+        return true;
     }
 

code/trunk/src/modules/docking/MoveToDockingTarget.cc

@@ -66 +66 @@
     {
         //TODO: Investigate strange things...
-        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
+        //this->parent_->detach((WorldEntity*)player->getControllableEntity());
 
-        //TODO: Check the issue with this detach call.
-        //I have removed the line because the detach call only caused a warning and terminated. And because I didn't find a attach call either.
-        //Didn't find the need for the line.
+        //TODO: Check the issue with this detach call.
+        //I have removed the line because the detach call only caused a warning and terminated. And because I didn't find a attach call either.
+        //Didn't find the need for the line.
         this->parent_->undockingAnimationFinished(player);
         return true;

code/trunk/src/modules/gametypes/SpaceRaceController.cc

@@ -464 +464 @@
                 currentShape->getBoundingSphere(positionObject,radiusObject);
                 Vector3 positionObjectNonBT(positionObject.x(), positionObject.y(), positionObject.z());
-                                Vector3 norm_r_CP = cP1ToCP2.crossProduct(centerCP1-positionObjectNonBT);
-
-                                if(norm_r_CP.length() == 0){
-                                        Vector3 zufall;
+                Vector3 norm_r_CP = cP1ToCP2.crossProduct(centerCP1-positionObjectNonBT);
+
+                if(norm_r_CP.length() == 0){
+                    Vector3 zufall;
                     do{
                         zufall=Vector3(rnd(),rnd(),rnd());//random
                     }while((zufall.crossProduct(cP1ToCP2)).length() == 0);
-                                        norm_r_CP=zufall.crossProduct(cP1ToCP2);
-                                }
-                                Vector3 VecToVCP = norm_r_CP.crossProduct(cP1ToCP2);
-                                float distanzToCP1 = sqrt(powf(radiusObject,4)/(powf((centerCP1-positionObjectNonBT).length(), 2)-powf(radiusObject,2))+powf(radiusObject,2));
-                                float distanzToCP2 = sqrt(powf(radiusObject,4)/(powf((racepoint2->getPosition()-positionObjectNonBT).length(), 2)-powf(radiusObject,2))+powf(radiusObject,2));
+                    norm_r_CP=zufall.crossProduct(cP1ToCP2);
+                }
+                Vector3 VecToVCP = norm_r_CP.crossProduct(cP1ToCP2);
+                float distanzToCP1 = sqrt(powf(radiusObject,4)/(powf((centerCP1-positionObjectNonBT).length(), 2)-powf(radiusObject,2))+powf(radiusObject,2));
+                float distanzToCP2 = sqrt(powf(radiusObject,4)/(powf((racepoint2->getPosition()-positionObjectNonBT).length(), 2)-powf(radiusObject,2))+powf(radiusObject,2));
                 float distanz = std::max(distanzToCP1,distanzToCP2);
-                                //float distanz = 0.0f; //TEMPORARY
-                                Vector3 newCheckpointPositionPos = positionObjectNonBT+(distanz*VecToVCP)/VecToVCP.length();
-                                Vector3 newCheckpointPositionNeg = positionObjectNonBT-(distanz*VecToVCP)/VecToVCP.length();
-                                if((newCheckpointPositionPos - centerCP1).length() + (newCheckpointPositionPos - (centerCP1+cP1ToCP2)).length() < (newCheckpointPositionNeg - centerCP1).length() + (newCheckpointPositionNeg - (centerCP1+cP1ToCP2)).length() )
-                                {
-                                        RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionPos);
-                                }
-                                else
-                                {
-                                        RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionNeg);
-                                }
-                                return;
+                //float distanz = 0.0f; //TEMPORARY
+                Vector3 newCheckpointPositionPos = positionObjectNonBT+(distanz*VecToVCP)/VecToVCP.length();
+                Vector3 newCheckpointPositionNeg = positionObjectNonBT-(distanz*VecToVCP)/VecToVCP.length();
+                if((newCheckpointPositionPos - centerCP1).length() + (newCheckpointPositionPos - (centerCP1+cP1ToCP2)).length() < (newCheckpointPositionNeg - centerCP1).length() + (newCheckpointPositionNeg - (centerCP1+cP1ToCP2)).length() )
+                {
+                    RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionPos);
+                }
+                else
+                {
+                    RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionNeg);
+                }
+                return;
             }
         }

code/trunk/src/modules/invader/InvaderWeaponEnemy.cc

@@ -45 +45 @@
     void InvaderWeaponEnemy::shot()
     {
-        InvaderWeapon::shot();
+        InvaderWeapon::shot();
         // SUPER(InvaderWeaponEnemy, shot);
         // only shoot in foreward direction

code/trunk/src/modules/objects/ForceField.cc

@@ -203 +203 @@
         else if(this->mode_ == forceFieldMode::homogen)
         {
-                // Iterate over all objects that could possibly be affected by the ForceField.
-                for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
-                {
-                        Vector3 distanceVector = it->getWorldPosition() - this->getWorldPosition();
-                    float distance = distanceVector.length();
-                    if (distance < this->radius_ && distance > this->massRadius_)
-                    {
-                        // Add a Acceleration in forceDirection_.
-                        // Vector3(0,0,0) is the direction, where the force should work.
-                        it->addAcceleration(forceDirection_ , Vector3(0,0,0));
-                    }
-                }
+            // Iterate over all objects that could possibly be affected by the ForceField.
+            for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
+            {
+                Vector3 distanceVector = it->getWorldPosition() - this->getWorldPosition();
+                float distance = distanceVector.length();
+                if (distance < this->radius_ && distance > this->massRadius_)
+                {
+                    // Add a Acceleration in forceDirection_.
+                    // Vector3(0,0,0) is the direction, where the force should work.
+                    it->addAcceleration(forceDirection_ , Vector3(0,0,0));
+                }
+            }
         }
     }

code/trunk/src/modules/objects/Turret.cc

@@ -57 +57 @@
     void Turret::rotatePitch(const Vector2& value)
     {
-        orxout()<< "Turret rotate Pitch"<< endl;
+        orxout()<< "Turret rotate Pitch"<< endl;
 
-        const Quaternion& orient = this->getOrientation();
-        Radian pitch = orient.getPitch();
+        const Quaternion& orient = this->getOrientation();
+        Radian pitch = orient.getPitch();
 
-        if((value.x > 0 && pitch < Radian(180)) || (value.x < 0 && pitch > Radian(0)))
-                SpaceShip::rotatePitch(value);
+        if((value.x > 0 && pitch < Radian(180)) || (value.x < 0 && pitch > Radian(0)))
+            SpaceShip::rotatePitch(value);
     }
 
@@ -69 +69 @@
     void Turret::setAlertnessRadius(float value)
     {
-        this->controller_->setAlertnessRadius(value);
+        this->controller_->setAlertnessRadius(value);
     }
     float Turret::getAlertnessRadius()
     {
-        return this->controller_->getAlertnessRadius();
+        return this->controller_->getAlertnessRadius();
     }
 

code/trunk/src/modules/overlays/hud/HUDRadar.cc

@@ -71 +71 @@
 
         this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDRadar_mapDreiDFront_" + getUniqueNumberString()));
+            .createOverlayElement("Panel", "HUDRadar_mapDreiDFront_" + getUniqueNumberString()));
         this->map3DFront_->setMaterialName("Orxonox/Radar3DFront");
         this->overlay_->add2D(this->map3DFront_);
@@ -77 +77 @@
 
         this->map3DBack_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("Panel", "HUDRadar_mapDreiDBack_" + getUniqueNumberString()));
+            .createOverlayElement("Panel", "HUDRadar_mapDreiDBack_" + getUniqueNumberString()));
         this->map3DBack_->setMaterialName("Orxonox/Radar3DBack");
         this->overlay_->add2D(this->map3DBack_);
@@ -189 +189 @@
         if(RadarMode_)
         {
-                this->setBackgroundMaterial(material3D_);
-                this->map3DFront_->_notifyZOrder(this->overlay_->getZOrder() * 100 + 250); // it seems that the ZOrder of overlayelements is 100 times the ZOrder of the overlay
-                this->map3DBack_->_notifyZOrder(this->overlay_->getZOrder() * 100 - 250); // 250 a little bit buffer so that the two shels are displayed all in the front / in the back
-                this->map3DFront_->show();
-                this->map3DBack_->show();
+            this->setBackgroundMaterial(material3D_);
+            this->map3DFront_->_notifyZOrder(this->overlay_->getZOrder() * 100 + 250); // it seems that the ZOrder of overlayelements is 100 times the ZOrder of the overlay
+            this->map3DBack_->_notifyZOrder(this->overlay_->getZOrder() * 100 - 250); // 250 a little bit buffer so that the two shels are displayed all in the front / in the back
+            this->map3DFront_->show();
+            this->map3DBack_->show();
         }
         else
         {
-                this->setBackgroundMaterial(material2D_);
-                this->map3DFront_->hide();
-                this->map3DBack_->hide();
+            this->setBackgroundMaterial(material2D_);
+            this->map3DFront_->hide();
+            this->map3DBack_->hide();
         }
 
@@ -218 +218 @@
             float size;
             if(RadarMode_)
-                size = maximumDotSize3D_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
+                size = maximumDotSize3D_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
             else
-                size = maximumDotSize_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
+                size = maximumDotSize_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
             it->second->setDimensions(size, size);
 
@@ -228 +228 @@
             if(RadarMode_)
             {
-                coord = get3DProjection(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), 0.6435011, detectionLimit_);
-
-                // set zOrder on screen
-                bool overXZPlain = isObjectHigherThanShipOnMap(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), this->mapAngle_);
-
-                int zOrder = determineMap3DZOrder(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), detectionLimit_);
-                if(overXZPlain == false /*&& (it->second->getZOrder() >  100 * this->overlay_->getZOrder())*/) // it appears that zOrder of attached Overlayelements is 100 times the zOrder of the Overlay
-                        it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 - 70 + zOrder);
-                if(overXZPlain == true /*&& (it->second->getZOrder() <= 100 * this->overlay_->getZOrder())*/)
-                        it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 + 70 + zOrder);
+                coord = get3DProjection(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), 0.6435011, detectionLimit_);
+
+                // set zOrder on screen
+                bool overXZPlain = isObjectHigherThanShipOnMap(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), this->mapAngle_);
+
+                int zOrder = determineMap3DZOrder(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition(), detectionLimit_);
+                if(overXZPlain == false /*&& (it->second->getZOrder() >  100 * this->overlay_->getZOrder())*/) // it appears that zOrder of attached Overlayelements is 100 times the zOrder of the Overlay
+                    it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 - 70 + zOrder);
+                if(overXZPlain == true /*&& (it->second->getZOrder() <= 100 * this->overlay_->getZOrder())*/)
+                    it->second->_notifyZOrder(this->overlay_->getZOrder() * 100 + 70 + zOrder);
             }
             else
-                coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
+                coord = get2DViewcoordinates(this->owner_->getPosition(), this->owner_->getOrientation() * WorldEntity::FRONT, this->owner_->getOrientation() * WorldEntity::UP, wePointer->getWorldPosition());
 
             coord *= math::pi / 3.5f; // small adjustment to make it fit the texture
@@ -256 +256 @@
                 this->marker_->setPosition((1.0f + coord.x - size * 1.5f) * 0.5f, (1.0f - coord.y - size * 1.5f) * 0.5f);
                 if(RadarMode_)
-                        this->marker_->_notifyZOrder(it->second->getZOrder() -1);
+                    this->marker_->_notifyZOrder(it->second->getZOrder() -1);
                 this->marker_->show();
             }

code/trunk/src/modules/overlays/hud/HUDRadar.h

@@ -111 +111 @@
         float mapAngle_;
 
-        std::string material2D_;                //Material name for 2D map
-        std::string material3D_;                //Material names For the 3D minimap
+        std::string material2D_;        //Material name for 2D map
+        std::string material3D_;        //Material names For the 3D minimap
         std::string material3DFront_;
         std::string material3DBack_;

code/trunk/src/modules/pong/PongBall.cc

@@ -147 +147 @@
         {
             defBoundarySound_->play(); //play boundary sound
-                // Its velocity in z-direction is inverted (i.e. it bounces off).
+            // Its velocity in z-direction is inverted (i.e. it bounces off).
             velocity.z = -velocity.z;
             // And its position is set as to not overstep the boundary it has just crossed.
@@ -173 +173 @@
                     {
                         defBatSound_->play(); //play bat sound
-                        // Set the ball to be exactly at the boundary.
+                        // Set the ball to be exactly at the boundary.
                         position.x = this->fieldWidth_ / 2;
                         // Invert its velocity in x-direction (i.e. it bounces off).
@@ -186 +186 @@
                     else if (GameMode::isMaster() && position.x > this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
-                        defScoreSound_->play();//play score sound
+                        defScoreSound_->play();//play score sound
                         if (this->getGametype() && this->bat_[0])
                         {
@@ -202 +202 @@
                     {
                         defBatSound_->play(); //play bat sound
-                        // Set the ball to be exactly at the boundary.
+                        // Set the ball to be exactly at the boundary.
                         position.x = -this->fieldWidth_ / 2;
                         // Invert its velocity in x-direction (i.e. it bounces off).
@@ -215 +215 @@
                     else if (GameMode::isMaster() && position.x < -this->fieldWidth_ / 2 * (1 + this->relMercyOffset_))
                     {
-                        defScoreSound_->play();//play score sound
+                        defScoreSound_->play();//play score sound
                         if (this->getGametype() && this->bat_[1])
                         {

code/trunk/src/modules/tetris/TetrisBrick.cc

@@ -87 +87 @@
                     stone->addTemplate(this->tetris_->getCenterpoint()->getStoneTemplate());
                 else
-                        orxout()<< "tetris_->getCenterpoint == NULL in TetrisBrick.cc"<< endl;
+                    orxout()<< "tetris_->getCenterpoint == NULL in TetrisBrick.cc"<< endl;
             }
             else
@@ -116 +116 @@
             if(this->shapeIndex_ == 1 || this->shapeIndex_ == 6 || this->shapeIndex_ == 7)
             {
-                stone->setPosition(0.0f, 2*size_, 0.0f);
+                stone->setPosition(0.0f, 2*size_, 0.0f);
             }
             else if(this->shapeIndex_ == 3 || this->shapeIndex_ == 4|| this->shapeIndex_ == 5)
             {
-                stone->setPosition(size_, 0, 0.0f);
+                stone->setPosition(size_, 0, 0.0f);
             }
             else if(this->shapeIndex_ == 2)
             {
-                stone->setPosition(-size_, 0, 0.0f);
+                stone->setPosition(-size_, 0, 0.0f);
             }
         }
@@ -131 +131 @@
             if(this->shapeIndex_ == 2 || this->shapeIndex_ == 5)
             {
-                stone->setPosition(size_, size_, 0.0f);
+                stone->setPosition(size_, size_, 0.0f);
             }
             else if(this->shapeIndex_ == 1)
             {
-                stone->setPosition(0, 3*size_, 0.0f);
+                stone->setPosition(0, 3*size_, 0.0f);
             }
             else if(this->shapeIndex_ == 3 || this->shapeIndex_ == 7)
             {
-                stone->setPosition(-size_, 0, 0.0f);
+                stone->setPosition(-size_, 0, 0.0f);
             }
             else if(this->shapeIndex_ == 4)
             {
-                stone->setPosition(-size_, size_, 0.0f);
+                stone->setPosition(-size_, size_, 0.0f);
             }
             else if(this->shapeIndex_ == 6)
             {
-                stone->setPosition(size_, 0, 0.0f);
+                stone->setPosition(size_, 0, 0.0f);
             }
         }
@@ -154 +154 @@
     bool TetrisBrick::isValidMove(const Vector3& position, bool isRotation = false)
     {
-        return this->tetris_->isValidMove(this,position, isRotation);
+        return this->tetris_->isValidMove(this,position, isRotation);
     }
 
     TetrisStone* TetrisBrick::getStone(unsigned int i)
     {
-        if(i < this->brickStones_.size())
+        if(i < this->brickStones_.size())
             return this->brickStones_[i];
-        else return NULL;
+        else return NULL;
     }
 
@@ -192 +192 @@
         else if(!this->lockRotation_) //rotate when key up is pressed
         {
-                if(!isValidMove(this->getPosition(), true)) //catch illegal rotations
-                    return;
+            if(!isValidMove(this->getPosition(), true)) //catch illegal rotations
+                return;
             this->lockRotation_ = true; // multiple calls of this function have to be filtered out.
             this->rotationTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&TetrisBrick::unlockRotation, this)));

code/trunk/src/modules/tetris/TetrisScore.cc

@@ -92 +92 @@
         {
             std::string score("0");
-                if(!this->owner_->hasEnded())
+            if(!this->owner_->hasEnded())
             {
                 //get the player

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -82 +82 @@
         XMLPortParam(HsW01, "material", setMaterial, getMaterial, xmlelement, mode);
         XMLPortParam(HsW01, "projectileMesh", setMesh, getMesh, xmlelement, mode);
-        XMLPortParam(HsW01, "sound", setSound, getSound, xmlelement, mode);
+        XMLPortParam(HsW01, "sound", setSound, getSound, xmlelement, mode);
     }
 

code/trunk/src/modules/weapons/weaponmodes/HsW01.h

@@ -74 +74 @@
                 { return this->mesh_; }
 
-            /**
+            /**
             @brief Set the sound.
             @param mesh The Sound name.
@@ -81 +81 @@
                 { this->sound_ = sound; }
 
-            /**
+            /**
             @brief Get the sound.
             @return Returns the sound name.