Changeset 11207 for code/branches/presentationFS16/src/orxonox

Timestamp:

May 26, 2016, 4:38:51 PM (8 years ago)

Author:

fvultier

Message:

merged scriptable controller

Location:

code/branches/presentationFS16

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/controllers/ControllerDirector.cc (modified) (6 diffs)
• src/orxonox/controllers/ControllerDirector.h (modified) (1 diff)
• src/orxonox/controllers/NewScriptController.cc (copied) (copied from code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.cc)
• src/orxonox/controllers/NewScriptController.h (copied) (copied from code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h)
• src/orxonox/controllers/ScriptController.cc (modified) (8 diffs)
• src/orxonox/controllers/ScriptController.h (modified) (5 diffs)
• src/orxonox/controllers/scriptTasks (copied) (copied from code/branches/plehmannFS16/src/orxonox/controllers/scriptTasks)

code/branches/presentationFS16/src/orxonox/CMakeLists.txt

@@ -66 +66 @@
     infos/PlayerInfo.h
     sound/SoundManager.h
-    controllers/ScriptController.h
+    controllers/NewScriptController.h
     overlays/CampaignMenu.h
   PCH_FILE

code/branches/presentationFS16/src/orxonox/OrxonoxPrereqs.h

@@ -98 +98 @@
     class HumanController;
     class ScriptController;
+    class NewScriptController;
     class WaypointController;
     class WaypointPatrolController;

code/branches/presentationFS16/src/orxonox/controllers/CMakeLists.txt

@@ -5 +5 @@
   ArtificialController.cc
   AIController.cc
-  ScriptController.cc
   WaypointController.cc
   WaypointPatrolController.cc
@@ -19 +18 @@
   FightingController.cc
   MasterController.cc
+  NewScriptController.cc
 )
+ADD_SUBDIRECTORY(scriptTasks)

code/branches/presentationFS16/src/orxonox/controllers/ControllerDirector.cc

@@ -6 +6 @@
 
 #include "ControllerDirector.h"
-#include "ScriptController.h"
+#include "NewScriptController.h"
 #include "core/CoreIncludes.h"
 
@@ -64 +64 @@
     {
        /* Output a message confirming that the function was called */
-       orxout(verbose)<<"test takecontrol."<< endl;
+       orxout()<<"test takecontrol."<< endl;
 
        /* First, we set up a new controller to attach to the unit that
@@ -74 +74 @@
        {
          /* Create a scriptcontroller object */
-         ScriptController *newctrl = new ScriptController(this->context_);
+         NewScriptController *newctrl = new NewScriptController(this->context_);
 
          /* Make the player we were given its slave */
@@ -105 +105 @@
         * the next time it is triggered */
        ctrlid += 1;
+
+        orxout()<<"swag"<< endl;
     } 
 
@@ -112 +114 @@
         this->player_ = nullptr;
 
-        orxout(verbose) << "Preparation to take Control!" << endl; 
+        orxout() << "Preparation to take Control!" << endl; 
 
         // Check whether it is a player trigger and extract pawn from it
@@ -121 +123 @@
 
             // Check if there actually was a player returned.
-            if( this->player_ == nullptr) return false;
+            if( this->player_ == nullptr) {
+            orxout()<<"swag control"<< endl;
+
+              return false;
+            }
         }
         else
         {
-            orxout(verbose) << "ControllerDirector::preparationToTakeControl " 
+            orxout() << "ControllerDirector::preparationToTakeControl " 
               << "Not a player trigger, can't extract pawn from it.." << endl;
             return false;

code/branches/presentationFS16/src/orxonox/controllers/ControllerDirector.h

@@ -27 +27 @@
  */
 
+/*
+@todo:
+
+in the take control or preparationToTakeControl functions remove the former controller and store it somewhere so it can be put back later.
+
+*/
 #ifndef _ControllerDirector_H__
 #define _ControllerDirector_H__

code/branches/presentationFS16/src/orxonox/controllers/ScriptController.cc

@@ -34 +34 @@
   * Command             | Abbreviation | Parameter 1          | '' 2     | '' 3    | '' 4                 | '' 5     | '' 6     | '' 7
   *
-  * "Move And Look"     | mal          | GoTo X Coordinate    | '' Y ''  | '' Z '' | LookAt X Coordinate  |  '' Y '' |  '' Y '' | Duration
-  * "Rotate And Look"   | ral          | GoTo X Coordinate    | '' Y ''  | '' Z '' | Axis (1=x, 2=z, 3=z) |     -    |     -    | Duration
-  * "Spiral"            | spi          | GoTo X Coordinate    | '' Y ''  | '' Z '' |          -           |     -    |     -    | Duration
-  * "Transition Look"   | chl          | From X Coordinate    | '' Y ''  | '' Z '' | To X Coordinate      |  '' Y '' |  '' Y '' | Duration
+  * "Move And Look"     | mal          | GoTo X Coordinate    |  '' Y ''  | '' Z '' | LookAt X Coordinate  |  '' Y '' |  '' Y '' | Duration
+  * "Rotate And Look"   | ral          | GoTo X Coordinate    |  '' Y ''  | '' Z '' | Axis (1=x, 2=y, 3=z) |     -    |     -    | Duration
+  * "Spiral"            | spi          | GoTo X Coordinate    |  '' Y ''  | '' Z '' |          -           |     -    |     -    | Duration
+  * "Transition Look"   | chl          | From X Coordinate    |  '' Y ''  | '' Z '' | To X Coordinate      |  '' Y '' |  '' Y '' | Duration
+  * "rotate round X crd"| rotX         | anchor coordinate    | angle(rad)|    -    |                      |          |          | Duration
   * "Idle (Do nothing)" | idle         | Duration
   */
@@ -46 +47 @@
 #include "worldentities/ControllableEntity.h"
 #include "core/LuaState.h"
-#include "core/LuaState.h"
 #include "util/Math.h"
 
@@ -90 +90 @@
         /* Output some debugging information */
         orxout(verbose) << "ScriptController: Taking control" << endl;
-        orxout(verbose) << "This-pointer: " << this << endl;
+        orxout(verbose) << "This-pointer: " << this << endl; 
 
         /* Set the controller ID (the argument here should be nonzero) */
@@ -103 +103 @@
          */
         this->entity_->setDestroyWhenPlayerLeft(false);
-        this->player_->pauseControl();
+        this->player_->stopTemporaryControl();
         this->entity_->setController(this);
         this->setControllableEntity(this->entity_);
-        this->entity_->mouseLook();
-        this->entity_->setVisible(false);
+        //this->entity_->mouseLook();
+        //this->entity_->setVisible(false);
+        
+        // TODO take the human Controllers control  dont forget to give it back in the destructor
     }
 
