Changeset 5633 for code/branches/libraries/src/orxonox/objects

Timestamp:

Aug 12, 2009, 1:32:30 AM (16 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/objects

Files:

• Radar.h (modified) (1 diff)
• Scene.h (modified) (1 diff)
• Test.h (modified) (5 diffs)
• controllers/AIController.h (modified) (1 diff)
• controllers/PongAI.h (modified) (1 diff)
• controllers/WaypointController.h (modified) (1 diff)
• gametypes/Gametype.h (modified) (2 diffs)
• items/Engine.h (modified) (1 diff)
• pickup/DroppedItem.h (modified) (1 diff)
• pickup/PickupSpawner.h (modified) (1 diff)
• worldentities/Backlight.h (modified) (1 diff)
• worldentities/BlinkingBillboard.h (modified) (1 diff)
• worldentities/Camera.h (modified) (1 diff)
• worldentities/FadingBillboard.h (modified) (1 diff)
• worldentities/ForceField.h (modified) (3 diffs)
• worldentities/MobileEntity.h (modified) (1 diff)
• worldentities/triggers/Trigger.h (modified) (1 diff)

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"