Changeset 2044 for code/branches/objecthierarchy

Timestamp:

Oct 29, 2008, 11:37:19 AM (16 years ago)

Author:

landauf

Message:

added some new graphical classes

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• OrxonoxPrereqs.h (modified) (1 diff)
• objects/Scene.cc (modified) (1 diff)
• objects/worldentities/Backlight.h (modified) (1 diff)
• objects/worldentities/Billboard.cc (added)
• objects/worldentities/Billboard.h (added)
• objects/worldentities/BlinkingBillboard.cc (added)
• objects/worldentities/BlinkingBillboard.h (added)
• objects/worldentities/Light.cc (added)
• objects/worldentities/Light.h (added)
• objects/worldentities/Model.h (modified) (1 diff)
• objects/worldentities/ParticleSpawner.h (modified) (1 diff)
• tools/BillboardSet.cc (modified) (4 diffs)
• tools/BillboardSet.h (modified) (2 diffs)
• tools/Light.cc (deleted)
• tools/Light.h (deleted)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -37 +37 @@
 
   tools/BillboardSet.cc
-  tools/Light.cc
   tools/Mesh.cc
   tools/ParticleInterface.cc
@@ -57 +56 @@
   objects/worldentities/ControllableEntity.cc
   objects/worldentities/Model.cc
+  objects/worldentities/Billboard.cc
+  objects/worldentities/BlinkingBillboard.cc
+  objects/worldentities/Light.cc
   objects/worldentities/Camera.cc
   objects/worldentities/CameraPosition.cc

code/branches/objecthierarchy/src/orxonox/OrxonoxPrereqs.h

@@ -94 +94 @@
     class Model;
     class Billboard;
+    class BlinkingBillboard;
     class Light;
-    class DirectionalLight;
 
     class Camera;

code/branches/objecthierarchy/src/orxonox/objects/Scene.cc

@@ -74 +74 @@
         {
             Ogre::Light* light;
-            light = this->sceneManager_->createLight("Light0");
+            light = this->sceneManager_->createLight("Light-1");
             light->setType(Ogre::Light::LT_DIRECTIONAL);
             light->setDiffuseColour(ColourValue(1.0, 0.9, 0.6, 1.0));
             light->setSpecularColour(ColourValue(1.0, 0.9, 0.6, 1.0));
-            light->setDirection(1, -0.2, 0.2);
+            light->setDirection(1, -0.3, 0.3);
         }
         // test test test

code/branches/objecthierarchy/src/orxonox/objects/worldentities/Backlight.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "WorldEntity.h"
+#include "PositionableEntity.h"
 #include "tools/BillboardSet.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Backlight : public WorldEntity
+    class _OrxonoxExport Backlight : public PositionableEntity
     {
         public:

code/branches/objecthierarchy/src/orxonox/objects/worldentities/Model.h

@@ -47 +47 @@
             virtual void changedVisibility();
 
+            inline const Mesh& getMesh() const
+                { return this->mesh_; }
+
             inline void setMeshSource(const std::string& meshname)
                 { this->meshSrc_ = meshname; this->changedMesh(); }
             inline const std::string& getMeshSource() const
                 { return this->meshSrc_; }
-            inline const Mesh& getMesh() const
-                { return this->mesh_; }
 
             inline void setCastShadows(bool bCastShadows)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ParticleSpawner.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "WorldEntity.h"
+#include "PositionableEntity.h"
 #include "tools/Timer.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleSpawner : public WorldEntity
+    class _OrxonoxExport ParticleSpawner : public PositionableEntity
     {
         public:

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

@@ -32 +32 @@
 #include <sstream>
 #include <cassert>
+
 #include <OgreSceneManager.h>
+#include <OgreBillboard.h>
 
-#include "util/Math.h"
+#include "util/Convert.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -45 +48 @@
     }
 
+    BillboardSet::~BillboardSet()
+    {
+        this->destroyBillboardSet();
+    }
+
     void BillboardSet::setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, int count)
     {
-        assert(scenemanager);
-
-        std::ostringstream name;
-        name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + name.str(), count);
-        this->billboardSet_->createBillboard(Vector3::ZERO);
-        this->billboardSet_->setMaterialName(file);
-
-        this->scenemanager_ = scenemanager;
+        this->setBillboardSet(scenemanager, file, Vector3::ZERO, count);
     }
 
     void BillboardSet::setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, const ColourValue& colour, int count)
     {
-        assert(scenemanager);
-
-        std::ostringstream name;
-        name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + name.str(), count);
-        this->billboardSet_->createBillboard(Vector3::ZERO, colour);
-        this->billboardSet_->setMaterialName(file);
-
-        this->scenemanager_ = scenemanager;
+        this->setBillboardSet(scenemanager, file, colour, Vector3::ZERO, count);
     }
 
@@ -74 +66 @@
     {
         assert(scenemanager);
+        this->destroyBillboardSet();
 
-        std::ostringstream name;
-        name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + name.str(), count);
-        this->billboardSet_->createBillboard(position);
-        this->billboardSet_->setMaterialName(file);
+        try
+        {
+            this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + convertToString(BillboardSet::billboardSetCounter_s++), count);
+            this->billboardSet_->createBillboard(position);
+            this->billboardSet_->setMaterialName(file);
+        }
+        catch (...)
+        {
+            COUT(1) << "Error: Couln't load billboard \"" << file << "\"" << std::endl;
+        }
 
         this->scenemanager_ = scenemanager;
@@ -87 +85 @@
     {
         assert(scenemanager);
+        this->destroyBillboardSet();
 
-        std::ostringstream name;
-        name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + name.str(), count);
-        this->billboardSet_->createBillboard(position, colour);
-        this->billboardSet_->setMaterialName(file);
+        try
+        {
+            this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + convertToString(BillboardSet::billboardSetCounter_s++), count);
+            this->billboardSet_->createBillboard(position, colour);
+            this->billboardSet_->setMaterialName(file);
+        }
+        catch (...)
+        {
+            COUT(1) << "Error: Couln't load billboard \"" << file << "\"" << std::endl;
+        }
 
         this->scenemanager_ = scenemanager;
     }
 
-    BillboardSet::~BillboardSet()
+    void BillboardSet::destroyBillboardSet()
     {
         if (this->billboardSet_ && this->scenemanager_)
             this->scenemanager_->destroyBillboardSet(this->billboardSet_);
     }
+
+    const std::string& BillboardSet::getName() const
+    {
+        if (this->billboardSet_)
+            return this->billboardSet_->getName();
+        else
+            return BLANKSTRING;
+    }
+
+    void BillboardSet::setVisible(bool visible)
+    {
+        if (this->billboardSet_)
+            this->billboardSet_->setVisible(visible);
+    }
+
+    bool BillboardSet::getVisible() const
+    {
+        if (this->billboardSet_)
+            return this->billboardSet_->getVisible();
+        else
+            return false;
+    }
+
+    void BillboardSet::setColour(const ColourValue& colour)
+    {
+        if (this->billboardSet_)
+        {
+            for (int i = 0; i < this->billboardSet_->getNumBillboards(); ++i)
+                this->billboardSet_->getBillboard(i)->setColour(colour);
+        }
+    }
+
+    const ColourValue& BillboardSet::getColour() const
+    {
+        if (this->billboardSet_ && this->billboardSet_->getNumBillboards() > 0)
+        {
+            return this->billboardSet_->getBillboard(0)->getColour();
+        }
+        else
+            return ColourValue::White;
+    }
+
+    void BillboardSet::setMaterial(const std::string& material)
+    {
+        if (this->billboardSet_)
+            this->billboardSet_->setMaterialName(material);
+    }
+
+    const std::string& BillboardSet::getMaterial() const
+    {
+        if (this->billboardSet_)
+            return this->billboardSet_->getMaterialName();
+        else
+            return BLANKSTRING;
+    }
 }

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

@@ -44 +44 @@
             BillboardSet();
             ~BillboardSet();
+
             void setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, int count = 1);
             void setBillboardSet(Ogre::SceneManager* scenemanager, const std::string& file, const ColourValue& colour, int count = 1);
@@ -52 +53 @@
                 { return this->billboardSet_; }
 
-            inline const std::string& getName() const
-                { return this->billboardSet_->getName(); }
+            const std::string& getName() const;
 
-            inline void setVisible(bool visible)
-                { this->billboardSet_->setVisible(visible); }
-            inline bool getVisible() const
-                { return this->billboardSet_->getVisible(); }
+            void setVisible(bool visible);
+            bool getVisible() const;
+
+            void setColour(const ColourValue& colour);
+            const ColourValue& getColour() const;
+
+            void setMaterial(const std::string& material);
+            const std::string& getMaterial() const;
 
         private:
+            void destroyBillboardSet();
+
             static unsigned int billboardSetCounter_s;
             Ogre::BillboardSet* billboardSet_;