Changeset 8351 for code/trunk/src/orxonox

Timestamp:

Apr 28, 2011, 7:15:14 AM (14 years ago)

Author:

rgrieder

Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

• *Support for Mac OS X*
• Visual Studio 2010 support
• Bullet library update to 2.77
• OIS library update to 1.3
• Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
• Improved install target
• Compiles now with GCC 4.6
• Ogre Cg Shader plugin activated for Linux if available
• And of course lots of bug fixes

There are also some regressions:

• No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
• In game console is not working in main menu for CEGUI 0.7
• Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
• And of course lots of new bugs we don't yet know about

Location:

code/trunk/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• MoodManager.cc (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• PawnManager.cc (modified) (4 diffs)
• PawnManager.h (modified) (1 diff)
• controllers/ArtificialController.cc (modified) (1 diff)
• controllers/NewHumanController.cc (modified) (1 diff)
• gametypes/LastTeamStanding.cc (modified) (1 prop)
• gametypes/LastTeamStanding.h (modified) (1 prop)
• graphics/BlinkingBillboard.cc (modified) (1 diff)
• graphics/BlinkingBillboard.h (modified) (1 diff)
• interfaces/PickupCarrier.cc (modified) (1 prop)
• interfaces/PickupListener.cc (modified) (1 prop)
• interfaces/PickupListener.h (modified) (1 prop)
• overlays/OrxonoxOverlay.cc (modified) (1 diff)
• sound/AmbientSound.cc (modified) (1 diff)
• sound/SoundBuffer.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (5 diffs)
• sound/SoundManager.h (modified) (1 diff)
• sound/WorldSound.cc (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/trunk/src/orxonox/CMakeLists.txt

@@ -68 +68 @@
     OrxonoxPrecompiledHeaders.h
   LINK_LIBRARIES
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_DATE_TIME_LIBRARY} # Thread dependency
     ${OGRE_LIBRARY}
+    ${CEGUI}
+    ${LUA5.1_LIBRARY}
+    ${CEGUI_TOLUA_LIBRARY}
     ${OPENAL_LIBRARY}
     ${ALUT_LIBRARY}
+    ${OGG_LIBRARY}
+    ${VORBIS_LIBRARY}
     ${VORBISFILE_LIBRARY}
-    ${VORBIS_LIBRARY}
-    ${OGG_LIBRARY}
     tinyxml_orxonox
-    tolua_orxonox
     bullet_orxonox
     util
@@ -85 +83 @@
     network
     tools
-  SOURCE_FILES ${ORXONOX_SRC_FILES}
+  SOURCE_FILES
+    ${ORXONOX_SRC_FILES}
 )

code/trunk/src/orxonox/MoodManager.cc

@@ -56 +56 @@
             COUT(2) << "Mood Warning: Folder for default mood (" << MoodManager::defaultMood_ << ") does not exist!" << std::endl;
         }
+        
+        // @TODO
+        // Creating a vector of the available moods to enable easy mood selection by Lua/CEGUI        
     }
 

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -53 +53 @@
 #    endif
 #  endif
-#elif defined ( ORXONOX_GCC_VISIBILITY )
+#  define _OrxonoxPrivate
+#elif defined (ORXONOX_GCC_VISIBILITY)
 #  define _OrxonoxExport  __attribute__ ((visibility("default")))
+#  define _OrxonoxPrivate __attribute__ ((visibility("hidden")))
 #else
 #  define _OrxonoxExport
+#  define _OrxonoxPrivate
 #endif
 

code/trunk/src/orxonox/PawnManager.cc

@@ -29 +29 @@
 #include "PawnManager.h"
 
+#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
 #include "worldentities/pawns/Pawn.h"
@@ -34 +35 @@
 namespace orxonox
 {
-    PawnManager* PawnManager::singletonPtr_s = 0;
+    ManageScopedSingleton(PawnManager, ScopeID::Root, false);
 
     PawnManager::PawnManager()
@@ -43 +44 @@
     PawnManager::~PawnManager()
     {
+        // Be sure to delete all the pawns
+        for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); )
+            (it++)->destroy();
     }
 
