Changeset 5633 for code/branches

Timestamp:

Aug 12, 2009, 1:32:30 AM (15 years ago)

Author:

landauf

Message:

Put all tools into a new library called tools (phear my naming skillz!)
I had to move Tickable.h and TimeFactorListener.h to tools/interfaces
Theoretically one could move the other interfaces as well (except RadarViewable), but I don't think they belong to "tools" (just because you CAN, it doesn't mean you HAVE to).

Location:

code/branches/libraries/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Map.h (modified) (1 diff)
• PawnManager.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (1 diff)
• interfaces/InterfaceCompilation.cc (modified) (3 diffs)
• objects/Radar.h (modified) (1 diff)
• objects/Scene.h (modified) (1 diff)
• objects/Test.h (modified) (5 diffs)
• objects/controllers/AIController.h (modified) (1 diff)
• objects/controllers/PongAI.h (modified) (1 diff)
• objects/controllers/WaypointController.h (modified) (1 diff)
• objects/gametypes/Gametype.h (modified) (2 diffs)
• objects/items/Engine.h (modified) (1 diff)
• objects/pickup/DroppedItem.h (modified) (1 diff)
• objects/pickup/PickupSpawner.h (modified) (1 diff)
• objects/worldentities/Backlight.h (modified) (1 diff)
• objects/worldentities/BlinkingBillboard.h (modified) (1 diff)
• objects/worldentities/Camera.h (modified) (1 diff)
• objects/worldentities/FadingBillboard.h (modified) (1 diff)
• objects/worldentities/ForceField.h (modified) (3 diffs)
• objects/worldentities/MobileEntity.h (modified) (1 diff)
• objects/worldentities/triggers/Trigger.h (modified) (1 diff)
• overlays/FadeoutText.h (modified) (1 diff)
• overlays/debug/DebugFPSText.h (modified) (1 diff)
• overlays/debug/DebugRTRText.h (modified) (1 diff)
• overlays/hud/GametypeStatus.h (modified) (1 diff)
• overlays/hud/HUDHealthBar.h (modified) (1 diff)
• overlays/hud/HUDNavigation.h (modified) (1 diff)
• overlays/hud/HUDSpeedBar.h (modified) (1 diff)
• overlays/hud/HUDTimer.h (modified) (1 diff)
• overlays/hud/PongScore.h (modified) (1 diff)
• overlays/hud/TeamBaseMatchScore.h (modified) (1 diff)
• overlays/notifications/NotificationQueue.h (modified) (1 diff)
• overlays/stats/Scoreboard.h (modified) (1 diff)
• overlays/stats/Stats.h (modified) (1 diff)
• sound/SoundManager.h (modified) (1 diff)
• tools/CMakeLists.txt (modified) (2 diffs)
• tools/ParticleInterface.h (modified) (1 diff)
• tools/Shader.h (modified) (1 diff)
• tools/Timer.h (modified) (1 diff)
• tools/interfaces (added)
• tools/interfaces/CMakeLists.txt (added)
• tools/interfaces/Tickable.h (moved) (moved from code/branches/libraries/src/orxonox/interfaces/Tickable.h)
• tools/interfaces/TimeFactorListener.h (moved) (moved from code/branches/libraries/src/orxonox/interfaces/TimeFactorListener.h)
• tools/interfaces/ToolsInterfaceCompilation.cc (copied) (copied from code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc) (3 diffs)

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

@@ -70 +70 @@
     core
     network
+    tools
   SOURCE_FILES ${ORXONOX_SRC_FILES}
 )

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

@@ -33 +33 @@
 
 #include "util/UtilPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 

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

@@ -33 +33 @@
 
 #include "util/Singleton.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox

code/branches/libraries/src/orxonox/gamestates/GSLevel.cc

@@ -45 +45 @@
 #include "core/XMLFile.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/Radar.h"
 #include "objects/quest/QuestManager.h"

code/branches/libraries/src/orxonox/gamestates/GSRoot.cc

@@ -38 +38 @@
 #include "ToluaBindOrxonox.h"
 #include "tools/Timer.h"
-#include "interfaces/TimeFactorListener.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/TimeFactorListener.h"
+#include "tools/interfaces/Tickable.h"
 #include "LevelManager.h"
 

