Changeset 10026

Timestamp:

Apr 10, 2014, 3:18:32 PM (11 years ago)

Author:

mkronig

Message:

Added an initial test for lua execution. Not tested yet.

Location:

code/branches/ScriptableController

Files:

• data/levels/levelTry.oxw (modified) (1 diff)
• data/levels/michaelstestfile.lua (added)
• src/orxonox/controllers/ControllerDirector.cc (modified) (8 diffs)

code/branches/ScriptableController/data/levels/levelTry.oxw

@@ -71 +71 @@
     </StaticEntity>
 
-<!-- Docking  -->
-    <Dock position="2830,20,50" roll=0 yaw=0 >
-        <animations>
-            <MoveToDockingTarget target="destroyer" />
-        </animations>
-        <effects>
-            <DockToShip target="spaceShip" />
-        </effects>
-        <events>
-            <execute>
-                <EventListener event="dockMe" />
-            </execute>
-
-            <undocking>
-                <EventListener event="undockMe" />
-            </undocking>
-        
-            <activity>
-                <EventListener event=notGameEnd />
-            </activity>
-        </events>
-        <attached>
-        <!-- Trigger for docking with billboard -->
-
-                <!-- removed -->
-
-        <!-- Trigger for undocking with billboard -->
-            <!-- <Billboard position="-2630,-19970,150" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=1 /> -->
-            <DistanceTrigger position="-2630,-19970,150" distance="50" target="Pawn"
-                beaconMode="identify" targetname="bcnDestroyer" name="undockMe"
-            />
-        </attached>
-    </Dock>
 
     <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.2,0.4,0.8" scale=100 />
     <DistanceTrigger position="0,0,0" distance="200" target="Pawn"
-      beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
+      beaconMode="exclude" targetname="bcnDestroyer" name="takeControl"
     />
 
 
-<!-- Object, which orxouts the message "hello Universe!". EVENT NOT WORKING  -->
+<!-- ControllerDirector waits for the event takeControl to attach a new Controller -->
     <ControllerDirector position="0,0,0">
         <events>
             <party>
-                <EventListener event="dockMe" />
+                <EventListener event="takeControl" />
             </party>
 

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

@@ -11 +11 @@
 #include "interfaces/PlayerTrigger.h"
 #include "worldentities/pawns/Pawn.h"
+#include "LuaState.h"
+
 
 namespace orxonox
@@ -27 +29 @@
     }
 
-    bool ControllerDirector::party(bool bTriggered, BaseObject* trigger)
-       {
-           //XMLPortEventSink seems not to execute the party function
-           orxout()<<"hello universe party"<< endl;
-           return true;
-       }
-
 
     void ControllerDirector::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -40 +35 @@
 
         
-        orxout()<<"hello universe xmlport"<< endl;
+        orxout()<<"ControllerDriector::XMLPort An instance of ControllerDirector has been created."<< endl;
     }
 
@@ -47 +42 @@
         SUPER(ControllerDirector, XMLEventPort, xmlelement, mode);
 
-        XMLPortEventSink(ControllerDirector, BaseObject, "party", party, xmlelement, mode);
+        XMLPortEventSink(ControllerDirector, BaseObject, "takeControl", takeControl, xmlelement, mode);
 
     }
@@ -53 +48 @@
 
 
-   /* void ControllerDirector::tick(float dt)
-    {
-
-        //Get controllable entity which is attached to this controller in the XML file.
-        ControllableEntity* entity = this->getControllableEntity();
-        if (!entity)
-            orxout()<<"No controllable entity found"<<endl;
-            return;
-
-        
-
-        SUPER(ControllerDirector, tick, dt);
-    }
-
-    */
 
     void ControllerDirector::takeControl(Controller * controller, BaseObject * trigger) {
@@ -73 +53 @@
         preparationToTakeControl(trigger);
         setNewController(controller);
-
+        LuaState test = new Luastate();
+        test.doFile("/tmp/myluahelloworld.lua");
+        
     } 
 
@@ -113 +95 @@
         this->setControllableEntity(this->entity_);
 
+
+
     }
        
@@ -119 +103 @@
 }
 
-/* Detaillierte Planung
-Director nimmt event auf und hängt dann einen controller (momentan als erstellt zu betrachten) an objekt, welches event ausgelöst hat.
 
 
 
-        Klassenvariablen
-
-                ...? brauchts überhaupt?
-
-        Variablen (in Funktionen auftretend):
-
-                Playerinfo * player             enthält infos über objekt, welches event ausgelöst hat.Relevant für Inputseite des Directors
-
-        Funktion:
-
-                Auf Seite des Inputs des Directors:
-
-                        preparationForControlTakeOver(...)      Vorbereitende Massnahmen um neuen Controller anzuhängen, z.B. player = pTrigger->getTriggeringPlayer();
-                                                                Orientierung an execute Funktion von Dock.cc
-        
-                Auf Outputseite des Directors:
-
-                        takeControl(...)                        Orientierung an DockingController.cc
-
-                        tick()                                  Soll von Event ausgelöst werden, wenn z.B. Kamera an Endposition angelangt ist. Danach soll wieder ein
-                                                                menschlicher Spieler die Kontrolle übernehmen (wie? new human controller? Klasse noch angucken!).
-*/
-
-
-