Changeset 1642 for code/branches/gui/src/core/Exception.h

Timestamp:

Jul 23, 2008, 3:37:29 PM (17 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

File:

• code/branches/gui/src/core/Exception.h (modified) (2 diffs)

code/branches/gui/src/core/Exception.h

@@ -40 +40 @@
 #include <string>
 #include <exception>
+#include <cassert>
 #include "core/Debug.h"
 
@@ -129 +130 @@
     throw SpecificException<Exception::type>(description, __LINE__, __FILE__, __FUNCTIONNAME__)
 
+    // define an assert macro that can display a message
+#ifndef NDEBUG
+#define OrxAssert(condition, errorMessage) \
+    condition ? ((void)0) : (orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << errorMessage << std::endl); \
+    assert(condition);
+#else
+#define OrxAssert(condition, errorMessage)  ((void)0)
+#endif
+
 }