Changeset 1629 for code/branches/input/src/orxonox/tools

Timestamp:

Jun 27, 2008, 8:07:29 AM (17 years ago)

Author:

rgrieder

Message:

updated input branch

Location:

code/branches/input/src/orxonox/tools

Files:

• BillboardSet.cc (modified) (1 diff)
• BillboardSet.h (modified) (3 diffs)
• Mesh.h (modified) (1 diff)
• ParticleInterface.cc (copied) (copied from code/trunk/src/orxonox/tools/ParticleInterface.cc)
• ParticleInterface.h (copied) (copied from code/trunk/src/orxonox/tools/ParticleInterface.h)
• TextureGenerator.cc (copied) (copied from code/trunk/src/orxonox/tools/TextureGenerator.cc)
• TextureGenerator.h (copied) (copied from code/trunk/src/orxonox/tools/TextureGenerator.h)
• Timer.cc (modified) (2 diffs)
• Timer.h (modified) (4 diffs)
• WindowEventListener.cc (copied) (copied from code/trunk/src/orxonox/tools/WindowEventListener.cc)
• WindowEventListener.h (copied) (copied from code/trunk/src/orxonox/tools/WindowEventListener.h)

code/branches/input/src/orxonox/tools/BillboardSet.cc

@@ -46 +46 @@
     }
 
-    void BillboardSet::setBillboardSet(const std::string& file, const ColourValue& colour, int count, const Vector3& position)
+    void BillboardSet::setBillboardSet(const std::string& file, int count)
+    {
+        std::ostringstream name;
+        name << (BillboardSet::billboardSetCounter_s++);
+        this->billboardSet_ = GraphicsEngine::getSingleton().getSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_->createBillboard(Vector3::ZERO);
+        this->billboardSet_->setMaterialName(file);
+    }
+
+    void BillboardSet::setBillboardSet(const std::string& file, const ColourValue& colour, int count)
+    {
+        std::ostringstream name;
+        name << (BillboardSet::billboardSetCounter_s++);
+        this->billboardSet_ = GraphicsEngine::getSingleton().getSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_->createBillboard(Vector3::ZERO, colour);
+        this->billboardSet_->setMaterialName(file);
+    }
+
+    void BillboardSet::setBillboardSet(const std::string& file, const Vector3& position, int count)
+    {
+        std::ostringstream name;
+        name << (BillboardSet::billboardSetCounter_s++);
+        this->billboardSet_ = GraphicsEngine::getSingleton().getSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_->createBillboard(position);
+        this->billboardSet_->setMaterialName(file);
+    }
+
+    void BillboardSet::setBillboardSet(const std::string& file, const ColourValue& colour, const Vector3& position, int count)
     {
         std::ostringstream name;

code/branches/input/src/orxonox/tools/BillboardSet.h

@@ -33 +33 @@
 
 #include <string>
+#include <OgreBillboardSet.h>
 
-#include <OgreBillboardSet.h>
 #include "util/Math.h"
 
@@ -44 +44 @@
             BillboardSet();
             ~BillboardSet();
-            void setBillboardSet(const std::string& file, const ColourValue& colour = ColourValue(1.0, 1.0, 1.0), int count = 1, const Vector3& position = Vector3::ZERO);
+            void setBillboardSet(const std::string& file, int count = 1);
+            void setBillboardSet(const std::string& file, const ColourValue& colour, int count = 1);
+            void setBillboardSet(const std::string& file, const Vector3& position, int count = 1);
+            void setBillboardSet(const std::string& file, const ColourValue& colour, const Vector3& position, int count = 1);
 
             inline Ogre::BillboardSet* getBillboardSet()
@@ -51 +54 @@
             inline const std::string& getName() const
                 { return this->billboardSet_->getName(); }
+
+            inline void setVisible(bool visible)
+                { this->billboardSet_->setVisible(visible); }
+            inline bool getVisible() const
+                { return this->billboardSet_->getVisible(); }
 
         private:

code/branches/input/src/orxonox/tools/Mesh.h

@@ -51 +51 @@
                 { return this->entity_->getName(); }
 
+            inline void setVisible(bool visible)
+                { if (this->entity_) this->entity_->setVisible(visible); }
+            inline bool getVisible() const
+                { if (this->entity_) return this->entity_->getVisible(); else return false; }
+
         private:
             static unsigned int meshCounter_s;

code/branches/input/src/orxonox/tools/Timer.cc

@@ -102 +102 @@
     TimerBase::~TimerBase()
     {
-      if (this->executor_)
-          delete this->executor_;
+        this->deleteExecutor();
     }
 
@@ -112 +111 @@
     {
         (*this->executor_)();
+    }
+
+    /**
+        @brief Deletes the executor.
+    */
+    void TimerBase::deleteExecutor()
+    {
+      if (this->executor_)
+          delete this->executor_;
     }
 

code/branches/input/src/orxonox/tools/Timer.h

@@ -78 +78 @@
 
             void run() const;
+            void deleteExecutor();
 
             /** @brief Starts the Timer: Function-call after 'interval' seconds. */
@@ -94 +95 @@
             inline bool isActive() const
                 { return this->bActive_; }
+            /** @brief Returns the remaining time until the Timer calls the function. @return The remaining time */
+            inline float getRemainingTime() const
+                { return this->time_; }
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)
@@ -149 +153 @@
             void setTimer(float interval, bool bLoop, T* object, ExecutorMember<T>* executor)
             {
+                this->deleteExecutor();
+
                 this->interval_ = interval;
                 this->bLoop_ = bLoop;
@@ -185 +191 @@
             void setTimer(float interval, bool bLoop, ExecutorStatic* executor)
             {
+                this->deleteExecutor();
+
                 this->interval_ = interval;
                 this->bLoop_ = bLoop;