Changeset 8729 for code/trunk/src/orxonox/controllers

Timestamp:

Jul 4, 2011, 2:47:44 AM (14 years ago)

Author:

rgrieder

Message:

Merged unity_build branch back to trunk.

Features:

• Implemented fully automatic build units to speed up compilation if requested
• Added DOUT macro for quick debug output
• Activated text colouring in the POSIX IOConsole
• DeclareToluaInterface is not necessary anymore

Improvements:

• Output levels now change appropriately when switch back and forth from dev mode
• Log level for the file output is now also correct during startup
• Removed some header file dependencies in core and tools to speed up compilation

no more file for command line options

• Improved util::tribool by adapting some concepts from boost::tribool

Regressions:

• It is not possible anymore to specify command line arguments in an extra file because we've got config values for that purpose.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/AIController.cc (modified) (1 diff)
• src/orxonox/controllers/AIController.h (modified) (1 diff)
• src/orxonox/controllers/DroneController.cc (modified) (1 diff)
• src/orxonox/controllers/DroneController.h (modified) (1 diff)

code/trunk/src/orxonox/controllers/AIController.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    static const float ACTION_INTERVAL = 1.0f;
+    const float AIController::ACTION_INTERVAL = 1.0f;
 
     CreateFactory(AIController);

code/trunk/src/orxonox/controllers/AIController.h

@@ -50 +50 @@
 
         private:
+            static const float ACTION_INTERVAL;
+
             Timer actionTimer_;
     };

code/trunk/src/orxonox/controllers/DroneController.cc

@@ -43 +43 @@
     CreateFactory(DroneController);
 
-    static const float ACTION_INTERVAL = 1.0f;
+    const float DroneController::ACTION_INTERVAL = 1.0f;
 
     DroneController::DroneController(BaseObject* creator) : ArtificialController(creator)

code/trunk/src/orxonox/controllers/DroneController.h

@@ -69 +69 @@
 
         private:
+            static const float ACTION_INTERVAL;
+
             Timer actionTimer_;
             WeakPtr<Pawn> owner_;