Changeset 9469 for code/branches

Timestamp:

Nov 26, 2012, 4:08:25 PM (12 years ago)

Author:

moralelastix

Message:

preparations

Location:

code/branches/turret

Files:

• data/levels/turretTest.oxw (added)
• src/modules/objects/Turret.cc (modified) (4 diffs)
• src/modules/objects/Turret.h (modified) (2 diffs)

code/branches/turret/src/modules/objects/Turret.cc

@@ -28 +28 @@
 
 #include "Turret.h"
-
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
+#include "controllers/WaypointPatrolController.h"
 
 namespace orxonox
@@ -44 +42 @@
     {
         RegisterObject(Turret);
-
+        this->controller_ = new WaypointPatrolController(this);
     }
 
@@ -55 +53 @@
     }
 
-    void Turret::rotateYaw(const Vector2& value)
+    /*void Turret::rotateYaw(const Vector2& value)
     {
 
@@ -69 +67 @@
     {
 
+    }*/
+
+    void Turret::setAlertnessRadius(float value)
+    {
+        this->controller_->setAlertnessRadius(value);
+    }
+    float Turret::getAlertnessRadius()
+    {
+        return this->controller_->getAlertnessRadius();
+    }
+
+    void Turret::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(Turret, XMLPort, xmlelement, mode);
+        XMLPortParam(Turret, "alertnessRadius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues("400");
     }
 
 
-
-    /*void Turret::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(Turret, XMLPort, xmlelement, mode);
-
-        XMLPortParam(Turret, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("Turret/Atmosphere");
-    }*/
-
-
 }

code/branches/turret/src/modules/objects/Turret.h

@@ -46 +46 @@
         public:
             Turret(BaseObject* creator);
-
             virtual ~Turret();
 
@@ -54 +53 @@
             virtual void moveUpDown(const Vector2& value) {}
 
-            virtual void rotateYaw(const Vector2& value);
+            /*virtual void rotateYaw(const Vector2& value);
             virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateRoll(const Vector2& value);*/
 
+            void setAlertnessRadius(float value);
+            float getAlertnessRadius();
 
-            //virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
 
         protected:
-
+            WaypointPatrolController* controller_;
         private: