Changeset 10049 for code/branches/turretFS14/src/modules/objects/controllers

Timestamp:

May 8, 2014, 4:04:53 PM (11 years ago)

Author:

muemart

Message:

Delete the old turret templates and make new ones. Adjust the weapon positions for the turret. Add a proxy controller for teams and targets. Add comments

Location:

code/branches/turretFS14/src/modules/objects/controllers

Files:

• CMakeLists.txt (modified) (1 diff)
• TeamTargetProxy.cc (added)
• TeamTargetProxy.h (added)
• TurretController.cc (modified) (1 diff)
• TurretController.h (modified) (2 diffs)

code/branches/turretFS14/src/modules/objects/controllers/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(OBJECTS_SRC_FILES
   TurretController.cc
+  TeamTargetProxy.cc
 )

code/branches/turretFS14/src/modules/objects/controllers/TurretController.cc

@@ -136 +136 @@
                         {
                                 this->getControllableEntity()->fire(0);
-                                orxout() << 42 << endl;
                         }
                 }

code/branches/turretFS14/src/modules/objects/controllers/TurretController.h

@@ -27 +27 @@
  */
 
- #ifndef _TurretController_H__
- #define _TurretController_H__
+/**
+    @brief Definition for the controller for turrets.
+*/
+
+#ifndef _TurretController_H__
+#define _TurretController_H__
 
 #include "OrxonoxPrereqs.h"
@@ -35 +39 @@
  namespace orxonox
  {
+        /**
+                @brief
+                Controller for turrets. Chooses a target, and makes the turret aim/shoot at it.
+
+                The controllableEntity gets casted to Turret, so this controller won't work for anything else.
+        */
         class _OrxonoxExport TurretController : public ArtificialController, public Tickable
         {