@@ -201 +203 @@
         {
           // Abbreviation for "spiral" (rotation + translation)
-          if (this->currentEvent.fctName == "spi") {
-
-            // Need to know a perpendicular basis to the translation vector:
+          if (this->currentEvent.fctName == "spi") 
+          {
+              spi(dl); // call the external function
+          }
+
+          // Abbreviation for "rotate and look"
+          else if (this->currentEvent.fctName == "ral")
+          { 
+              ral(dl);  
+          }
+          else if( this->currentEvent.fctName == "mal" )
+          {
+              mal(dl);
+          }
+          else if( this->currentEvent.fctName == "chl" )
+          {
+              chl(dl);
+          }
+
+
+          /* Force mouse look */
+          if( this->entity_->isInMouseLook() == false )
+            this->entity_->mouseLook();
+        }
+    }
+
+    void ScriptController::eventScheduler(std::string instruction, 
+      float x1, float y1, float z1, 
+      float x2, float y2, float z2, 
+      float duration, float executionTime)
+    {
+      /* put data (from LUA) into time-sorted eventList*/ 
+      /* Nimmt den befehl und die argumente aus luascript und ertellt einen
+       * struct pro event, diese structs werden sortiert nach eventTime
+       */
+      struct event tmp;
+
+      /* Fill the structure with all the provided information */
+      tmp.fctName = instruction;
+
+      //tmp.x1 = x1; tmp.y1 = y1; tmp.z1 = z1;
+      //tmp.x2 = x2; tmp.y2 = y2; tmp.z2 = z2;
+      tmp.v1 = Vector3(x1,y1,z1);
+      tmp.v2 = Vector3(x2,y2,z2);
+
+      // the parameters are not required to be vector coordinates!
+      // for convenience they are however stored twice if they have some kind of different meaning
+      tmp.a = x1;
+      tmp.b = y1;
+      tmp.c = z1;
+      tmp.d = x2;
+      tmp.e = y2;
+      tmp.f = z2;
+
+      tmp.duration = duration;
+
+      /* This is kind of a hack. If we hit the function idle all we want to do is
+         advance event execution time, not schedule anything */
+      if (instruction == "idle") {
+        tmp.eventTime = this->prevEventTime;
+        this->prevEventTime += x1;
+        return;
+      } else {
+        tmp.eventTime = this->prevEventTime;
+        this->prevEventTime += duration;
+      }
+
+      /* Add the created event to the event list */
+      if(eventList.size()==0)
+      { /* The list is still empty, just add it */
+        orxout(verbose) << "eventList empty (01)" << endl;
+        eventList.insert(eventList.begin(), tmp);
+        this->eventno += 1;
+        return; /* Nothing more to do, the event was added */
+      }
+
+      /* Event was not added yet since the list was not empty. Walk through
+       * the list of events and add it so that the events are correctly in
+       * order.
+       */
+      for (std::vector<event>::iterator it=eventList.begin(); it<eventList.end(); it++)
+      { if(tmp.eventTime < it->eventTime)
+        { eventList.insert(it,tmp);
+          this->eventno += 1;
+          //orxout()<<"new event added"<<endl;
+          return;
+        }
+      }
+
+      /* If the event was still not added here, it belongs in the end of the list */
+      eventList.insert(eventList.end(), tmp);
+      this->eventno += 1;
+
+    }
+
+    // Event Functions
+
+    void ScriptController::spi(float dl) 
+    {
+    
+                // Need to know a perpendicular basis to the translation vector:
             // Given (a, b, c) we chose (b, -a, 0)norm and (0, c, -b)norm
             // Currently we set a fix rotational radius of 400
@@ -221 +321 @@
             delete ortho1;
             delete ortho2;
-          }
-
-          // Abbreviation for "rotate and look"
-          if (this->currentEvent.fctName == "ral")
-          { 
+
+    }
+
+    void ScriptController::ral(float dl)
+    {
             // Specify the axis
             Vector3 a;
@@ -250 +350 @@
             /* Look at the specified position */
             this->entity_->lookAt(this->currentEvent.v1);
-          }
-          else if( this->currentEvent.fctName == "mal" )
-          {
+      
+    }
+
+    void ScriptController::mal(float dl)
+    {
             /* Set the position to the correct place in the trajectory */
             this->entity_->setPosition( (1-dl)*startpos + dl * this->currentEvent.v1);
@@ -258 +360 @@
             /* Look at the specified position */
             this->entity_->lookAt(this->currentEvent.v2);
-          }
-          else if( this->currentEvent.fctName == "chl" )
-          {
+
+    }
+
+    void ScriptController::chl(float dl)
+    {
             /* Sweep the look from v1 to v2 */
             this->entity_->lookAt( (1-dl)*this->currentEvent.v1 + 
               dl * this->currentEvent.v2 );
-          }
-
-
-          /* Force mouse look */
-          if( this->entity_->isInMouseLook() == false )
-            this->entity_->mouseLook();
-        }
-    }
-
-    void ScriptController::eventScheduler(std::string instruction, 
-      float x1, float y1, float z1, 
-      float x2, float y2, float z2, 
-      float duration, float executionTime)
-    {
-      /* put data (from LUA) into time-sorted eventList*/ 
-      /* Nimmt den befehl und die argumente aus luascript und ertellt einen
-       * struct pro event, diese structs werden sortiert nach eventTime
-       */
-      struct event tmp;
-
-      /* Fill the structure with all the provided information */
-      tmp.fctName = instruction;
-
-      //tmp.x1 = x1; tmp.y1 = y1; tmp.z1 = z1;
-      //tmp.x2 = x2; tmp.y2 = y2; tmp.z2 = z2;
-      tmp.v1 = Vector3(x1,y1,z1);
-      tmp.v2 = Vector3(x2,y2,z2);
-
-      // the parameters are not required to be vector coordinates!
-      // for convenience they are however stored twice if they have some kind of different meaning
-      tmp.a = x1;
-      tmp.b = y1;
-      tmp.c = z1;
-      tmp.d = x2;
-      tmp.e = y2;
-      tmp.f = z2;
-
-      tmp.duration = duration;
-
-      /* This is kind of a hack. If we hit the function idle all we want to do is
-         advance event execution time, not schedule anything */
-      if (instruction == "idle") {
-        tmp.eventTime = this->prevEventTime;
-        this->prevEventTime += x1;
-        return;
-      } else {
-        tmp.eventTime = this->prevEventTime;
-        this->prevEventTime += duration;
-      }
-
-      /* Add the created event to the event list */
-      if(eventList.size()==0)
-      { /* The list is still empty, just add it */
-        orxout(verbose) << "eventList empty (01)" << endl;
-        eventList.insert(eventList.begin(), tmp);
-        this->eventno += 1;
-        return; /* Nothing more to do, the event was added */
-      }
-
-      /* Event was not added yet since the list was not empty. Walk through
-       * the list of events and add it so that the events are correctly in
-       * order.
-       */
-      for (std::vector<event>::iterator it=eventList.begin(); it<eventList.end(); it++)
-      { if(tmp.eventTime < it->eventTime)
-        { eventList.insert(it,tmp);
-          this->eventno += 1;
-          //orxout()<<"new event added"<<endl;
-          return;
-        }
-      }
-
-      /* If the event was still not added here, it belongs in the end of the list */
-      eventList.insert(eventList.end(), tmp);
-      this->eventno += 1;
+
+    }
+
+    void ScriptController::rotX(float dl)
+    {
+
 
     }

