Changeset 1651 for code/branches/gui/src/orxonox

Timestamp:

Jul 27, 2008, 5:14:22 PM (16 years ago)

Author:

rgrieder

Message:

tolua seems to be created correctly. I the existing toluabind.c file to create a tolua application that creates the actual pimped tolua application. But be aware that modifying the *.lua files will not cause a recompile. You need to tell iit manually.

There was quite a stupid issue with static initialisation (I'm really wondering how that could even work with msvc).

However things don't seem to work yet on tardis, at least not remotely. It seems like Ogre can't initialise when using a vnc session. I'll have to look into that locally at ETZ.

Location:

code/branches/gui/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• GraphicsEngine.cc (modified) (1 diff)
• Settings.cc (modified) (1 diff)

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

@@ -60 +60 @@
   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
-  DEPENDS tolua
+  DEPENDS tolua ${CMAKE_SOURCE_DIR}/src/orxonox/tolua/tolua.pkg
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )

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

@@ -293 +293 @@
             this->renderWindow_ = root_->initialise(true, "OrxonoxV2");
         }
-        catch (...)
+        catch (std::exception& ex)
         {
             COUT(2) << "Error: There was an exception when initialising Ogre Root." << std::endl;
+                        COUT(1) << ex.what() << std::endl;
             return false;
         }

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

@@ -64 +64 @@
     {
         RegisterRootObject(Settings);
-        gameMode_ = GameMode::GM_Unspecified;
+        gameMode_ = GameMode::GM_None;
         setConfigValues();
     }