Changeset 1642 for code/branches/gui/visual_studio

Timestamp:

Jul 23, 2008, 3:37:29 PM (16 years ago)

Author:

rgrieder

Message:

• 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

Location:

code/branches/gui/visual_studio

Files:

• base_properties.vsprops (modified) (1 diff)
• core_properties.vsprops (modified) (1 diff)
• network_properties.vsprops (modified) (1 diff)
• orxonox_properties.vsprops (modified) (1 diff)

code/branches/gui/visual_studio/base_properties.vsprops

@@ -9 +9 @@
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories=""$(RootDir)";"$(RootDir)src";"$(RootDir)src\orxonox";"$(RootDir)src\tolua";"$(RootDir)src\ois";"$(LibDir)ogre-1.4.8\OgreMain\include";"$(LibDir)boost-1.35.0";"$(LibDir)cegui-0.6.1\include";"$(LibDir)cegui-0.6.1\ScriptingModules\CEGUILua\LuaScriptModule\include";"$(LibDir)enet-1.2\include";"$(LibDir)libogg-1.1.3\include";"$(LibDir)libvorbis-1.2.0\include";"$(LibDir)lua-5.1.3\src";"$(LibDir)openal-1.1\include";"$(LibDir)openal-1.1\alut\include";"$(LibDir)tcl-8.5.\generic";"$(LibDir)zlib-1.2.3";"$(LibDir)ogre-1.4.9\Samples\Common\CEGUIRenderer\include""
-                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB; ZLIB_WINAPI"
                 WarningLevel="3"

code/branches/gui/visual_studio/core_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="CORE_SHARED_BUILD"
         />

code/branches/gui/visual_studio/network_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;WIN32_LEAN_AND_MEAN"
         />

code/branches/gui/visual_studio/orxonox_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
+                AdditionalOptions="/MP2"
                 PreprocessorDefinitions="ORXONOX_NO_EXPORTS;NETWORK_STATIC_BUILD;OGRE_GUIRENDERER_EXPORTS"
                 UsePrecompiledHeader="2"