Changeset 1383 for code/branches

Timestamp:

May 22, 2008, 4:45:32 PM (16 years ago)

Author:

bknecht

Message:

crazy stuff!! triggers and the best: you can now use the lua function "include(levelfile)" to include another level file into the level. it's great!!!

Location:

code/branches/script_trigger

Files:

• bin/levels/sample.oxw (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/Model.cc (modified) (1 diff)
• src/orxonox/objects/Script.cc (added)
• src/orxonox/objects/Script.h (added)
• src/orxonox/objects/SpaceShip.cc (modified) (1 diff)
• src/orxonox/objects/Trigger.cc (added)
• src/orxonox/objects/Trigger.h (added)

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>
+
+<?lua include("levels/test.oxw") ?>
 
 <NPC position="0,100,400" scale="1" mesh="razor.mesh"/>

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

@@ -33 +33 @@
   OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
   COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
-  DEPENDS tolua
+  DEPENDS tolua LuaBind_clean.h
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )

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

@@ -25 +25 @@
   objects/WorldEntity.cc
   objects/Script.cc
+  objects/Trigger.cc
 
 #  objects/weapon/AmmunitionDump.cc

code/branches/script_trigger/src/orxonox/objects/Model.cc

@@ -50 +50 @@
 
     /**
-        @brief XML loading and saving.
-    @p
-    aram xmlelement The XML-element
-        @param loading Loading (true) or saving (false)
-        @return The XML-element
+    @brief XML loading and saving.
+    @param xmlelement The XML-element
+    @param loading Loading (true) or saving (false)
+    @return The XML-element
     */
     void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode)

code/branches/script_trigger/src/orxonox/objects/SpaceShip.cc

@@ -277 +277 @@
       // change camera attributes here, if you want to ;)
     }
-    
+
     void SpaceShip::getFocus(){
       COUT(4) << "requesting focus" << std::endl;
       if(network::Client::getSingleton()==0 || network::Client::getSingleton()->getShipID()==objectID)
         CameraHandler::getInstance()->requestFocus(cam_);
-      
-    }
-    
+
+    }
+
     void SpaceShip::createCamera(){
 //       COUT(4) << "begin camera creation" << std::endl;