[Orxonox-commit 4800] r9469 - in code/branches/turret: data/levels src/modules/objects

[moralelastix at orxonox.net]

Author: moralelastix
Date: 2012-11-26 16:08:25 +0100 (Mon, 26 Nov 2012)
New Revision: 9469

Added:
   code/branches/turret/data/levels/turretTest.oxw
Modified:
   code/branches/turret/src/modules/objects/Turret.cc
   code/branches/turret/src/modules/objects/Turret.h
Log:
preparations

Added: code/branches/turret/data/levels/turretTest.oxw
===================================================================
--- code/branches/turret/data/levels/turretTest.oxw	                        (rev 0)
+++ code/branches/turret/data/levels/turretTest.oxw	2012-11-26 15:08:25 UTC (rev 9469)
@@ -0,0 +1,38 @@
+<LevelInfo
+ name = "turret Test"
+ description = "A level with absolutely nothing in it."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+?>
+
+<Level>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  <?lua include("includes/notifications.oxi") ?>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+
+
+
+
+    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    
+  </Scene>
+</Level>
+

Modified: code/branches/turret/src/modules/objects/Turret.cc
===================================================================
--- code/branches/turret/src/modules/objects/Turret.cc	2012-11-26 15:06:46 UTC (rev 9468)
+++ code/branches/turret/src/modules/objects/Turret.cc	2012-11-26 15:08:25 UTC (rev 9469)
@@ -27,12 +27,10 @@
  */
 
 #include "Turret.h"
-
-
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "controllers/WaypointPatrolController.h"
 
-
 namespace orxonox
 {
     CreateFactory(Turret);
@@ -43,7 +41,7 @@
     Turret::Turret(BaseObject* creator) : Pawn(creator)
     {
         RegisterObject(Turret);
-
+        this->controller_ = new WaypointPatrolController(this);
     }
 
     /**
@@ -54,7 +52,7 @@
 
     }
 
-    void Turret::rotateYaw(const Vector2& value)
+    /*void Turret::rotateYaw(const Vector2& value)
     {
 
     }
@@ -68,16 +66,22 @@
     void Turret::rotateRoll(const Vector2& value)
     {
 
+    }*/
+
+    void Turret::setAlertnessRadius(float value)
+    {
+    	this->controller_->setAlertnessRadius(value);
     }
+    float Turret::getAlertnessRadius()
+    {
+    	return this->controller_->getAlertnessRadius();
+    }
 
-
-
-    /*void Turret::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void Turret::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(Turret, XMLPort, xmlelement, mode);
+        XMLPortParam(Turret, "alertnessRadius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues("400");
+    }
 
-        XMLPortParam(Turret, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("Turret/Atmosphere");
-    }*/
 
-
 }

Modified: code/branches/turret/src/modules/objects/Turret.h
===================================================================
--- code/branches/turret/src/modules/objects/Turret.h	2012-11-26 15:06:46 UTC (rev 9468)
+++ code/branches/turret/src/modules/objects/Turret.h	2012-11-26 15:08:25 UTC (rev 9469)
@@ -45,7 +45,6 @@
     {
         public:
             Turret(BaseObject* creator);
-
             virtual ~Turret();
 
             //virtual void tick(float dt);
@@ -53,16 +52,18 @@
             virtual void moveRightLeft(const Vector2& value) {}
             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:
 
     };