Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1383 for code/branches


Ignore:
Timestamp:
May 22, 2008, 4:45:32 PM (17 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!!! :D

Location:
code/branches/script_trigger
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/script_trigger/bin/levels/sample.oxw

    r1307 r1383  
    1212<Skybox src="Orxonox/StarSkyBox" />
    1313<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" />
    14 <Script>
    15   print("****")
    16   print("Hello Scripting World")
    17   print("****")
    18 </Script>
     14
     15<?lua include("levels/test.oxw") ?>
    1916
    2017<NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
  • code/branches/script_trigger/src/core/CMakeLists.txt

    r1307 r1383  
    3333  OUTPUT tolua/tolua_bind.cc tolua/tolua_bind.h
    3434  COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
    35   DEPENDS tolua
     35  DEPENDS tolua LuaBind_clean.h
    3636  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
    3737)
  • code/branches/script_trigger/src/orxonox/CMakeLists.txt

    r1307 r1383  
    2525  objects/WorldEntity.cc
    2626  objects/Script.cc
     27  objects/Trigger.cc
    2728
    2829#  objects/weapon/AmmunitionDump.cc
  • code/branches/script_trigger/src/orxonox/objects/Model.cc

    r1293 r1383  
    5050
    5151    /**
    52         @brief XML loading and saving.
    53     @p
    54     aram xmlelement The XML-element
    55         @param loading Loading (true) or saving (false)
    56         @return The XML-element
     52    @brief XML loading and saving.
     53    @param xmlelement The XML-element
     54    @param loading Loading (true) or saving (false)
     55    @return The XML-element
    5756    */
    5857    void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode)
  • code/branches/script_trigger/src/orxonox/objects/SpaceShip.cc

    r1293 r1383  
    277277      // change camera attributes here, if you want to ;)
    278278    }
    279    
     279
    280280    void SpaceShip::getFocus(){
    281281      COUT(4) << "requesting focus" << std::endl;
    282282      if(network::Client::getSingleton()==0 || network::Client::getSingleton()->getShipID()==objectID)
    283283        CameraHandler::getInstance()->requestFocus(cam_);
    284      
    285     }
    286    
     284
     285    }
     286
    287287    void SpaceShip::createCamera(){
    288288//       COUT(4) << "begin camera creation" << std::endl;
Note: See TracChangeset for help on using the changeset viewer.