-    void PawnManager::touch()
+    void PawnManager::preUpdate(const Clock& time)
     {
-        if (!PawnManager::singletonPtr_s)
-            new PawnManager();
-    }
-
-    void PawnManager::tick(float dt)
-    {
-        unsigned int count = 0;
-        for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++count)
+        for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); )
         {
             if (!it->isAlive())
@@ -61 +58 @@
                 ++it;
         }
-
-        if (count == 0)
-            this->destroy();
     }
 }

code/trunk/src/orxonox/PawnManager.h

@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport PawnManager : protected Singleton<PawnManager>, public Tickable
+    class _OrxonoxExport PawnManager : public Singleton<PawnManager>, public Tickable
     {
             friend class Singleton<PawnManager>;
         public:
-            static void touch();
+            PawnManager();
+            virtual ~PawnManager();
 
-            virtual void tick(float dt);
+            virtual void preUpdate(const Clock& time);
 
         private:
-            PawnManager();
-            virtual ~PawnManager();
 
             static PawnManager* singletonPtr_s;

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

@@ -847 +847 @@
                 Vector3 distanceCurrent = this->targetPosition_ - this->getControllableEntity()->getPosition();
                 Vector3 distanceNew = it->getPosition() - this->getControllableEntity()->getPosition();
-                if (!this->target_ || it->getPosition().squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceNew) / speed / distanceNew.length()) / (2 * math::pi))
-                        < this->targetPosition_.squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceCurrent) / speed / distanceCurrent.length()) / (2 * math::pi)) + rnd(-250, 250))
+                if (!this->target_ || it->getPosition().squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceNew) / speed / distanceNew.length()) / math::twoPi)
+                        < this->targetPosition_.squaredDistance(this->getControllableEntity()->getPosition()) * (1.5f + acos((this->getControllableEntity()->getOrientation() * WorldEntity::FRONT).dotProduct(distanceCurrent) / speed / distanceCurrent.length()) / math::twoPi) + rnd(-250, 250))
                 {
                     this->target_ = (*it);

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

@@ -544 +544 @@
             if (distance > 0.04f && distance <= 0.59f * arrowsSize_ / 2.0f )
             {
-                this->arrowsOverlay1_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / (2.0f * math::pi) * 360.0f));
+                this->arrowsOverlay1_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / math::twoPi * 360.0f));
                 this->arrowsOverlay1_->show();
             }
             else if (distance > 0.59f * arrowsSize_ / 2.0f && distance <= 0.77f * arrowsSize_ / 2.0f )
             {
-                this->arrowsOverlay2_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / (2.0f * math::pi) * 360.0f));
+                this->arrowsOverlay2_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / math::twoPi * 360.0f));
                 this->arrowsOverlay2_->show();
             }
             else if (distance > 0.77f * arrowsSize_ / 2.0f && distance <= arrowsSize_ / 2.0f)
             {
-                this->arrowsOverlay3_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / (2.0f * math::pi) * 360.0f));
+                this->arrowsOverlay3_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / math::twoPi * 360.0f));
                 this->arrowsOverlay3_->show();
             }
             else if (distance > arrowsSize_ / 2.0f)
             {
-                this->arrowsOverlay4_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / (2.0f * math::pi) * 360.0f));
+                this->arrowsOverlay4_->setRotation(Degree(-90 + -1.0f * atan2(static_cast<float>(this->currentPitch_)/2*-1, static_cast<float>(this->currentYaw_)/2*-1) / math::twoPi * 360.0f));
                 this->arrowsOverlay4_->show();
             }

code/trunk/src/orxonox/graphics/BlinkingBillboard.cc

