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

Timestamp:

May 8, 2014, 10:16:23 AM (11 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/ScriptController.h (modified) (4 diffs)

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

@@ -38 +38 @@
 {  // tolua_export
     class _OrxonoxExport ScriptController // tolua_export 
-       : public ArtificialController
+       : public ArtificialController, public Tickable
     {  // tolua_export
         public:
@@ -48 +48 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             
+            void takeControl(int ctrlid);
+            void setPlayer(PlayerInfo* player) { this->player_ = player; }
            
-            void set_luasrc(std::string);
-            void set_controlled(ControllableEntity*);
+            //void set_luasrc(std::string);
+            //void set_controlled(ControllableEntity*);
 
+            virtual void tick(float dt);
 
             // LUA interface
@@ -59 +62 @@
            
             static ScriptController* getScriptController();
+
+            int getID() { return ctrlid_; }
             
-              /* virtual void tick(float dt);*/ 
 
             // tolua_end
@@ -66 +70 @@
 
         private:
-                std::string luasrc;             // name of the LUA-sourcefile that shall be executed->see XMLPort-function
-
-            ControllableEntity* controlled; //entity controlled by this SC
+            // name of the LUA-sourcefile that shall be executed->see XMLPort-function
+            std::string luasrc;         
+            PlayerInfo* player_;
+            ControllableEntity* entity_;
+            int ctrlid_;