Changeset 8741 for code

Timestamp:

Jul 10, 2011, 9:53:17 PM (13 years ago)

Author:

jo

Message:

Correction of camera bug.

Location:

code/branches/ai2/src/orxonox

Files:

• controllers/ArtificialController.h (modified) (2 diffs)
• worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/branches/ai2/src/orxonox/controllers/ArtificialController.h

@@ -142 +142 @@
 
             static bool sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype); // hack
-            void boostControl();
+            void boostControl(); //<! Sets and resets the boost parameter of the spaceship. Bots alternate between boosting and saving boost.
 
             bool bHasTargetPosition_;
@@ -149 +149 @@
             bool bShooting_;
 
-            int numberOfWeapons; //< Used for weapon init function. Displayes number of weapons available for a bot.
+            int numberOfWeapons; //<! Used for weapon init function. Displayes number of weapons available for a bot.
             bool weapons[WeaponSystem::MAX_WEAPON_MODES]; //<! Displays if a weapon is available - managed by setupWeapons()
-            int projectiles[WeaponSystem::MAX_WEAPON_MODES]; //<! Displays amount of projectiles. - managed by setupWeapons()
-            float botlevel_; //< Makes the level of a bot configurable.
-            float timeout_; //< Timeout for rocket usage. (If a rocket misses, a bot should stop using it.)
+            int projectiles[WeaponSystem::MAX_WEAPON_MODES]; //<! Displays amount of projectiles of each weapon. - managed by setupWeapons()
+            float botlevel_; //<! Makes the level of a bot configurable.
+            float timeout_; //<! Timeout for rocket usage. (If a rocket misses, a bot should stop using it.)
 
             enum Mode {DEFAULT, ROCKET, DEFENCE, MOVING};//TODO; implement DEFENCE, MOVING modes

code/branches/ai2/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -326 +326 @@
     void SpaceShip::resetCamera()
     {
-        Camera *camera = this->getCamera();
-
-        if (camera == 0)
-        {
-            COUT(2) << "Failed to reset camera!";
-            return;
-        }
-    
-        this->shakeDt_ = 0;
-        camera->setPosition(this->cameraOriginalPosition_);
-        camera->setOrientation(this->cameraOriginalOrientation_);
+        if(this->hasLocalController() && this->hasHumanController())
+        {
+            Camera *camera = this->getCamera();
+
+            if (camera == 0)
+            {
+                COUT(2) << "Failed to reset camera!";
+                return;
+            }
+    
+            this->shakeDt_ = 0;
+            camera->setPosition(this->cameraOriginalPosition_);
+            camera->setOrientation(this->cameraOriginalOrientation_);
+        }
     }