Changeset 8891 for code/trunk/src/orxonox/worldentities/pawns

Timestamp:

Oct 12, 2011, 7:50:43 PM (13 years ago)

Author:

jo

Message:

Ai and tutorial improvements merged back to the trunk. AI features: all weapons are used, the ai-firestrength is configurable, bots are able to collect pickups . I've set the tutorial level as default level.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -93 +93 @@
 
         this->isHumanShip_ = this->hasLocalController();
-        
+
         this->setSyncMode(ObjectDirection::Bidirectional); // needed to synchronise e.g. aimposition
     }
@@ -450 +450 @@
         this->isHumanShip_ = true;
     }
+
+    void Pawn::changedActivity(void)
+    {
+        SUPER(Pawn, changedActivity);
+
+        this->setRadarVisibility(this->isActive());
+    }
+
+    void Pawn::changedVisibility(void)
+    {
+        SUPER(Pawn, changedVisibility);
+        //this->setVisible(this->isVisible());
+        this->setRadarVisibility(this->isVisible());
+    }
+
 }

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -170 +170 @@
             virtual const Vector3& getCarrierPosition(void) const
                 { return this->getWorldPosition(); };
+            virtual void changedActivity(void); //!< To enable radarviewability when the activity is changed
+            virtual void changedVisibility(void); //!< To enable proper radarviewability when the visibility is changed
 
         protected:
@@ -195 +197 @@
             float maxHealth_;
             float initialHealth_;
-            
+
             float shieldHealth_;
             float maxShieldHealth_;

code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -298 +298 @@
     }
 
-        /**
-    @brief
-        Add an Engine to the SpaceShip.
-    @param engine
-        A pointer to the Engine to be added.
-    */
     void SpaceShip::addEngine(orxonox::Engine* engine)
     {
@@ -504 +498 @@
     void SpaceShip::resetCamera()
     {
-        Camera *camera = this->getCamera();
-        if (camera == 0)
-        {
-            orxout(internal_warning) << "Failed to reset camera!" << endl;
-            return;
-        }
-
-        this->shakeDt_ = 0.0f;
-        camera->setPosition(this->cameraOriginalPosition_);
-        camera->setOrientation(this->cameraOriginalOrientation_);
+        if(this->hasLocalController() && this->hasHumanController())
+        {
+            Camera *camera = this->getCamera();
+            if (camera == 0)
+            {
+                orxout(internal_warning) << "Failed to reset camera!" << endl;
+                return;
+            }
+            this->shakeDt_ = 0.0f;
+            camera->setPosition(this->cameraOriginalPosition_);
+            camera->setOrientation(this->cameraOriginalOrientation_);
+        }
     }