[Orxonox-commit 911] r5634 - in code/branches/libraries/src/orxonox: . tools tools/interfaces
landauf at orxonox.net
landauf at orxonox.net
Wed Aug 12 01:45:42 CEST 2009
Author: landauf
Date: 2009-08-12 01:45:42 +0200 (Wed, 12 Aug 2009)
New Revision: 5634
Added:
code/branches/libraries/src/orxonox/tools/ToolsPrereqs.h
Modified:
code/branches/libraries/src/orxonox/OrxonoxPrereqs.h
code/branches/libraries/src/orxonox/tools/BillboardSet.h
code/branches/libraries/src/orxonox/tools/BulletConversions.h
code/branches/libraries/src/orxonox/tools/CMakeLists.txt
code/branches/libraries/src/orxonox/tools/DynamicLines.h
code/branches/libraries/src/orxonox/tools/DynamicRenderable.h
code/branches/libraries/src/orxonox/tools/Mesh.h
code/branches/libraries/src/orxonox/tools/ParticleInterface.h
code/branches/libraries/src/orxonox/tools/Shader.h
code/branches/libraries/src/orxonox/tools/TextureGenerator.h
code/branches/libraries/src/orxonox/tools/Timer.h
code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h
code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h
Log:
Added ToolsPrereqs.h and _ToolsExport
Modified: code/branches/libraries/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/libraries/src/orxonox/OrxonoxPrereqs.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/OrxonoxPrereqs.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -36,6 +36,8 @@
#include "OrxonoxConfig.h"
+#include "tools/ToolsPrereqs.h"
+
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
@@ -61,17 +63,6 @@
namespace orxonox
{
- namespace LODParticle
- {
- enum Value
- {
- Off = 0,
- Low = 1,
- Normal = 2,
- High = 3
- };
- }
-
class RadarViewable;
class Radar;
class RadarListener;
@@ -229,15 +220,6 @@
class PlaneCollisionShape;
class WorldEntityCollisionShape;
- // tools
- class BillboardSet;
- class Light;
- class Mesh;
- class ParticleInterface;
- class Shader;
- template <class T>
- class Timer;
-
// overlays
class OverlayGroup;
class OrxonoxOverlay;
@@ -253,13 +235,6 @@
class SoundMainMenu;
}
-namespace Ogre
-{
- // OGRE Wiki adapted code
- class DynamicLines;
- class DynamicRenderable;
-}
-
// Bullet Physics Engine
class btTransform;
class btVector3;
Modified: code/branches/libraries/src/orxonox/tools/BillboardSet.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/BillboardSet.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/BillboardSet.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,12 +29,12 @@
#ifndef _BillboardSet_H__
#define _BillboardSet_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include "util/OgreForwardRefs.h"
namespace orxonox
{
- class _OrxonoxExport BillboardSet
+ class _ToolsExport BillboardSet
{
public:
BillboardSet();
Modified: code/branches/libraries/src/orxonox/tools/BulletConversions.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/BulletConversions.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/BulletConversions.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,7 +29,7 @@
#ifndef _BulletConversions_H__
#define _BulletConversions_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include "util/Convert.h"
#include "util/Math.h"
Modified: code/branches/libraries/src/orxonox/tools/CMakeLists.txt
===================================================================
--- code/branches/libraries/src/orxonox/tools/CMakeLists.txt 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/CMakeLists.txt 2009-08-11 23:45:42 UTC (rev 5634)
@@ -11,7 +11,6 @@
ADD_SUBDIRECTORY(interfaces)
ORXONOX_ADD_LIBRARY(tools
-# FIND_HEADER_FILES
DEFINE_SYMBOL
"TOOLS_SHARED_BUILD"
LINK_LIBRARIES
Modified: code/branches/libraries/src/orxonox/tools/DynamicLines.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/DynamicLines.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/DynamicLines.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,14 +29,14 @@
#ifndef _DynamicLines_H__
#define _DynamicLines_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include <vector>
#include "DynamicRenderable.h"
namespace Ogre
{
- class _OrxonoxExport DynamicLines : public DynamicRenderable
+ class _ToolsExport DynamicLines : public DynamicRenderable
{
typedef RenderOperation::OperationType OperationType;
Modified: code/branches/libraries/src/orxonox/tools/DynamicRenderable.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/DynamicRenderable.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/DynamicRenderable.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,14 +29,14 @@
#ifndef _DynamicRenderable_H__
#define _DynamicRenderable_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include <OgreSimpleRenderable.h>
namespace Ogre
{
/// Abstract base class providing mechanisms for dynamically growing hardware buffers.
- class _OrxonoxExport DynamicRenderable : public SimpleRenderable
+ class _ToolsExport DynamicRenderable : public SimpleRenderable
{
public:
/// Constructor
Modified: code/branches/libraries/src/orxonox/tools/Mesh.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/Mesh.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/Mesh.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,12 +29,12 @@
#ifndef _Mesh_H__
#define _Mesh_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include "util/OgreForwardRefs.h"
namespace orxonox
{
- class _OrxonoxExport Mesh
+ class _ToolsExport Mesh
{
public:
Mesh();
Modified: code/branches/libraries/src/orxonox/tools/ParticleInterface.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/ParticleInterface.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/ParticleInterface.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,7 +29,7 @@
#ifndef _ParticleInterface_H__
#define _ParticleInterface_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include "util/OgreForwardRefs.h"
#include "tools/interfaces/TimeFactorListener.h"
@@ -41,7 +41,7 @@
namespace orxonox
{
- class _OrxonoxExport ParticleInterface : public TimeFactorListener
+ class _ToolsExport ParticleInterface : public TimeFactorListener
{
public:
ParticleInterface(Ogre::SceneManager* scenemanager, const std::string& templateName, LODParticle::Value detaillevel);
Modified: code/branches/libraries/src/orxonox/tools/Shader.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/Shader.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/Shader.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,7 +29,7 @@
#ifndef _Shader_H__
#define _Shader_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include <map>
#include <string>
@@ -40,7 +40,7 @@
namespace orxonox
{
- class _OrxonoxExport Shader : public Tickable
+ class _ToolsExport Shader : public Tickable
{
typedef std::pair<bool, void*> ParameterPointer;
typedef std::map<std::string, ParameterPointer> ParameterMap;
Modified: code/branches/libraries/src/orxonox/tools/TextureGenerator.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/TextureGenerator.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/TextureGenerator.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -34,7 +34,7 @@
#ifndef _TextureGenerator_H__
#define _TextureGenerator_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include <map>
#include <string>
@@ -42,7 +42,7 @@
namespace orxonox
{
- class _OrxonoxExport TextureGenerator
+ class _ToolsExport TextureGenerator
{
public:
static const std::string& getMaterialName(const std::string& textureName, const ColourValue& colour);
Modified: code/branches/libraries/src/orxonox/tools/Timer.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/Timer.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/Timer.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -60,7 +60,7 @@
#ifndef _Timer_H__
#define _Timer_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include "core/Executor.h"
#include "core/OrxonoxClass.h"
@@ -74,7 +74,7 @@
void executeDelayedCommand(StaticTimer* timer, const std::string& command);
//! TimerBase is the parent of the Timer class.
- class _OrxonoxExport TimerBase : public TimeFactorListener
+ class _ToolsExport TimerBase : public TimeFactorListener
{
public:
~TimerBase();
@@ -170,7 +170,7 @@
};
//! 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:
StaticTimer() {}
Added: code/branches/libraries/src/orxonox/tools/ToolsPrereqs.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/ToolsPrereqs.h (rev 0)
+++ code/branches/libraries/src/orxonox/tools/ToolsPrereqs.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -0,0 +1,91 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Contains all the necessary forward declarations for all classes and structs.
+*/
+
+#ifndef _ToolsPrereqs_H__
+#define _ToolsPrereqs_H__
+
+#include "OrxonoxConfig.h"
+
+//-----------------------------------------------------------------------
+// Shared library settings
+//-----------------------------------------------------------------------
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+# ifdef TOOLS_SHARED_BUILD
+# define _ToolsExport __declspec(dllexport)
+# else
+# if defined( __MINGW32__ )
+# define _ToolsExport
+# else
+# define _ToolsExport __declspec(dllimport)
+# endif
+# endif
+#elif defined ( ORXONOX_GCC_VISIBILITY )
+# define _ToolsExport __attribute__ ((visibility("default")))
+#else
+# define _ToolsExport
+#endif
+
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+namespace orxonox
+{
+ namespace LODParticle
+ {
+ enum Value
+ {
+ Off = 0,
+ Low = 1,
+ Normal = 2,
+ High = 3
+ };
+ }
+
+ class BillboardSet;
+ class Mesh;
+ class ParticleInterface;
+ class Shader;
+ template <class T>
+ class Timer;
+ class StaticTimer;
+}
+
+namespace Ogre
+{
+ // OGRE Wiki adapted code
+ class DynamicLines;
+ class DynamicRenderable;
+}
+
+#endif /* _ToolsPrereqs_H__ */
Property changes on: code/branches/libraries/src/orxonox/tools/ToolsPrereqs.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -41,7 +41,7 @@
#ifndef _Tickable_H__
#define _Tickable_H__
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
#include "core/OrxonoxClass.h"
#include "core/Super.h"
@@ -49,7 +49,7 @@
namespace orxonox
{
//! 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:
/**
Modified: code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h 2009-08-11 23:32:30 UTC (rev 5633)
+++ code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h 2009-08-11 23:45:42 UTC (rev 5634)
@@ -29,12 +29,12 @@
#ifndef _TimeFactorListener_H__
#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;
More information about the Orxonox-commit
mailing list