code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -30 +30 @@
 @file
 @brief
-    Compiles all the interfaces (except RadarViewable) with mostly just a constructor.
+    Compiles all the interfaces in the orxonox library with mostly just a constructor.
 */
 
@@ -38 +38 @@
 #include "Rewardable.h"
 #include "TeamColourable.h"
-#include "Tickable.h"
-#include "TimeFactorListener.h"
 #include "NotificationListener.h"
 
@@ -82 +80 @@
 
     //----------------------------
-    // TimeFactorListener
-    //----------------------------
-    float TimeFactorListener::timefactor_s = 1.0f;
-
-    TimeFactorListener::TimeFactorListener()
-    {
-        RegisterRootObject(TimeFactorListener);
-    }
-
-    //----------------------------
-    // Tickable
-    //----------------------------
-    /**
-        @brief Constructor: Registers the object in the Tickable-list
-    */
-    Tickable::Tickable()
-    {
-        RegisterRootObject(Tickable);
-    }
-
-    //----------------------------
     // Rewardable
     //----------------------------

code/branches/libraries/src/orxonox/objects/Radar.h

@@ -42 +42 @@
 #include "core/ObjectListIterator.h"
 #include "interfaces/RadarViewable.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox

code/branches/libraries/src/orxonox/objects/Scene.h

@@ -41 +41 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox

code/branches/libraries/src/orxonox/objects/Test.h

@@ -33 +33 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 
@@ -50 +50 @@
       void setConfigValues();
       void registerVariables();
-      
+
       static void call(unsigned int clientID);
       void call2(unsigned int clientID, std::string s1, std::string s2, std::string s3, std::string s4);
@@ -65 +65 @@
       void checkU3();
       void checkU4();
-      
+
       //signed functions
       void setS1(TYPE value){ s1 = value; }
@@ -75 +75 @@
       void checkS3();
       void checkS4();
-      
+
       static void printV1(){ instance_->checkU1(); }
       static void printV2(){ instance_->checkU2(); }
       static void printV3(){ instance_->checkU3(); }
       static void printV4(){ instance_->checkU4(); }
-      
+
       void printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5);
 
@@ -88 +88 @@
       UTYPE u3;
       UTYPE u4;
-      
+
       TYPE s1;
       TYPE s2;
       TYPE s3;
       TYPE s4;
-      
+
       static Test* instance_;
   };

code/branches/libraries/src/orxonox/objects/controllers/AIController.h

@@ -33 +33 @@
 
 #include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "ArtificialController.h"
 

code/branches/libraries/src/orxonox/objects/controllers/PongAI.h

@@ -34 +34 @@
 #include <list>
 #include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "Controller.h"
 

code/branches/libraries/src/orxonox/objects/controllers/WaypointController.h

@@ -33 +33 @@
 
 #include <vector>
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "ArtificialController.h"
 

code/branches/libraries/src/orxonox/objects/gametypes/Gametype.h

@@ -38 +38 @@
 #include "core/BaseObject.h"
 #include "core/Identifier.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/infos/GametypeInfo.h"
 
@@ -133 +133 @@
 
             inline  void startTimer()
