Changeset 8729 for code/trunk/src/orxonox

Timestamp:

Jul 4, 2011, 2:47:44 AM (13 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/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Main.cc (modified) (1 diff)
• 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)
• src/orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• src/orxonox/gametypes/Dynamicmatch.cc (modified) (1 diff)
• src/orxonox/graphics/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/InGameConsole.cc (modified) (2 diffs)
• src/orxonox/sound/BaseSound.cc (modified) (1 diff)
• src/orxonox/weaponsystem/Munition.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)

code/trunk/src/orxonox/CMakeLists.txt

@@ -35 +35 @@
   ChatInputHandler.cc
 #  Test.cc
-COMPILATION_BEGIN SceneCompilation.cc
+
+BUILD_UNIT SceneBuildUnit.cc
   CameraManager.cc
   Scene.cc
-COMPILATION_END
+END_BUILD_UNIT
 )
 

code/trunk/src/orxonox/Main.cc

@@ -39 +39 @@
 #include "core/Game.h"
 #include "core/LuaState.h"
-#include "ToluaBindOrxonox.h"
-#include "ToluaBindNetwork.h"
-
-DeclareToluaInterface(Orxonox);
-DeclareToluaInterface(Network);
 
 namespace orxonox

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_;

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -77 +77 @@
         {
             gameInputState_ = InputManager::getInstance().createInputState("game");
-            gameInputState_->setMouseExclusive(TriBool::True);
+            gameInputState_->setMouseExclusive(true);
             gameInputState_->setHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
             KeyBinderManager::getInstance().setToDefault();
 
             guiMouseOnlyInputState_ = InputManager::getInstance().createInputState("guiMouseOnly");
-            guiMouseOnlyInputState_->setMouseExclusive(TriBool::True);
+            guiMouseOnlyInputState_->setMouseExclusive(true);
             guiMouseOnlyInputState_->setMouseHandler(&GUIManager::getInstance());
 

code/trunk/src/orxonox/gametypes/Dynamicmatch.cc

@@ -48 +48 @@
 #include "util/Convert.h"
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
 #include "network/Host.h"
 #include "infos/PlayerInfo.h"

code/trunk/src/orxonox/graphics/CMakeLists.txt

@@ -9 +9 @@
   ParticleEmitter.cc
   ParticleSpawner.cc
-COMPILATION_BEGIN GraphicsCompilation.cc
+
+BUILD_UNIT GraphicsBuildUnit.cc
   Backlight.cc
   Camera.cc
   Light.cc
-COMPILATION_END
+END_BUILD_UNIT
 )

code/trunk/src/orxonox/overlays/InGameConsole.cc

@@ -91 +91 @@
         this->setConfigValues();
         this->initialise();
+
+        // Output buffering is not anymore needed. Not the best solution to do
+        // this here, but there isn't much of another way.
+        OutputHandler::getInstance().disableMemoryLog();
     }
 
@@ -586 +590 @@
                           colourBottom = ColourValue(0.90f, 0.90f, 0.90f, 1.00f); break;
 
+        case Shell::TDebug:  colourTop = ColourValue(0.90f, 0.00f, 0.90f, 1.00f);
+                          colourBottom = ColourValue(1.00f, 0.00f, 1.00f, 1.00f); break;
+
         default:             colourTop = ColourValue(0.90f, 0.90f, 0.90f, 1.00f);
                           colourBottom = ColourValue(1.00f, 1.00f, 1.00f, 1.00f); break;

code/trunk/src/orxonox/sound/BaseSound.cc

@@ -61 +61 @@
     BaseSound::~BaseSound()
     {
-        this->stop();
+        if (this->state_ != Stopped)
+            this->stop();
         // Release buffer
         if (this->soundBuffer_ != NULL)

code/trunk/src/orxonox/weaponsystem/Munition.cc

@@ -29 +29 @@
 
 #include "Munition.h"
+
 #include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
 
 namespace orxonox

code/trunk/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/SubclassIdentifier.h"
 #include "worldentities/pawns/Pawn.h"