|
Last change
on this file since 1642 was
1642,
checked in by rgrieder, 16 years ago
|
- changed the static interface of the InputManager to a member one with getInstance()
- converted InputManager and InGameConsole to Ogre Singletons (c'tor and d'tor public, but assert in c'tor to prevent multiple instances at runtime)
- added toluabind_orxonox files to tolua folder that contains a pimped version of tolua
(I'll write a little cmake project soon to automate it; Currently that only works with msvc)
- commented out Loader::unload() from Orxonox destructor because that deleted the ParticleSpawners, which were using a method of a sceneNode that belonged to a already destroyed SpaceShip.
—> Results in a memory leak.
Previously Loader::unload() was called for all BaseObjects (now calling unload(level_)). And since 'P' from ParticleSpawner comes before 'S' like SpaceShip, the order was correct.
- Added factory feature for InputStates (can now be created by string if there is Factory entry for it)
- Created factory entries for SimpleInputState and ExtendedInputState
|
-
Property svn:eol-style set to
native
|
|
File size:
2.0 KB
|
| Line | |
|---|
| 1 | SET( ORXONOX_SRC_FILES |
|---|
| 2 | GraphicsEngine.cc |
|---|
| 3 | Main.cc |
|---|
| 4 | Orxonox.cc |
|---|
| 5 | Radar.cc |
|---|
| 6 | RadarListener.cc |
|---|
| 7 | RadarViewable.cc |
|---|
| 8 | Settings.cc |
|---|
| 9 | |
|---|
| 10 | gui/GUIManager.cc |
|---|
| 11 | gui/OgreCEGUIRenderer.cpp |
|---|
| 12 | gui/OgreCEGUIResourceProvider.cpp |
|---|
| 13 | gui/OgreCEGUITexture.cpp |
|---|
| 14 | |
|---|
| 15 | overlays/OrxonoxOverlay.cc |
|---|
| 16 | overlays/OverlayGroup.cc |
|---|
| 17 | overlays/OverlayText.cc |
|---|
| 18 | |
|---|
| 19 | overlays/console/InGameConsole.cc |
|---|
| 20 | |
|---|
| 21 | overlays/debug/DebugFPSText.cc |
|---|
| 22 | overlays/debug/DebugRTRText.cc |
|---|
| 23 | |
|---|
| 24 | overlays/hud/HUDBar.cc |
|---|
| 25 | overlays/hud/HUDNavigation.cc |
|---|
| 26 | overlays/hud/HUDRadar.cc |
|---|
| 27 | overlays/hud/HUDSpeedBar.cc |
|---|
| 28 | |
|---|
| 29 | tolua/tolua_bind.cc |
|---|
| 30 | |
|---|
| 31 | tools/BillboardSet.cc |
|---|
| 32 | tools/Light.cc |
|---|
| 33 | tools/Mesh.cc |
|---|
| 34 | tools/ParticleInterface.cc |
|---|
| 35 | tools/TextureGenerator.cc |
|---|
| 36 | tools/Timer.cc |
|---|
| 37 | tools/WindowEventListener.cc |
|---|
| 38 | |
|---|
| 39 | objects/Ambient.cc |
|---|
| 40 | objects/Backlight.cc |
|---|
| 41 | objects/Camera.cc |
|---|
| 42 | objects/CameraHandler.cc |
|---|
| 43 | objects/Model.cc |
|---|
| 44 | objects/NPC.cc |
|---|
| 45 | objects/ParticleSpawner.cc |
|---|
| 46 | objects/Skybox.cc |
|---|
| 47 | objects/SpaceShip.cc |
|---|
| 48 | objects/SpaceShipAI.cc |
|---|
| 49 | objects/Tickable.cc |
|---|
| 50 | objects/WorldEntity.cc |
|---|
| 51 | |
|---|
| 52 | objects/Projectile.cc |
|---|
| 53 | objects/BillboardProjectile.cc |
|---|
| 54 | objects/RotatingProjectile.cc |
|---|
| 55 | objects/ParticleProjectile.cc |
|---|
| 56 | ) |
|---|
| 57 | |
|---|
| 58 | GET_TARGET_PROPERTY(TOLUA_EXE tolua LOCATION) |
|---|
| 59 | ADD_CUSTOM_COMMAND( |
|---|
| 60 | OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc |
|---|
| 61 | COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg |
|---|
| 62 | DEPENDS tolua |
|---|
| 63 | WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib |
|---|
| 64 | ) |
|---|
| 65 | |
|---|
| 66 | ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} ) |
|---|
| 67 | |
|---|
| 68 | IF(NETWORKTRAFFIC_TESTING_ENABLED) |
|---|
| 69 | |
|---|
| 70 | SET( ORXONOXS_SRC_FILES |
|---|
| 71 | GraphicsEngine.cc |
|---|
| 72 | objects/Ambient.cc |
|---|
| 73 | objects/Camera.cc |
|---|
| 74 | objects/CameraHandler.cc |
|---|
| 75 | objects/Explosion.cc |
|---|
| 76 | objects/Model.cc |
|---|
| 77 | objects/NPC.cc |
|---|
| 78 | objects/Projectile.cc |
|---|
| 79 | objects/Skybox.cc |
|---|
| 80 | objects/SpaceShip.cc |
|---|
| 81 | objects/WorldEntity.cc |
|---|
| 82 | ) |
|---|
| 83 | |
|---|
| 84 | ADD_LIBRARY(orxonoxs SHARED ${ORXONOX_SRC_FILES}) |
|---|
| 85 | ENDIF(NETWORKTRAFFIC_TESTING_ENABLED) |
|---|
| 86 | |
|---|
| 87 | TARGET_LINK_LIBRARIES( orxonox |
|---|
| 88 | ${OGRE_LIBRARIES} |
|---|
| 89 | ${Lua_LIBRARIES} |
|---|
| 90 | tinyxml |
|---|
| 91 | tolualib |
|---|
| 92 | ois_orxonox |
|---|
| 93 | util |
|---|
| 94 | core |
|---|
| 95 | audio |
|---|
| 96 | network |
|---|
| 97 | ) |
|---|
| 98 | |
|---|
Note: See
TracBrowser
for help on using the repository browser.
