Changeset 1993 for code/branches/objecthierarchy/src/orxonox/tools

Timestamp:

Oct 22, 2008, 5:25:01 AM (16 years ago)

Author:

landauf

Message:

added several new classes

Location:

code/branches/objecthierarchy/src/orxonox/tools

Files:

• Mesh.cc (modified) (3 diffs)
• Mesh.h (modified) (2 diffs)

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

@@ -32 +32 @@
 #include <sstream>
 #include <OgreSceneManager.h>
+
 #include "core/Core.h"
 #include "GraphicsEngine.h"
+#include "util/Convert.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -39 +42 @@
     unsigned int Mesh::meshCounter_s = 0;
 
-    Mesh::Mesh() :
-      entity_(0)
+    Mesh::Mesh()
     {
-    }
-
-    void Mesh::setMesh(const std::string& file)
-    {
-        std::ostringstream name;
-        name << (Mesh::meshCounter_s++);
-        if (Core::showsGraphics())
-            this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + name.str(), file);
+        this->entity_ = 0;
     }
 
@@ -57 +52 @@
             GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
     }
+
+    void Mesh::setMeshSource(const std::string& meshsource)
+    {
+        if (Core::showsGraphics())
+        {
+            if (this->entity_)
+                GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
+            this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + convertToString(Mesh::meshCounter_s++), meshsource);
+        }
+    }
+
+    const std::string& Mesh::getName() const
+    {
+        if (this->entity_)
+            return this->entity_->getName();
+        else
+            return blankString;
+    }
+
+    void Mesh::setVisible(bool bVisible)
+    {
+        if (this->entity_)
+            this->entity_->setVisible(bVisible);
+    }
+
+    bool Mesh::isVisible() const
+    {
+        if (this->entity_)
+            return this->entity_->getVisible();
+        else
+            return false;
+    }
 }

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

@@ -33 +33 @@
 
 #include <string>
-
 #include <OgreEntity.h>
 
@@ -43 +42 @@
             Mesh();
             ~Mesh();
-            void setMesh(const std::string& file);
+
+            void setMeshSource(const std::string& file);
 
             inline Ogre::Entity* getEntity()
                 { return this->entity_; }
 
-            inline const std::string& getName() const
-                { return this->entity_->getName(); }
+            const std::string& getName() const;
 
-            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; }
+            void setVisible(bool bVisible);
+            bool isVisible() const;
 
         private: