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

Timestamp:

Aug 29, 2009, 10:19:38 PM (15 years ago)

Author:

landauf

Message:

merged libraries branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/tools/BillboardSet.h (modified) (1 diff)
• src/orxonox/tools/BulletConversions.h (modified) (1 diff)
• src/orxonox/tools/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/tools/DynamicLines.h (modified) (2 diffs)
• src/orxonox/tools/DynamicRenderable.h (modified) (2 diffs)
• src/orxonox/tools/Mesh.h (modified) (1 diff)
• src/orxonox/tools/ParticleInterface.h (modified) (2 diffs)
• src/orxonox/tools/Shader.h (modified) (2 diffs)
• src/orxonox/tools/TextureGenerator.h (modified) (2 diffs)
• src/orxonox/tools/Timer.h (modified) (3 diffs)
• src/orxonox/tools/ToolsPrereqs.h (copied) (copied from code/branches/libraries/src/orxonox/tools/ToolsPrereqs.h)
• src/orxonox/tools/interfaces (copied) (copied from code/branches/libraries/src/orxonox/tools/interfaces)
• src/orxonox/tools/interfaces/CMakeLists.txt (copied) (copied from code/branches/libraries/src/orxonox/tools/interfaces/CMakeLists.txt)
• src/orxonox/tools/interfaces/Tickable.h (copied) (copied from code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h)
• src/orxonox/tools/interfaces/TimeFactorListener.h (copied) (copied from code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h)
• src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc (copied) (copied from code/branches/libraries/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc)

code/trunk/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/trunk/src/orxonox/tools/BulletConversions.h

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

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

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(TOOLS_SRC_FILES
   BillboardSet.cc
   DynamicLines.cc
@@ -9 +9 @@
   Timer.cc
 )
+ADD_SUBDIRECTORY(interfaces)
+
+ORXONOX_ADD_LIBRARY(tools
+  DEFINE_SYMBOL
+    "TOOLS_SHARED_BUILD"
+  LINK_LIBRARIES
+    core
+  SOURCE_FILES ${TOOLS_SRC_FILES}
+)

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

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

code/trunk/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 DynamicRenderable : public SimpleRenderable
+    class _ToolsExport DynamicRenderable : public SimpleRenderable
     {
     public:

code/trunk/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/trunk/src/orxonox/tools/ParticleInterface.h

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

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

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

code/trunk/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/trunk/src/orxonox/tools/Timer.h

@@ -61 +61 @@
 #define _Timer_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include "core/Executor.h"
 #include "core/OrxonoxClass.h"
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
 
 namespace orxonox
@@ -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 StaticTimer : public TimerBase
+    class _ToolsExport StaticTimer : public TimerBase
     {
         public: