Changeset 8381 for code/branches

Timestamp:

May 2, 2011, 3:58:10 PM (14 years ago)

Author:

ssgier

Message:

started creating a more efficient code structure

Location:

code/branches/pickup/src/modules/pickup/items

Files:

• ShrinkPickup.cc (modified) (3 diffs)
• ShrinkPickup.h (modified) (2 diffs)

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

@@ -7 +7 @@
 #include "pickup/PickupIdentifier.h"
 #include "worldentities/pawns/Pawn.h"
+
+#include "weaponsystem/WeaponSlot.h"
+#include "weaponsystem/Weapon.h"
 
 namespace orxonox
@@ -40 +43 @@
         
                         COUT(0) << "shrinking..." << endl;
+                        //this->pawn->setScale3D(this->pawn->getScale3D() / 2.0);
                         std::set<WorldEntity*> set = this->pawn->getAttachedObjects();
                         for(std::set<WorldEntity*>::iterator it = set.begin(); it != set.end(); it++)
                         {
                                 (*it)->setScale((*it)->getScale() / 5.0);
+                                (*it)->setPosition((*it)->getPosition() / 5.0);
                         }
+                        
                         durationTimer.setTimer(10, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));
         }
@@ -55 +61 @@
         void ShrinkPickup::terminate(void)
         {
+                //this->pawn->setScale3D(this->pawn->getScale3D() * 5.0);
+
                 std::set<WorldEntity*> set = this->pawn->getAttachedObjects();
                 for(std::set<WorldEntity*>::iterator it = set.begin(); it != set.end(); it++)

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

@@ -5 +5 @@
 
 #include <string>
+#include <vector>
 
 #include "pickup/Pickup.h"
@@ -27 +28 @@
         private:
             void initialize(void);
-                Pawn* carrierToPawnHelper(void);
+                        const float duration;                   //determines how long the pickup will be active
+                const float shrinkFactor;               //shrink factor of the space ship
+                        const float shrinkDelay;                //how long it takes to shrink to the final size
+                        double factorPerCall;
+                        bool isTerminating;
+                        vector<float> defaultScales;
+                        vector<float> smallScales;
+                        vector<float> actualScales;
+                        vector<float> defaultPositions;
+                        vector<float> smallPositions;
+                        vector<float> actualPositions;
+                        Pawn* carrierToPawnHelper(void);
                         Pawn* pawn;
                         Timer durationTimer;