Changeset 10557 for code/branches/core7/src/modules/dodgerace

Timestamp:

Aug 29, 2015, 6:18:30 PM (9 years ago)

Author:

landauf

Message:

cleanup: no need to pass/return WeakPtrs to/from functions. normal pointers are enough.

Location:

code/branches/core7/src/modules/dodgerace

Files:

• DodgeRace.cc (modified) (4 diffs)
• DodgeRace.h (modified) (1 diff)
• DodgeRaceShip.cc (modified) (2 diffs)
• DodgeRaceShip.h (modified) (1 diff)

code/branches/core7/src/modules/dodgerace/DodgeRace.cc

@@ -75 +75 @@
             for (int i = 0; i < 7; i++)
             {
-                WeakPtr<BigExplosion> chunk = new BigExplosion(this->center_->getContext());
+                BigExplosion* chunk = new BigExplosion(this->center_->getContext());
                 chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
                 chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
@@ -91 +91 @@
         if (getPlayer() != NULL)
         {
-            //WeakPtr<DodgeRaceShip> ship = getPlayer();
-
             currentPosition = getPlayer()->getWorldPosition().x;
             counter = counter + (currentPosition - lastPosition);
@@ -113 +111 @@
                 for(int i = 0; i<6; i++)
                 {
-                    WeakPtr<DodgeRaceCube> cube = new DodgeRaceCube(this->center_->getContext());
+                    DodgeRaceCube* cube = new DodgeRaceCube(this->center_->getContext());
                     cubeList.push_back(cube);
                     switch(pattern)
@@ -138 +136 @@
     }
 
-    WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
+    DodgeRaceShip* DodgeRace::getPlayer()
     {
         if (player == NULL)

code/branches/core7/src/modules/dodgerace/DodgeRace.h

@@ -105 +105 @@
             Timer endGameTimer;
 
-            WeakPtr<DodgeRaceShip> getPlayer();
+            DodgeRaceShip* getPlayer();
             WeakPtr<DodgeRaceShip> player;
             std::vector<DodgeRaceCube*> cubeList;

code/branches/core7/src/modules/dodgerace/DodgeRaceShip.cc

@@ -90 +90 @@
 
         // Camera
-        WeakPtr<Camera> camera = this->getCamera();
+        Camera* camera = this->getCamera();
         if (camera != NULL)
         {
@@ -150 +150 @@
     }
 
-    WeakPtr<DodgeRace> DodgeRaceShip::getGame()
+    DodgeRace* DodgeRaceShip::getGame()
     {
         if (game == NULL)

code/branches/core7/src/modules/dodgerace/DodgeRaceShip.h

@@ -78 +78 @@
         private:
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            WeakPtr<DodgeRace> getGame();
+            DodgeRace* getGame();
             WeakPtr<DodgeRace> game;
             WeakPtr<WorldEntity> lastEntity;