Changeset 6412 for code/branches/pickup2/src/libraries/tools

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/libraries/tools/BillboardSet.cc (modified) (3 diffs)
• src/libraries/tools/CMakeLists.txt (modified) (1 diff)
• src/libraries/tools/Mesh.cc (modified) (2 diffs)
• src/libraries/tools/ParticleInterface.cc (modified) (2 diffs)
• src/libraries/tools/ResourceCollection.h (modified) (1 diff)
• src/libraries/tools/ResourceLocation.cc (modified) (1 diff)
• src/libraries/tools/Shader.cc (modified) (4 diffs)
• src/libraries/tools/TextureGenerator.cc (modified) (2 diffs)
• src/libraries/tools/Timer.cc (modified) (1 diff)
• src/libraries/tools/Timer.h (modified) (1 diff)
• src/libraries/tools/interfaces/TimeFactorListener.h (modified) (1 diff)
• src/libraries/tools/interfaces/ToolsInterfaceCompilation.cc (modified) (3 diffs)

code/branches/pickup2/src/libraries/tools/BillboardSet.cc

@@ -38 +38 @@
 #include "util/Convert.h"
 #include "util/Math.h"
-#include "util/StringUtils.h"
 #include "core/GameMode.h"
 
@@ -81 +80 @@
         catch (...)
         {
-            COUT(1) << "Error: Couln't load billboard \"" << file << "\"" << std::endl;
+            COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
             this->billboardSet_ = 0;
         }
@@ -104 +103 @@
         catch (...)
         {
-            COUT(1) << "Error: Couln't load billboard \"" << file << "\"" << std::endl;
+            COUT(1) << "Error: Couln't load billboard \"" << file << '"' << std::endl;
             this->billboardSet_ = 0;
         }

code/branches/pickup2/src/libraries/tools/CMakeLists.txt

@@ -23 +23 @@
   LINK_LIBRARIES
     core
+    network
   SOURCE_FILES ${TOOLS_SRC_FILES}
 )

code/branches/pickup2/src/libraries/tools/Mesh.cc

@@ -36 +36 @@
 
 #include "util/Convert.h"
-#include "util/StringUtils.h"
 #include "core/GameMode.h"
 
@@ -84 +83 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load mesh \"" << meshsource << "\"" << std::endl;
+                COUT(1) << "Error: Couln't load mesh \"" << meshsource << '"' << std::endl;
                 this->entity_ = 0;
             }

code/branches/pickup2/src/libraries/tools/ParticleInterface.cc

@@ -64 +64 @@
         this->bAllowedByLOD_ = true;
         this->speedFactor_ = 1.0f;
+
+        this->setDetailLevel(static_cast<unsigned int>(detaillevel));
+
+        this->setConfigValues();
 
         if (GameMode::showsGraphics())
@@ -74 +78 @@
             catch (...)
             {
-                COUT(1) << "Error: Couln't load particle system \"" << templateName << "\"" << std::endl;
+                COUT(1) << "Error: Couln't load particle system \"" << templateName << '"' << std::endl;
                 this->particleSystem_ = 0;
             }
         }
-
-        this->setDetailLevel(static_cast<unsigned int>(detaillevel));
     }
 

code/branches/pickup2/src/libraries/tools/ResourceCollection.h

@@ -38 +38 @@
 namespace orxonox
 {
-    class ResourceLocation;
-
     class _ToolsExport ResourceCollection : public BaseObject
     {

code/branches/pickup2/src/libraries/tools/ResourceLocation.cc

@@ -92 +92 @@
     {
         // Remove from Ogre paths
-        resourceGroup_.erase();
+        resourceGroup_.clear();
         try
         {

code/branches/pickup2/src/libraries/tools/Shader.cc

@@ -57 +57 @@
         this->bLoadCompositor_ = GameMode::showsGraphics();
         this->bViewportInitialized_ = false;
-        this->compositor_ = "";
-        this->oldcompositor_ = "";
 
         if (this->bLoadCompositor_ && Ogre::Root::getSingletonPtr())
@@ -79 +77 @@
     Shader::~Shader()
     {
-
-        if (this->bLoadCompositor_ && this->compositorInstance_)
+        if (this->compositorInstance_ && this->bLoadCompositor_)
         {
             Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
@@ -112 +109 @@
             Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport();
             assert(viewport);
-            if (this->oldcompositor_ != "")
+            if (!this->oldcompositor_.empty())
             {
                 Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->oldcompositor_);
                 this->compositorInstance_ = 0;
             }
-            if (this->compositor_ != "")
+            if (!this->compositor_.empty())
             {
                 this->compositorInstance_ = Ogre::CompositorManager::getSingleton().addCompositor(viewport, this->compositor_);
@@ -299 +296 @@
                         continue;
 
-                    if (pass_pointer->getFragmentProgramName() != "")
+                    if (!pass_pointer->getFragmentProgramName().empty())
                     {
                         Ogre::GpuProgramParameters* parameter_pointer = pass_pointer->getFragmentProgramParameters().get();

code/branches/pickup2/src/libraries/tools/TextureGenerator.cc

@@ -72 +72 @@
         if (it == colourMap.end())
         {
-            std::string materialName = textureName + "_Material_" + multi_cast<std::string>(materialCount_s++);
+            const std::string& materialName = textureName + "_Material_" + multi_cast<std::string>(materialCount_s++);
             Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialName, "General"));
             material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
@@ -82 +82 @@
         else
         {
-            return (*it).second;
+            return it->second;
         }
     }

code/branches/pickup2/src/libraries/tools/Timer.cc

@@ -112 +112 @@
         this->deleteExecutor();
     }
-    
+
     /**
         @brief Initializes the Timer

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

@@ -140 +140 @@
         private:
             void init();
-        
+
             Executor* executor_;  //!< The executor of the function that should be called when the time expires
 

code/branches/pickup2/src/libraries/tools/interfaces/TimeFactorListener.h

@@ -37 +37 @@
     class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
     {
-        friend class GSRoot;
-
         public:
             TimeFactorListener();
             virtual ~TimeFactorListener() {}
 
+            static void setTimeFactor( float factor );
+            static void setTimeFactorInternal( float factor );
+            static inline float getTimeFactor(){ return TimeFactorListener::timefactor_s; }
+
         protected:
             virtual void changedTimeFactor(float factor_new, float factor_old) {}
-            inline float getTimeFactor() const
-                { return TimeFactorListener::timefactor_s; }
 
         private:

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

@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
+#include "core/GameMode.h"
+#include "network/NetworkFunction.h"
 
 namespace orxonox
@@ -43 +45 @@
     // TimeFactorListener
     //----------------------------
+    registerStaticNetworkFunction( &TimeFactorListener::setTimeFactorInternal );
+
     float TimeFactorListener::timefactor_s = 1.0f;
 
@@ -48 +52 @@
     {
         RegisterRootObject(TimeFactorListener);
+    }
+
+    /*static*/ void TimeFactorListener::setTimeFactor( float factor )
+    {
+        if ( !GameMode::isStandalone() )
+            callStaticNetworkFunction( &TimeFactorListener::setTimeFactorInternal, CLIENTID_UNKNOWN, factor );
+        TimeFactorListener::setTimeFactorInternal(factor);
+    }
+
+    /*static*/ void TimeFactorListener::setTimeFactorInternal( float factor )
+    {
+        float oldFactor = TimeFactorListener::timefactor_s;
+        TimeFactorListener::timefactor_s = factor;
+        for (ObjectList<TimeFactorListener>::iterator it = ObjectList<TimeFactorListener>::begin(); it != ObjectList<TimeFactorListener>::end(); ++it)
+            it->changedTimeFactor(factor, oldFactor);
     }