Changeset 8554 for code/branches/pickup/src

Timestamp:

May 23, 2011, 11:26:08 PM (14 years ago)

Author:

dafrick

Message:

Some cleanup. Ready for merge.

Location:

code/branches/pickup/src

Files:

• libraries/util/SubString.h (modified) (1 diff)
• modules/objects/collisionshapes/BoxCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/ConeCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/SphereCollisionShape.h (modified) (1 diff)
• modules/pickup/PickupPrereqs.h (modified) (1 diff)
• modules/pickup/items/ShrinkPickup.cc (modified) (10 diffs)
• modules/pickup/items/ShrinkPickup.h (modified) (3 diffs)
• orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (2 diffs)
• orxonox/collisionshapes/CompoundCollisionShape.h (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/pickup/src/libraries/util/SubString.h

@@ -169 +169 @@
         /// Returns the number of tokens stored in this SubString
         inline unsigned int size() const { return this->tokens_.size(); }
-        /// Returns the i'th token from the subset of strings @param index The index of the requested doken
+        /// Returns the i'th token from the subset of strings @param index The index of the requested token
         inline const std::string& operator[](unsigned int index) const { return this->tokens_[index]; }
         /// Returns the i'th token from the subset of strings @param index The index of the requested token

code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h

@@ -51 +51 @@
         Reto Grieder
 
+    @see btBoxShape
     @ingroup Collisionshapes
     */

code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h

@@ -49 +49 @@
         Reto Grieder
 
-    @ingroup Collisionshapes.
+    @see btConeShape
+    @ingroup Collisionshapes
     */
     class _ObjectsExport ConeCollisionShape : public CollisionShape

code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h

@@ -51 +51 @@
         Martin Stypinski
 
+    @see btStaticPlaneShape
     @ingroup Collisionshapes
     */

code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h

@@ -49 +49 @@
         Reto Grieder
 
+    @see btSphereShape
     @ingroup Collisionshapes
     */

code/branches/pickup/src/modules/pickup/PickupPrereqs.h

@@ -82 +82 @@
     class SpeedPickup;
     class ShieldPickup;
-        class ShrinkPickup;
+    class ShrinkPickup;
 
 }

code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc

@@ -51 +51 @@
     CreateFactory(ShrinkPickup);
 
-                /**
+        /**
     @brief
         Constructor: Initializes the Pickup.
@@ -60 +60 @@
 
         this->initialize();
+        this->shrinkFactor_ = 5.0;
+        this->shrinkSpeed_ = 5.0;
+        this->duration_ = 5.0;
         isActive_ = false;
         isTerminating_ = false;
@@ -92 +95 @@
    /**
     @brief
-        Method for creating a HealthPickup object through XML.
+        Method for creating a ShrinkhPickup object through XML.
     */
     void ShrinkPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
@@ -143 +146 @@
     }
 