@@ -79 +79 @@
         if (this->isActive())
         {
-            this->time_ += dt;
+            // Wrap around to avoid loosing floating point precision
+            this->time_ = std::fmod(this->time_ + dt, 1.0f / this->frequency_);
+            float value = sin((math::twoPi * this->time_ + this->phase_.valueRadians()) * this->frequency_);
             if (this->bQuadratic_)
-                this->setScale(this->amplitude_ * static_cast<float>(square(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
+                this->setScale(this->amplitude_ * square(value));
             else
-                this->setScale(this->amplitude_ * static_cast<float>(fabs(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
+                this->setScale(this->amplitude_ * std::abs(value));
         }
     }

code/trunk/src/orxonox/graphics/BlinkingBillboard.h

@@ -75 +75 @@
             Degree phase_;
             bool bQuadratic_;
-            long double time_;
+            float time_;
     };
 }

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

@@ -284 +284 @@
             angle = -angle;
         angle -= math::pi * static_cast<int>(angle / (math::pi));
-        if (angle > math::pi * 0.5)
+        if (angle > math::pi_2)
             angle = math::pi - angle;
 

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

@@ -42 +42 @@
 
         // Ambient sounds always fade in
-        this->setVolume(0);
+        this->setVolume(0.0f);
     }
 

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

@@ -30 +30 @@
 #include "SoundBuffer.h"
 
-#include <AL/alut.h>
+#include <alut.h>
 #include <vorbis/vorbisfile.h>
 

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

@@ -31 +31 @@
 #include "SoundManager.h"
 
-#include <AL/alut.h>
 #include <utility>
+#include <alut.h>
 #include <loki/ScopeGuard.h>
 
@@ -73 +73 @@
         this->bDestructorCalled_ = false;
 
+        // Clear error messages (might be problematic on some systems)
+        alGetError();
+        alutGetError();
+
         // See whether we even want to load
         bool bDisableSound_ = false;
@@ -78 +82 @@
         if (bDisableSound_)
             ThrowException(InitialisationAborted, "Sound: Not loading at all");
-
         if (!alutInitWithoutContext(NULL, NULL))
             ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
@@ -107 +110 @@
         this->device_ = alcOpenDevice(NULL);
         if (this->device_ == NULL)
-        {
-            COUT(1) << "Sound: Could not open sound device. Have you installed OpenAL?" << std::endl;
-#ifdef ORXONOX_PLATFORM_WINDOWS
-            COUT(1) << "Sound: Just getting the DLL with the dependencies is not enough for Windows (esp. Windows 7)!" << std::endl;
-#endif
             ThrowException(InitialisationFailed, "Sound Error: Could not open sound device.");
-        }
         Loki::ScopeGuard closeDeviceGuard = Loki::MakeGuard(&alcCloseDevice, this->device_);
 
@@ -327 +324 @@
         ALenum error = alGetError();
         if (error == AL_INVALID_VALUE)
+            // @TODO: Follow this constantly appearing, nerve-racking warning
             COUT(2) << "Sound: OpenAL: Invalid listener position" << std::endl;
     }

code/trunk/src/orxonox/sound/SoundManager.h

@@ -72 +72 @@
         // tolua_begin
         static SoundManager& getInstance() { return Singleton<SoundManager>::getInstance(); }
+        static bool exists() { return Singleton<SoundManager>::exists(); }
 
         std::string getDeviceName(unsigned int index) const

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

@@ -30 +30 @@
 #include "WorldSound.h"
 
-#include <AL/alut.h>
+#include <alut.h>
+
 #include "util/Math.h"
 #include "core/CoreIncludes.h"

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -36 +36 @@
 #include "network/NetworkFunction.h"
 
-#include "PawnManager.h"
 #include "infos/PlayerInfo.h"
 #include "controllers/Controller.h"
@@ -59 +58 @@
         RegisterObject(Pawn);
 
-        PawnManager::touch();
         this->bAlive_ = true;
         this->bReload_ = false;