- Timestamp:
- Apr 16, 2008, 9:22:50 PM (17 years ago)
- Location:
- code/trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/CMakeLists.txt
r1076 r1084 93 93 #generate lua bind source files 94 94 EXECUTE_PROCESS(COMMAND bin/./tolua-exec-script) 95 EXECUTE_PROCESS(COMMAND ls)96 95 97 96 #add main source dir -
code/trunk/bin/levels/sample.oxw
r1052 r1084 115 115 116 116 <?lua 117 for i = 1, 2 26, 1117 for i = 1, 2, 1 118 118 do ?> 119 119 <Model position="<?lua print(math.random(-19597, 18732))?>, <?lua print(math.random(-19597, 18732)) ?>, <?lua print(math.random(-19597, 18732)) ?>" scale="<?lua print(math.random( 20, 119)) ?>" mesh="ast<?lua print(i%6 + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random(16, 44)) ?>" /> -
code/trunk/src/core/CMakeLists.txt
r1076 r1084 1 1 #get the created files 2 2 AUX_SOURCE_DIRECTORY(tolua TOLUA_BIND_FILES) 3 4 MESSAGE(STATUS "tolua sources: ${TOLUA_BIND_FILES}")5 3 6 4 SET( CORE_SRC_FILES -
code/trunk/src/core/InputManager.cc
r1066 r1084 39 39 #include "InputHandler.h" 40 40 #include "InputBuffer.h" 41 #include "ConsoleCommand.h" 41 42 42 43 namespace orxonox 43 44 { 45 ConsoleCommand(InputManager, setInputMode, AccessLevel::Admin, true).setDefaultValue(0, IM_INGAME); 46 44 47 /** 45 48 @brief Constructor only resets the pointer values to 0. … … 227 230 @remark Only has an affect if the mode actually changes 228 231 */ 229 void InputManager::setInputMode(InputMode mode) 230 { 231 this->setMode_ = mode; 232 void InputManager::setInputMode(int mode) 233 { 234 if (mode > 0 && mode < 4) 235 getSingleton().setMode_ = (InputMode)mode; 232 236 } 233 237 -
code/trunk/src/core/InputManager.h
r1066 r1084 72 72 void tick(float dt); 73 73 void setWindowExtents(int width, int height); 74 void setInputMode(InputMode mode);75 74 InputMode getInputMode(); 76 75 … … 84 83 static InputManager& getSingleton(); 85 84 static InputManager* getSingletonPtr() { return &getSingleton(); } 85 static void setInputMode(int mode); 86 86 87 87 private: -
code/trunk/src/orxonox/Orxonox.cc
r1066 r1084 115 115 { 116 116 this->ib_->removeLast(); 117 } 118 void exit() const 119 { 120 CommandExecutor::execute("setInputMode 2"); 117 121 } 118 122 … … 405 409 ib->registerListener(console, &Testconsole::clear, '§', true); 406 410 ib->registerListener(console, &Testconsole::removeLast, '\b', true); 411 ib->registerListener(console, &Testconsole::exit, (char)0x1B, true); 407 412 408 413 // first check whether ogre root object has been created … … 452 457 { 453 458 (it)->tick((float)evt.timeSinceLastFrame * this->timefactor_); 454 455 }459 it++; 460 } 456 461 457 462 // don't forget to call _fireFrameStarted in ogre to make sure -
code/trunk/src/util/CMakeLists.txt
r1076 r1084 1 1 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES) 2 AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES)3 2 4 3 SET (UTIL_SRC_FILES … … 11 10 MultiTypeString.cc 12 11 MultiTypeMath.cc 12 tolua_event.c 13 tolua_is.c 14 tolua_map.c 15 tolua_push.c 16 tolua_to.c 13 17 ${TINYXML_SRC_FILES} 14 ${TOLUA_SRC_FILES}15 18 ) 16 19 -
code/trunk/visual_studio/base_properties.vsprops
r1059 r1084 8 8 <Tool 9 9 Name="VCCLCompilerTool" 10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\orxonox";"$( DependencyDir)include""10 AdditionalIncludeDirectories=""$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\util\tolua";"$(DependencyDir)include"" 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI" 12 12 WarningLevel="3" -
code/trunk/visual_studio/base_properties_debug.vsprops
r1024 r1084 13 13 BasicRuntimeChecks="3" 14 14 RuntimeLibrary="3" 15 DebugInformationFormat=" 4"15 DebugInformationFormat="3" 16 16 /> 17 17 <Tool -
code/trunk/visual_studio/core_properties.vsprops
r1024 r1084 12 12 <Tool 13 13 Name="VCLinkerTool" 14 AdditionalDependencies="OgreMain$(CS ).lib OIS$(CSS).lib lua$(CS).lib"14 AdditionalDependencies="OgreMain$(CSS).lib OIS$(CS).lib lua51$(CS).lib" 15 15 /> 16 16 </VisualStudioPropertySheet> -
code/trunk/visual_studio/network_properties.vsprops
r1024 r1084 12 12 <Tool 13 13 Name="VCLinkerTool" 14 AdditionalDependencies="enet$(CS S).lib zlib$(CSS).lib"14 AdditionalDependencies="enet$(CS).lib zlib$(CS).lib" 15 15 IgnoreDefaultLibraryNames="LIBCMT;LIBCMTD" 16 16 /> -
code/trunk/visual_studio/orxonox_properties.vsprops
r1024 r1084 14 14 <Tool 15 15 Name="VCLinkerTool" 16 AdditionalDependencies="OgreMain$(CS ).lib OIS$(CSS).lib"16 AdditionalDependencies="OgreMain$(CSS).lib OIS$(CS).lib" 17 17 OutputFile="$(OutDir)$(ProjectName)$(CS).exe" 18 18 IgnoreDefaultLibraryNames="" -
code/trunk/visual_studio/tolua++_properties.vsprops
r1024 r1084 6 6 InheritedPropertySheets=".\directory_properties.vsprops" 7 7 > 8 <Tool9 Name="VCLinkerTool"10 AdditionalDependencies="lua$(CS).lib"11 />12 8 </VisualStudioPropertySheet> -
code/trunk/visual_studio/util_properties.vsprops
r890 r1084 12 12 <Tool 13 13 Name="VCLinkerTool" 14 AdditionalDependencies="OgreMain$(CS ).lib"14 AdditionalDependencies="OgreMain$(CSS).lib" 15 15 /> 16 16 </VisualStudioPropertySheet> -
code/trunk/visual_studio/vc8/core.vcproj
r1059 r1084 249 249 </File> 250 250 <File 251 RelativePath="..\..\src\core\ToLuaBind.cc"252 >253 </File>254 <File255 251 RelativePath="..\..\src\core\XMLPort.cc" 256 252 > 257 253 </File> 254 <Filter 255 Name="tolua" 256 > 257 <File 258 RelativePath="..\..\src\core\tolua\tolua_bind.cc" 259 > 260 <FileConfiguration 261 Name="Debug|Win32" 262 > 263 <Tool 264 Name="VCCLCompilerTool" 265 /> 266 </FileConfiguration> 267 </File> 268 </Filter> 258 269 </Filter> 259 270 <Filter … … 411 422 </File> 412 423 <File 413 RelativePath="..\..\src\core\ToLuaBind.h"414 >415 </File>416 <File417 424 RelativePath="..\..\src\core\XMLPort.h" 418 425 > 419 426 </File> 427 <Filter 428 Name="tolua" 429 > 430 <File 431 RelativePath="..\..\src\core\tolua\tolua_bind.h" 432 > 433 </File> 434 </Filter> 420 435 </Filter> 421 436 </Files> -
code/trunk/visual_studio/vc8/tolua++.vcproj
r1064 r1084 133 133 RelativePath="..\..\src\util\tolua\tolua.c" 134 134 > 135 <FileConfiguration 136 Name="Debug|Win32" 137 ExcludedFromBuild="true" 138 > 139 <Tool 140 Name="VCCLCompilerTool" 141 /> 142 </FileConfiguration> 135 143 </File> 136 144 <File … … 157 165 RelativePath="..\..\src\util\tolua\toluabind.c" 158 166 > 167 <FileConfiguration 168 Name="Debug|Win32" 169 ExcludedFromBuild="true" 170 > 171 <Tool 172 Name="VCCLCompilerTool" 173 /> 174 </FileConfiguration> 159 175 </File> 160 176 </Filter>
Note: See TracChangeset
for help on using the changeset viewer.