BBoxen sollten funktioniern

diff --git a/Weave/Graphix/Model/IMetaMesh.cpp b/Weave/Graphix/Model/IMetaMesh.cpp
index 69d7043413672aa2857cfe0a74b8408b1f574a75..4ec9792d4b763b25297b1d3da00808ccdb21b9d9 100644 (file)
--- a/Weave/Graphix/Model/IMetaMesh.cpp
+++ b/Weave/Graphix/Model/IMetaMesh.cpp
@@ -76,13 +76,16 @@ void IMetaMesh::drawModel(Shader* _shader, Texture* _texture, const mat4& _model
 }
 
 
-//void IMetaMesh::drawBBox(Shader* _shader, const mat4 & _modelMat) const
-//{
-//     Model::drawBBox(_shader, _modelMat);
-//     for (auto i = models.begin(); i != models.end(); ++i)
-//     {
-//             (*i)->drawBBox(_shader, _modelMat);
-//     }
-//
-//}
+void IMetaMesh::drawBBox(Shader* _shader, const mat4& _modelMat) const
+{
+       Model::drawBBox(_shader, _modelMat);
+       if (models.size() > 1)
+       {
+               for (auto i = models.begin(); i != models.end(); ++i)
+               {
+                       (*i)->drawBBox(_shader, _modelMat);
+               }
+       }
+
+}
 

diff --git a/Weave/Graphix/Model/IMetaMesh.h b/Weave/Graphix/Model/IMetaMesh.h
index bc68bb6a4b0ec1ccae235d2fdbbef73d281c9b2f..0f20711233f7efbd4cdb5dd919b5971429731267 100644 (file)
--- a/Weave/Graphix/Model/IMetaMesh.h
+++ b/Weave/Graphix/Model/IMetaMesh.h
@@ -22,7 +22,7 @@ public:
 
        void drawModel(Shader* shader, Texture* texture, const mat4& modelMat) const;
 
-       //void drawBBox(Shader* shader, const mat4 & modelMat) const;
+       void drawBBox(Shader* shader, const mat4& modelMat) const;
 
 protected:
        std::list<IMesh*> models;

diff --git a/Weave/Graphix/Model/Model.h b/Weave/Graphix/Model/Model.h
index 574a34736e824e30c9fc2a0e9e0680d0b8c260b6..ea5645e47a82dda31fd627eb787faa16bdf53a4a 100644 (file)
--- a/Weave/Graphix/Model/Model.h
+++ b/Weave/Graphix/Model/Model.h
@@ -21,7 +21,7 @@ public:
        virtual void drawModel(Shader* shader, Texture* texture, const mat4& modelMat) const;
 
        /* Draws a BoundingBox around the Model */
-       virtual void drawBBox(Shader* shader,const mat4 & modelMat) const;
+       virtual void drawBBox(Shader* shader, const mat4& modelMat) const;
 
        void getBBmm(vec3& min, vec3& max) const;
        void getBBsp(vec3& size, vec3& pos) const;