Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5634


Ignore:
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:
1 added
13 edited

Legend:

Unmodified
Added
Removed

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

    r5632 r5634  
    3636
    3737#include "OrxonoxConfig.h"
     38
     39#include "tools/ToolsPrereqs.h"
    3840
    3941//-----------------------------------------------------------------------
    … …  
    6264namespace orxonox
    6365{
    64     namespace LODParticle
    65     {
    66         enum Value
    67         {
    68             Off = 0,
    69             Low = 1,
    70             Normal = 2,
    71             High = 3
    72         };
    73     }
    74 
    7566    class RadarViewable;
    7667    class Radar;
    … …  
    230221    class WorldEntityCollisionShape;
    231222
    232     // tools
    233     class BillboardSet;
    234     class Light;
    235     class Mesh;
    236     class ParticleInterface;
    237     class Shader;
    238     template <class T>
    239     class Timer;
    240 
    241223    // overlays
    242224    class OverlayGroup;
    … …  
    254236}
    255237
    256 namespace Ogre
    257 {
    258     // OGRE Wiki adapted code
    259     class DynamicLines;
    260     class DynamicRenderable;
    261 }
    262 
    263238// Bullet Physics Engine
    264239class btTransform;

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

    r3196 r5634  
    3030#define _BillboardSet_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333#include "util/OgreForwardRefs.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport BillboardSet
     37    class _ToolsExport BillboardSet
    3838    {
    3939        public:

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

    r3196 r5634  
    3030#define _BulletConversions_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333
    3434#include "util/Convert.h"

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

    r5633 r5634  
    1212
    1313ORXONOX_ADD_LIBRARY(tools
    14 #  FIND_HEADER_FILES
    1514  DEFINE_SYMBOL
    1615    "TOOLS_SHARED_BUILD"

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

    r5629 r5634  
    3030#define _DynamicLines_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333
    3434#include <vector>
    … …  
    3737namespace Ogre
    3838{
    39     class _OrxonoxExport DynamicLines : public DynamicRenderable
     39    class _ToolsExport DynamicLines : public DynamicRenderable
    4040    {
    4141        typedef RenderOperation::OperationType OperationType;

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

    r5629 r5634  
    3030#define _DynamicRenderable_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333
    3434#include <OgreSimpleRenderable.h>
    … …  
    3737{
    3838    /// Abstract base class providing mechanisms for dynamically growing hardware buffers.
    39     class _OrxonoxExport DynamicRenderable : public SimpleRenderable
     39    class _ToolsExport DynamicRenderable : public SimpleRenderable
    4040    {
    4141    public:

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

    r3196 r5634  
    3030#define _Mesh_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333#include "util/OgreForwardRefs.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport Mesh
     37    class _ToolsExport Mesh
    3838    {
    3939        public:

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

    r5633 r5634  
    3030#define _ParticleInterface_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333
    3434#include "util/OgreForwardRefs.h"
    … …  
    4242namespace orxonox
    4343{
    44     class _OrxonoxExport ParticleInterface : public TimeFactorListener
     44    class _ToolsExport ParticleInterface : public TimeFactorListener
    4545    {
    4646        public:

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

    r5633 r5634  
    3030#define _Shader_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333
    3434#include <map>
    … …  
    4141namespace orxonox
    4242{
    43     class _OrxonoxExport Shader : public Tickable
     43    class _ToolsExport Shader : public Tickable
    4444    {
    4545        typedef std::pair<bool, void*>                  ParameterPointer;

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

    r3196 r5634  
    3535#define _TextureGenerator_H__
    3636
    37 #include "OrxonoxPrereqs.h"
     37#include "tools/ToolsPrereqs.h"
    3838
    3939#include <map>
    … …  
    4343namespace orxonox
    4444{
    45     class _OrxonoxExport TextureGenerator
     45    class _ToolsExport TextureGenerator
    4646    {
    4747    public:

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

    r5633 r5634  
    6161#define _Timer_H__
    6262
    63 #include "OrxonoxPrereqs.h"
     63#include "tools/ToolsPrereqs.h"
    6464
    6565#include "core/Executor.h"
    … …  
    7575
    7676    //! TimerBase is the parent of the Timer class.
    77     class _OrxonoxExport TimerBase : public TimeFactorListener
     77    class _ToolsExport TimerBase : public TimeFactorListener
    7878    {
    7979        public:
    … …  
    171171
    172172    //! The StaticTimer is a callback-object, calling a static function after a given time-interval.
    173     class _OrxonoxExport StaticTimer : public TimerBase
     173    class _ToolsExport StaticTimer : public TimerBase
    174174    {
    175175        public:

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

    r5633 r5634  
    4242#define _Tickable_H__
    4343
    44 #include "OrxonoxPrereqs.h"
     44#include "tools/ToolsPrereqs.h"
    4545
    4646#include "core/OrxonoxClass.h"
    … …  
    5050{
    5151    //! The Tickable interface provides a tick(dt) function, that gets called every frame.
    52     class _OrxonoxExport Tickable : virtual public OrxonoxClass
     52    class _ToolsExport Tickable : virtual public OrxonoxClass
    5353    {
    5454        public:

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

    r5633 r5634  
    3030#define _TimeFactorListener_H__
    3131
    32 #include "OrxonoxPrereqs.h"
     32#include "tools/ToolsPrereqs.h"
    3333#include "core/OrxonoxClass.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport TimeFactorListener : virtual public OrxonoxClass
     37    class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
    3838    {
    3939        friend class GSRoot;
Note: See TracChangeset for help on using the changeset viewer.