Changeset 10047 for code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h

Timestamp:

May 8, 2014, 10:16:23 AM (10 years ago)

Author:

smerkli

Message:

Controller switching works now, however lua script
execution is blocking, which means we can only schedule
stuff in them, not leave them running in realtime

File:

• code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (modified) (2 diffs)

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

@@ -48 +48 @@
         
         
-        
+            /* Take over control of a given object */
             void takeControl(Controller * controller, BaseObject * trigger);
             bool preparationToTakeControl(BaseObject * trigger);
-            void setNewController(Controller * controller);
+
+            // currently unused
+            //void setNewController(Controller * controller);
         
 
@@ -57 +59 @@
         private:
            
-           PlayerInfo* player_;
-
-       ControllableEntity* entity_; 
-
-           PlayerTrigger * pTrigger_;
+            PlayerInfo* player_;
+            ControllableEntity* entity_; 
+            PlayerTrigger * pTrigger_;
+            Context* context_;