Changeset 1307

Timestamp:

May 15, 2008, 11:38:47 PM (16 years ago)

Author:

bknecht

Message:

created Script object and renamed old Script class to LuaBind

Location:

code/branches/script_trigger

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/Loader.cc (modified) (2 diffs)
• src/core/tolua/tolua.pkg (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)

code/branches/script_trigger/bin/levels/sample.oxw

@@ -12 +12 @@
 <Skybox src="Orxonox/StarSkyBox" />
 <SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="-90,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
+<Script>
+  print("****")
+  print("Hello Scripting World")
+  print("****")
+</Script>
 
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

code/branches/script_trigger/src/core/CMakeLists.txt

@@ -21 +21 @@
   OrxonoxClass.cc
   OutputHandler.cc
-  Script.cc
+  LuaBind.cc
   SignalHandler.cc
   TclBind.cc

code/branches/script_trigger/src/core/Loader.cc

@@ -34 +34 @@
 #include "Debug.h"
 #include "CoreIncludes.h"
-#include "Script.h"
+#include "LuaBind.h"
 #include "Namespace.h"
 
@@ -111 +111 @@
 
         // let Lua work this out:
-        //Script* lua;
-        /*Script::loadFile(level->getFile(), true);
-        Script::init(Script::getLuaState());
-        Script::run();*/
-        Script* lua = Script::getInstance();
+        LuaBind* lua = LuaBind::getInstance();
         lua->loadFile(level->getFile(), true);
         lua->run();

code/branches/script_trigger/src/core/tolua/tolua.pkg

@@ -1 @@
-$cfile "../../src/core/Script_clean.h"
+$cfile "../../src/core/LuaBind_clean.h"

code/branches/script_trigger/src/orxonox/CMakeLists.txt

@@ -24 +24 @@
   objects/SpaceShip.cc
   objects/WorldEntity.cc
+  objects/Script.cc
 
 #  objects/weapon/AmmunitionDump.cc
@@ -40 +41 @@
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
-        
+
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )