Changeset 10614 for code/branches/presentationFS15merge/src/orxonox/controllers/ScriptController.h

Timestamp:

Oct 4, 2015, 12:16:42 PM (9 years ago)

Author:

landauf

Message:

merged branch SciptableControllerFS15

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ScriptController.h (modified) (4 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      ...
  *   Co-authors:
  *      ...
@@ -45 +45 @@
         std::string fctName;
 
+        /** Final position we want to be at **/
         Vector3 v1;
+
+        /** Where we are looking **/
         Vector3 v2;
+
+        /** The parameters are additionally stored as a set of 6 numerical values **/
+        float a, b, c, d, e, f;
 
         /** Time span of the event */
@@ -69 +75 @@
             // LUA interface
             // tolua_begin 
-            void eventScheduler(std::string instruction, 
-              float x1, float y1, float z1, 
-              float x2, float y2, float z2, 
-              float duration, float executionTime);
+            void eventScheduler(std::string instruction = "", 
+              float x1 = 0, float y1 = 0, float z1 = 0, 
+              float x2 = 0, float y2 = 0, float z2 = 0, 
+              float duration = 0, float executionTime = 0);
 
             static ScriptController* getScriptController();
@@ -116 +122 @@
             Vector3 startpos;
 
+            /* Time of the previously scheduled event */
+            float prevEventTime;
+
             /* - Position to look at during that transition */
             //Vector3 lookAtPosition;