Changeset 5634 for code

Timestamp:

Aug 12, 2009, 1:45:42 AM (15 years ago)

Author:

landauf

Message:

Added ToolsPrereqs.h and _ToolsExport

Location:

code/branches/libraries/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (4 diffs)
• tools/BillboardSet.h (modified) (1 diff)
• tools/BulletConversions.h (modified) (1 diff)
• tools/CMakeLists.txt (modified) (1 diff)
• tools/DynamicLines.h (modified) (2 diffs)
• tools/DynamicRenderable.h (modified) (2 diffs)
• tools/Mesh.h (modified) (1 diff)
• tools/ParticleInterface.h (modified) (2 diffs)
• tools/Shader.h (modified) (2 diffs)
• tools/TextureGenerator.h (modified) (2 diffs)
• tools/Timer.h (modified) (3 diffs)
• tools/ToolsPrereqs.h (added)
• tools/interfaces/Tickable.h (modified) (2 diffs)
• tools/interfaces/TimeFactorListener.h (modified) (1 diff)

code/branches/libraries/src/orxonox/OrxonoxPrereqs.h

@@ -36 +36 @@
 
 #include "OrxonoxConfig.h"
+
+#include "tools/ToolsPrereqs.h"
 
 //-----------------------------------------------------------------------
@@ -62 +64 @@
 namespace orxonox
 {
-    namespace LODParticle
-    {
-        enum Value
-        {
-            Off = 0,
-            Low = 1,
-            Normal = 2,
-            High = 3
-        };
-    }
-
     class RadarViewable;
     class Radar;
@@ -230 +221 @@
     class WorldEntityCollisionShape;
 
-    // tools
-    class BillboardSet;
-    class Light;
-    class Mesh;
-    class ParticleInterface;
-    class Shader;
-    template <class T>
-    class Timer;
-
     // overlays
     class OverlayGroup;
@@ -254 +236 @@
 }
 
-namespace Ogre
-{
-    // OGRE Wiki adapted code
-    class DynamicLines;
-    class DynamicRenderable;
-}
-
 // Bullet Physics Engine
 class btTransform;

code/branches/libraries/src/orxonox/tools/BillboardSet.h

@@ -30 +30 @@
 #define _BillboardSet_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 #include "util/OgreForwardRefs.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport BillboardSet
+    class _ToolsExport BillboardSet
     {
         public:

code/branches/libraries/src/orxonox/tools/BulletConversions.h

@@ -30 +30 @@
 #define _BulletConversions_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include "util/Convert.h"

code/branches/libraries/src/orxonox/tools/CMakeLists.txt

@@ -12 +12 @@
 
 ORXONOX_ADD_LIBRARY(tools
-#  FIND_HEADER_FILES
   DEFINE_SYMBOL
     "TOOLS_SHARED_BUILD"

code/branches/libraries/src/orxonox/tools/DynamicLines.h

@@ -30 +30 @@
 #define _DynamicLines_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <vector>
@@ -37 +37 @@
 namespace Ogre
 {
-    class _OrxonoxExport DynamicLines : public DynamicRenderable
+    class _ToolsExport DynamicLines : public DynamicRenderable
     {
         typedef RenderOperation::OperationType OperationType;

code/branches/libraries/src/orxonox/tools/DynamicRenderable.h

@@ -30 +30 @@
 #define _DynamicRenderable_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <OgreSimpleRenderable.h>
@@ -37 +37 @@
 {
     /// Abstract base class providing mechanisms for dynamically growing hardware buffers.
-    class _OrxonoxExport DynamicRenderable : public SimpleRenderable
+    class _ToolsExport DynamicRenderable : public SimpleRenderable
     {
     public:

code/branches/libraries/src/orxonox/tools/Mesh.h

@@ -30 +30 @@
 #define _Mesh_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 #include "util/OgreForwardRefs.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Mesh
+    class _ToolsExport Mesh
     {
         public:

code/branches/libraries/src/orxonox/tools/ParticleInterface.h

@@ -30 +30 @@
 #define _ParticleInterface_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include "util/OgreForwardRefs.h"
@@ -42 +42 @@
 namespace orxonox
 {
-    class _OrxonoxExport ParticleInterface : public TimeFactorListener
+    class _ToolsExport ParticleInterface : public TimeFactorListener
     {
         public:

code/branches/libraries/src/orxonox/tools/Shader.h

@@ -30 +30 @@
 #define _Shader_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <map>
@@ -41 +41 @@
 namespace orxonox
 {
-    class _OrxonoxExport Shader : public Tickable
+    class _ToolsExport Shader : public Tickable
     {
         typedef std::pair<bool, void*>                  ParameterPointer;

code/branches/libraries/src/orxonox/tools/TextureGenerator.h

@@ -35 +35 @@
 #define _TextureGenerator_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <map>
@@ -43 +43 @@
 namespace orxonox
 {
-    class _OrxonoxExport TextureGenerator
+    class _ToolsExport TextureGenerator
     {
     public:

code/branches/libraries/src/orxonox/tools/Timer.h

@@ -61 +61 @@
 #define _Timer_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include "core/Executor.h"
@@ -75 +75 @@
 
     //! TimerBase is the parent of the Timer class.
-    class _OrxonoxExport TimerBase : public TimeFactorListener
+    class _ToolsExport TimerBase : public TimeFactorListener
     {
         public:
@@ -171 +171 @@
 
     //! The StaticTimer is a callback-object, calling a static function after a given time-interval.
-    class _OrxonoxExport StaticTimer : public TimerBase
+    class _ToolsExport StaticTimer : public TimerBase
     {
         public:

code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h

@@ -42 +42 @@
 #define _Tickable_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include "core/OrxonoxClass.h"
@@ -50 +50 @@
 {
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _OrxonoxExport Tickable : virtual public OrxonoxClass
+    class _ToolsExport Tickable : virtual public OrxonoxClass
     {
         public:

code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h

@@ -30 +30 @@
 #define _TimeFactorListener_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 #include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport TimeFactorListener : virtual public OrxonoxClass
+    class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
     {
         friend class GSRoot;