Changeset 1645 for code/branches/gui/src

Timestamp:

Jul 23, 2008, 7:31:40 PM (16 years ago)

Author:

rgrieder

Message:

It compiles now on tardis..

Location:

code/branches/gui/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• core/Exception.h (modified) (2 diffs)
• core/input/InputManager.cc (modified) (1 diff)
• core/input/InputManager.h (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (2 diffs)

code/branches/gui/src/core/CMakeLists.txt

@@ -57 +57 @@
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
-  COMMAND ${TOLUA_EXE} -n core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
+  COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
   DEPENDS tolua
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib

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

@@ -100 +100 @@
         }
 
-        ~SpecificException() { }
+        ~SpecificException() throw() { }
 
         ExceptionType getType() const { return Type; }
@@ -133 +133 @@
 #ifndef NDEBUG
 #define OrxAssert(condition, errorMessage) \
-    condition ? ((void)0) : (orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << errorMessage << std::endl); \
-    assert(condition);
+    condition ? ((void)0) : (void)(orxonox::OutputHandler::getOutStream().setOutputLevel(ORX_ERROR) << errorMessage << std::endl); \
+    assert(condition)
 #else
 #define OrxAssert(condition, errorMessage)  ((void)0)

code/branches/gui/src/core/input/InputManager.cc

@@ -86 +86 @@
         , stateCalibrator_(0)
         , stateEmpty_(0)
+        , bCalibrating_(false)
         , keyboardModifiers_(0)
-        , bCalibrating_(false)
     {
         RegisterRootObject(InputManager);

code/branches/gui/src/core/input/InputManager.h

@@ -85 +85 @@
     {
         // --> setConfigValues is private
-        friend ClassIdentifier<InputManager>;
+        friend class ClassIdentifier<InputManager>;
         // let Core class use tick(.)
-        friend Core;
+        friend class Core;
 
     public:

code/branches/gui/src/orxonox/CMakeLists.txt

@@ -59 +59 @@
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
-  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
+  COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
   DEPENDS tolua
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
@@ -89 +89 @@
   ${Lua_LIBRARIES}
   ${CEGUI_LIBRARIES}
+  ${CEGUI_SCRIPT_LIBRARIES}
   tinyxml
   tolualib

code/branches/gui/src/orxonox/Orxonox.cc

@@ -468 +468 @@
     unsigned long frameCount = 0;
     
-    const unsigned long refreshTime = 50000.0f;
-    //const unsigned long refreshTime = debugRefreshTime_ * 1000000.0f;
+    const unsigned long refreshTime = (unsigned long)(debugRefreshTime_ * 1000000.0f);
     unsigned long refreshStartTime = 0;
     unsigned long tickTime = 0;

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -126 +126 @@
             catch (CEGUI::Exception& ex)
             {
+#if CEGUI_VERSION_MINOR < 6
+                throw GeneralException(ex.getMessage().c_str());
+#else
                 throw GeneralException(ex.getMessage().c_str(), ex.getLine(),
                     ex.getFileName().c_str(), ex.getName().c_str());
+#endif
             }
 
@@ -166 +170 @@
         catch (CEGUI::Exception& ex)
         {
+#if CEGUI_VERSION_MINOR < 6
+            throw GeneralException(ex.getMessage().c_str());
+#else
             throw GeneralException(ex.getMessage().c_str(), ex.getLine(),
                 ex.getFileName().c_str(), ex.getName().c_str());
+#endif
         }
     }