Changeset 8417 in orxonox.OLD

Timestamp:

Jun 14, 2006, 6:31:10 PM (18 years ago)

Author:

snellen

Message:

helicopter is scripted!

Location:

branches/script_engine/src

Files:

• lib/gui/gl/glgui_box.cc (modified) (1 diff)
• lib/gui/gl/glgui_handler.cc (modified) (1 diff)
• lib/script_engine/lunartest2.lua (modified) (1 diff)
• lib/script_engine/movechopper.lua (added)
• world_entities/script_trigger.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.h (modified) (3 diffs)

branches/script_engine/src/lib/gui/gl/glgui_box.cc

@@ -17 +17 @@
 
 #include "glgui_box.h"
+#include <cassert>
 
 namespace OrxGui

branches/script_engine/src/lib/gui/gl/glgui_handler.cc

@@ -23 +23 @@
 
 #include "class_list.h"
+#include <cassert>
 
 

branches/script_engine/src/lib/script_engine/lunartest2.lua

@@ -22 +22 @@
 
 function main(arg)
-  io.write("hello i am main!")
+  io.write("hello i am main!\n")
   -- use parameter
   io.write("main received ", arg)
   io.write(" as parameter\n")
 
- o = Object()
-  o:printName()
+ 
   --call member of an inserted object
   Obj:printName()
 
   --create object of a registered type
-  --o = Object()
-  --o:printName()
+  o = Object()
+  o:printName()
 
   --take returnvalue from c

branches/script_engine/src/world_entities/script_trigger.cc

@@ -142 +142 @@
      {
        testScriptingFramework();
-     /*if(!(script->selectFunction(this->functionName,0)) )
+     if(!(script->selectFunction(this->functionName,0)) )
        printf("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      if( !(script->executeFunction()) )
-       printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());*/
+       printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      }
 }

branches/script_engine/src/world_entities/space_ships/helicopter.h

@@ -12 +12 @@
 #include "sound_buffer.h"
 #include "sound_source.h"
+
+#include "script_class.h"
 
 class Helicopter : public Playable
@@ -38 +40 @@
     virtual void process(const Event &event);
     
-    virtual void moveUp(bool move){bUp = move;};
+    virtual void moveUp(bool move){bAscend = move;};
+    virtual void moveDown(bool move){bDescend = move;};
 
 
@@ -80 +83 @@
 };
 
-//CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER,
-                       // addMethod("moveUp", ExecutorLua1<Object,bool>(&Helicopter::moveUp))
-                       // );
+CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER,
+                        addMethod("moveUp", ExecutorLua1<Helicopter,bool>(&Helicopter::moveUp))
+                        ->addMethod("moveDown", ExecutorLua1<Helicopter,bool>(&Helicopter::moveDown))
+                        );