-            { 
+            {
                 this->time_ = this->timeLimit_;
                 this->timerIsActive_ = true;

code/branches/libraries/src/orxonox/objects/items/Engine.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "Item.h"
 

code/branches/libraries/src/orxonox/objects/pickup/DroppedItem.h

@@ -38 +38 @@
 
 #include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
 

code/branches/libraries/src/orxonox/objects/pickup/PickupSpawner.h

@@ -39 +39 @@
 #include <string>
 #include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
 

code/branches/libraries/src/orxonox/objects/worldentities/Backlight.h

@@ -33 +33 @@
 
 #include <string>
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
 #include "FadingBillboard.h"
 

code/branches/libraries/src/orxonox/objects/worldentities/BlinkingBillboard.h

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "Billboard.h"
 

code/branches/libraries/src/orxonox/objects/worldentities/Camera.h

@@ -33 +33 @@
 
 #include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
 

code/branches/libraries/src/orxonox/objects/worldentities/FadingBillboard.h

@@ -34 +34 @@
 #include "util/Math.h"
 #include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "Billboard.h"
 

code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "StaticEntity.h"
 
@@ -48 +48 @@
         inline void setVelocity(float vel)
             { this->velocity_ = vel; }
-    
+
         inline float getVelocity()
             { return velocity_; }
-    
+
         inline void setDiameter(float diam)
             { this->diameter_ = diam; }
@@ -57 +57 @@
         inline float getDiameter()
             { return diameter_; }
- 
+
         inline void setLength(float l)
             { this->length_ = l; }

code/branches/libraries/src/orxonox/objects/worldentities/MobileEntity.h

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "WorldEntity.h"
 

code/branches/libraries/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -36 +36 @@
 
 #include "tools/BillboardSet.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/worldentities/StaticEntity.h"
 

code/branches/libraries/src/orxonox/overlays/FadeoutText.h

@@ -33 +33 @@
 
 #include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h

@@ -33 +33 @@
 
 #include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 #include "HUDBar.h"

code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h

@@ -33 +33 @@
 
 #include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 

code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h

@@ -33 +33 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "HUDBar.h"
 

code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/hud/PongScore.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h

@@ -32 +32 @@
 #include "overlays/OverlaysPrereqs.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayText.h"
 

code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h

@@ -43 +43 @@
 
 #include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OverlayGroup.h"
 #include "interfaces/NotificationListener.h"

code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h

@@ -33 +33 @@
 #include <string>
 #include <vector>
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 

code/branches/libraries/src/orxonox/overlays/stats/Stats.h

@@ -33 +33 @@
 
 #include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
 

code/branches/libraries/src/orxonox/sound/SoundManager.h

@@ -33 +33 @@
 #include <list>
 #include "util/Singleton.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox

code/branches/libraries/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
+#  FIND_HEADER_FILES
+  DEFINE_SYMBOL
+    "TOOLS_SHARED_BUILD"
+  LINK_LIBRARIES
+    core
+  SOURCE_FILES ${TOOLS_SRC_FILES}
+)

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

@@ -33 +33 @@
 
 #include "util/OgreForwardRefs.h"
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
 
 #define getAllEmitters() \

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

@@ -37 +37 @@
 
 #include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 
 namespace orxonox

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

@@ -65 +65 @@
 #include "core/Executor.h"
 #include "core/OrxonoxClass.h"
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
 
 namespace orxonox

code/branches/libraries/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc

@@ -30 +30 @@
 @file
 @brief
-    Compiles all the interfaces (except RadarViewable) with mostly just a constructor.
+    Compiles all the interfaces in the tools library with mostly just a constructor.
 */
 
-#include "GametypeMessageListener.h"
-#include "PawnListener.h"
-#include "RadarListener.h"
-#include "Rewardable.h"
-#include "TeamColourable.h"
 #include "Tickable.h"
 #include "TimeFactorListener.h"
-#include "NotificationListener.h"
 
 #include "core/CoreIncludes.h"
@@ -46 +40 @@
 namespace orxonox
 {
-    //----------------------------
-    // GametypeMessageListener
-    //----------------------------
-    GametypeMessageListener::GametypeMessageListener()
-    {
-        RegisterRootObject(GametypeMessageListener);
-    }
-
-    //----------------------------
-    // PawnListener
-    //----------------------------
-    /**
-        @brief Constructor for the PawnListener.
-    */
-    PawnListener::PawnListener()
-    {
-        RegisterRootObject(PawnListener);
-    }
-
-    //----------------------------
-    // RadarListener
-    //----------------------------
-    RadarListener::RadarListener()
-    {
-        RegisterRootObject(RadarListener);
-    }
-
-    //----------------------------
-    // TeamColourable
-    //----------------------------
-    TeamColourable::TeamColourable()
-    {
-        RegisterRootObject(TeamColourable);
-    }
-
     //----------------------------
     // TimeFactorListener
@@ -101 +60 @@
         RegisterRootObject(Tickable);
     }
-
-    //----------------------------
-    // Rewardable
-    //----------------------------
-    Rewardable::Rewardable()
-    {
-        RegisterObject(Rewardable);
-    }
-
-    //----------------------------
-    // NotificationListener
-    //----------------------------
-    NotificationListener::NotificationListener()
-    {
-        RegisterObject(NotificationListener);
-    }
 }