-                /**
+    /**
     @brief
         Prepares for shrinking (collecting several informations).
@@ -153 +156 @@
         if(this->isUsed())
         {
-            this->pawn = this->carrierToPawnHelper();
-            if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+            this->pawn_ = this->carrierToPawnHelper();
+            if(pawn_ == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                 this->Pickupable::destroy();
 
             //Collect scaling information.
-            defaultScale_ = this->pawn->getScale3D();
-            defaultMass_ = this->pawn->getMass();
+            defaultScale_ = this->pawn_->getScale3D();
+            defaultMass_ = this->pawn_->getMass();
 
             smallScale_ = defaultScale_ / shrinkFactor_;
@@ -167 +170 @@
             actualMass_ = defaultMass_;
 
-            cameraPositions_ = this->pawn->getCameraPositions();
+            cameraPositions_ = this->pawn_->getCameraPositions();
             size_ = cameraPositions_.size();
             isActive_ = true;    //start shrinking now.
-            durationTimer.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));    //Set timer for termination.
+            durationTimer_.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));    //Set timer for termination.
         }
     }
 
-        /**
+    /**
     @brief
         Updates the scales of the ship.
@@ -189 +192 @@
             actualMass_ /= factor_;
 
-            this->pawn->setScale3D(actualScale_);
-            this->pawn->setMass(actualMass_);
+            this->pawn_->setScale3D(actualScale_);
+            this->pawn_->setMass(actualMass_);
 
             for(int index = 0; index < size_; index++)
             {
-                CameraPosition* cameraPos_ = this->pawn->getCameraPosition(index);
+                CameraPosition* cameraPos_ = this->pawn_->getCameraPosition(index);
                 if(cameraPos_ == NULL)
                 continue;
@@ -209 +212 @@
             actualMass_ *= factor_;
 
-            this->pawn->setScale3D(actualScale_);
-            this->pawn->setMass(actualMass_);
+            this->pawn_->setScale3D(actualScale_);
+            this->pawn_->setMass(actualMass_);
 
             for(int index = 0; index < size_; index++)
             {
-                CameraPosition* cameraPos_ = this->pawn->getCameraPosition(index);
+                CameraPosition* cameraPos_ = this->pawn_->getCameraPosition(index);
                 if(cameraPos_ == NULL)
                 continue;
@@ -225 +228 @@
     }
 
-        /**
+    /**
     @brief
         Initializes the termination.
@@ -244 +247 @@
     }
 
-        /**
+    /**
     @brief
         Creates a duplicate of the input OrxonoxClass.

code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h

@@ -48 +48 @@
 
     /**
-        @author
+    @author
         Sandro Sgier
 
@@ -101 +101 @@
         private:
             void initialize(void);
-            float duration_;                    //!< determines how long the pickup will be active
+            float duration_;            //!< determines how long the pickup will be active
             float shrinkFactor_;        //shrink factor of the space ship
             float shrinkSpeed_;         //speed of shrinking
@@ -114 +114 @@
             float defaultMass_;
             float actualMass_;
-            float smallMass_;                   
+            float smallMass_;            
             Pawn* carrierToPawnHelper(void);
-            Pawn* pawn;
-            Timer durationTimer;
+            Pawn* pawn_;
+            Timer durationTimer_;
             void terminate(void);
     };

code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -261 +261 @@
         CollisionShape::changedScale();
 
-        // Iterate through all attached CollisionShapes.
+        std::vector<CollisionShape*> shapes;
+        // Iterate through all attached CollisionShapes and add them to the list of shapes.
+        for(std::map<CollisionShape*, btCollisionShape*>::iterator it = this->attachedShapes_.begin(); it != this->attachedShapes_.end(); it++)
+            shapes.push_back(it->first);
+
+        // Delete the compound shape and create a new one.
+        delete this->compoundShape_;
+        this->compoundShape_ = new btCompoundShape();
+
+        // Re-attach all CollisionShapes.
+        for(std::vector<CollisionShape*>::iterator it = shapes.begin(); it != shapes.end(); it++)
+        {
+            CollisionShape* shape = *it;
+            shape->setScale3D(this->getScale3D());
+            // Only actually attach if we didn't pick a CompoundCollisionShape with no content.
+            if (shape->getCollisionShape())
+            {
+                btTransform transf(multi_cast<btQuaternion>(shape->getOrientation()), multi_cast<btVector3>(shape->getPosition()));
+                // Add the btCollisionShape of the CollisionShape as a child shape to the btCompoundShape of the CompoundCollisionShape.
+                this->compoundShape_->addChildShape(transf, shape->getCollisionShape());
+            }
+        }
+
+        this->updatePublicShape();
+
+        /*
+        // Iterate through all attached CollisionShapes
         for(std::map<CollisionShape*, btCollisionShape*>::const_iterator it = this->attachedShapes_.begin(); it != this->attachedShapes_.end(); it++)
         {
@@ -269 +295 @@
         }
 
-        this->updatePublicShape();
+        this->updatePublicShape();*/
     }
 }

code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -52 +52 @@
         Reto Grieder
 
+    @see btCompoundShape
     @ingroup Collisionshapes
     */

code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc

@@ -643 +643 @@
     {
         // If physics is enabled scale the attached CollisionShape.
-        if (false && this->hasPhysics() && this->collisionShape_ != NULL)
+        /*if (this->hasPhysics() && this->collisionShape_ != NULL)
         {
             this->collisionShape_->setScale3D(scale);
-        }
+        }*/
 
         this->node_->setScale(scale);