Changeset 5662 for code/branches/resource2

Timestamp:

Aug 19, 2009, 12:27:59 PM (15 years ago)

Author:

rgrieder

Message:

Fixed build and a few issues and removed a warning.

Location:

code/branches/resource2

Files:

• data/CMakeLists.txt (modified) (1 diff)
• src/core/Game.cc (modified) (1 diff)
• src/core/GraphicsManager.cc (modified) (1 diff)
• src/orxonox/tools/ResourceCollection.cc (modified) (2 diffs)

code/branches/resource2/data/CMakeLists.txt

@@ -40 +40 @@
 
 IF(NOT EXTERNAL_DATA_DIRECTORY)
-  MESSAGE(STATUS "Warning: External data directory not found. If you want to compile while downloading the data files, you will have to recompile about four files afterwards and relink everything. \\n You can specify your own folder with the DATA_DIRECTORY variable. Default location for the path is orxonox_root/data_extern")
+  MESSAGE(STATUS "Warning: External data directory not found. If you want to compile while downloading the data files, you will have to recompile about four files afterwards and relink everything.")
+  MESSAGE(STATUS "You can specify your own folder with the EXTERNAL_DATA_DIRECTORY variable. Default location for the path is orxonox_root/data_extern")
   # Temporary override to the default location.
   SET(EXTERNAL_DATA_DIRECTORY ${CMAKE_SOURCE_DIR}/data_extern)

code/branches/resource2/src/core/Game.cc

@@ -274 +274 @@
             {
                 // Add tick time for most of the states
-                uint64_t timeBeforeTick;
+                uint64_t timeBeforeTick = 0;
                 if ((*it)->getInfo().bIgnoreTickTime)
                     timeBeforeTick = this->gameClock_->getRealMicroseconds();

code/branches/resource2/src/core/GraphicsManager.cc

@@ -86 +86 @@
     */
     GraphicsManager::GraphicsManager(bool bLoadRenderer)
-        : renderWindow_(0)
+        : ogreWindowEventListener_(new OgreWindowEventListener())
+        , renderWindow_(0)
         , viewport_(0)
-        , ogreWindowEventListener_(new OgreWindowEventListener())
     {
         RegisterObject(GraphicsManager);

code/branches/resource2/src/orxonox/tools/ResourceCollection.cc

@@ -31 +31 @@
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
+#include "core/Resource.h"
 #include "core/XMLPort.h"
 #include "ResourceLocation.h"
@@ -44 +45 @@
 
         // Default group is "General"
-        this->setResourceGroup(Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+        this->setResourceGroup(Resource::DEFAULT_GROUP);
     }