Changeset 5695 for code/trunk/src/orxonox/tools

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/tools/CMakeLists.txt (modified) (1 diff)
• src/orxonox/tools/Mesh.cc (modified) (2 diffs)
• src/orxonox/tools/ResourceCollection.cc (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceCollection.cc)
• src/orxonox/tools/ResourceCollection.h (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceCollection.h) (2 diffs)
• src/orxonox/tools/ResourceLocation.cc (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceLocation.cc)
• src/orxonox/tools/ResourceLocation.h (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceLocation.h) (2 diffs)

code/trunk/src/orxonox/tools/CMakeLists.txt

@@ -5 +5 @@
   Mesh.cc
   ParticleInterface.cc
+  ResourceCollection.cc
+  ResourceLocation.cc
   Shader.cc
   TextureGenerator.cc

code/trunk/src/orxonox/tools/Mesh.cc

@@ -71 +71 @@
                 this->entity_->setCastShadows(this->bCastShadows_);
 
+#if OGRE_VERSION < 0x010600
                 this->entity_->setNormaliseNormals(true);
                 /*
@@ -79 +80 @@
                     I don't know exactly what this means, but I put this here if there will be problems with shaders.
                 */
+#endif
             }
             catch (...)

code/trunk/src/orxonox/tools/ResourceCollection.h

@@ -30 +30 @@
 #define _ResourceCollection_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <string>
@@ -40 +40 @@
     class ResourceLocation;
 
-    class _OrxonoxExport ResourceCollection : public BaseObject
+    class _ToolsExport ResourceCollection : public BaseObject
     {
     public:

code/trunk/src/orxonox/tools/ResourceLocation.h

@@ -30 +30 @@
 #define _ResourceLocation_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <string>
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport ResourceLocation : public BaseObject
+    class _ToolsExport ResourceLocation : public BaseObject
     {
         // for load/unload