code/branches/presentationFS16/src/orxonox/controllers/ScriptController.h

@@ -36 +36 @@
 
 
-namespace orxonox  // tolua_export
-{  // tolua_export
+namespace orxonox  
+{  
 
     /** Structure to describe a single event */
@@ -61 +61 @@
     }; 
 
-    class _OrxonoxExport ScriptController // tolua_export 
+    class _OrxonoxExport ScriptController  
        : public ArtificialController, public Tickable
-    {  // tolua_export
+    {  
         public:
             ScriptController(Context* context);
@@ -73 +73 @@
             virtual void tick(float dt) override;
 
-            // LUA interface
-            // tolua_begin 
+           
             void eventScheduler(std::string instruction = "", 
               float x1 = 0, float y1 = 0, float z1 = 0, 
@@ -84 +83 @@
             int getID() { return ctrlid_; }
 
-            // tolua_end
+           
             const Vector3& getPosition();
 
@@ -128 +127 @@
             //Vector3 lookAtPosition;
 
-    };// tolua_export
-} // tolua_export
+
+            /* private member functions */
+
+            /*spiral event*/
+            void spi(float dl);
+
+            /* rotate and look event */
+            void ral(float dl);
+
+            /* move and look event */
+            void mal(float dl);
+
+            /* transition look event */
+            void chl(float dl);
+
+            /* rotate around x-coordinate event */
+            void rotX(float dl);
+
+    };
+} 
 
 #endif /* _ScriptController_H__ */