removed Texture from Model (no longer needed)

diff --git a/Weave/Graphix/Model/IMesh.cpp b/Weave/Graphix/Model/IMesh.cpp
index 1ccc68756d4bbbf735e9442e1e2c0983959a93fe..81c0cec7467a6ee69690b395c5201d706667cc1b 100644 (file)
--- a/Weave/Graphix/Model/IMesh.cpp
+++ b/Weave/Graphix/Model/IMesh.cpp
@@ -9,7 +9,6 @@
 #include <array>\r
 \r
 #include "../Shader.h"\r
-#include "../Texture.h"\r
 #include "../../Message.h"\r
 \r
 #include "../Graphix.h"\r

diff --git a/Weave/Graphix/Model/IMetaMesh.cpp b/Weave/Graphix/Model/IMetaMesh.cpp
index 1b5fccc3a280bce9b6834bd05751411dd509cf1c..6cb7e0476f62191608454a1204433618004b0440 100644 (file)
--- a/Weave/Graphix/Model/IMetaMesh.cpp
+++ b/Weave/Graphix/Model/IMetaMesh.cpp
@@ -146,11 +146,11 @@ void IMetaMesh::unbindShader(Shader* _shader)
        }\r
 }\r
 \r
-void IMetaMesh::drawModel(Texture* _texture, const mat4& _modelMat) const\r
+void IMetaMesh::drawModel(const mat4& _modelMat) const\r
 {\r
        for (auto i = models.begin(); i != models.end(); ++i)\r
        {\r
-               i->first->drawModel(_texture, _modelMat* i->second);\r
+               i->first->drawModel(_modelMat* i->second);\r
        }\r
 }\r
 \r

diff --git a/Weave/Graphix/Model/IMetaMesh.h b/Weave/Graphix/Model/IMetaMesh.h
index e5cdce3214e80c6f44c775878810cb86ada32272..781fd298d4cea39c9e8726ae61ae1032b72a420e 100644 (file)
--- a/Weave/Graphix/Model/IMetaMesh.h
+++ b/Weave/Graphix/Model/IMetaMesh.h
@@ -8,7 +8,6 @@
 \r
 class IMesh;\r
 class Shader;\r
-class Texture;\r
 \r
 class IMetaMesh : public Model\r
 {\r
@@ -23,7 +22,7 @@ public:
        void unbindModel() override;\r
        void unbindShader(Shader* shader) override;\r
 \r
-       void drawModel(Texture* texture, const mat4& modelMat) const override;\r
+       void drawModel(const mat4& modelMat) const override;\r
 \r
        void drawBBox(const mat4& modelMat, const vec4& color = vec4(0.9f, 0.f, 0.f, 1.f)) const override;\r
 \r

diff --git a/Weave/Graphix/Model/Model.cpp b/Weave/Graphix/Model/Model.cpp
index 21f250936ee25b336373a9f6ee6c02df78bd580c..a9739aebaf956dc777fdc5a76a389614d5d0707d 100644 (file)
--- a/Weave/Graphix/Model/Model.cpp
+++ b/Weave/Graphix/Model/Model.cpp
@@ -4,7 +4,7 @@
 #include "../../Message.h"\r
 \r
 #include "../Shader.h"\r
-#include "../Texture.h"\r
+\r
 \r
 #include "../Graphix.h"\r
 \r
@@ -133,7 +133,7 @@ void Model::drawWire() const
        glBindVertexArray(0);\r
 }\r
 \r
-void Model::drawModel(Texture* _texture, const mat4& _modelMat) const\r
+void Model::drawModel(const mat4& _modelMat) const\r
 {\r
        useModel(_modelMat);\r
 \r
@@ -172,7 +172,7 @@ void Model::drawBBox(const mat4& _modelMat, const vec4& _color) const
        vec3 size = (max - min);\r
        vec3 center = (max + min) * .5f;\r
        Graphix::shader_BBox->useShader();\r
-       getBBoxModel()->drawModel(nullptr, _modelMat*translate(center)*glm::scale(size)); //\r
+       getBBoxModel()->drawModel(_modelMat*translate(center)*glm::scale(size)); //\r
 }\r
 \r
 //void Model::getBBcs(vec3& _center, vec3& _size) const\r

diff --git a/Weave/Graphix/Model/Model.h b/Weave/Graphix/Model/Model.h
index d8f2209f016450479d0c0e4fca3d0e122bfceecd..dba4ac86efa543f112737560f0a2207664e56227 100644 (file)
--- a/Weave/Graphix/Model/Model.h
+++ b/Weave/Graphix/Model/Model.h
@@ -7,7 +7,6 @@
 #include <btBulletDynamicsCommon.h>\r
 \r
 class Shader;\r
-class Texture;\r
 struct aiMesh;\r
 \r
 typedef unsigned int uint;\r
@@ -25,7 +24,7 @@ public:
        virtual void unbindShader(Shader* shader);\r
 \r
        /* Draws Model */\r
-       virtual void drawModel(Texture* texture, const mat4& modelMat) const;\r
+       virtual void drawModel(const mat4& modelMat) const;\r
        virtual void drawWire(const mat4& modelMat) const;\r
 \r
        /* Draws a BoundingBox around the Model */\r

diff --git a/Weave/Graphix/Model/SkyBox.cpp b/Weave/Graphix/Model/SkyBox.cpp
index d93256416f96ecb051f7a90b0b5c3b70dadb1405..b17a61e02389bc07bdee2389f2e8fa343fc539a1 100644 (file)
--- a/Weave/Graphix/Model/SkyBox.cpp
+++ b/Weave/Graphix/Model/SkyBox.cpp
@@ -25,7 +25,7 @@ SkyBox::~SkyBox()
 {\r
 }\r
 \r
-void SkyBox::drawModel(Texture* _texture, const mat4& _modelMat) const\r
+void SkyBox::drawModel(const mat4& _modelMat) const\r
 {\r
        //_shader->useShader();\r
        //GLint OldCullFaceMode;\r
@@ -35,7 +35,7 @@ void SkyBox::drawModel(Texture* _texture, const mat4& _modelMat) const
        //glCullFace(GL_FRONT);\r
        glDepthFunc(GL_LEQUAL);\r
        //glDisable(GL_DEPTH_TEST);\r
-       Model::drawModel(_texture, _modelMat);\r
+       Model::drawModel(_modelMat);\r
        //glEnable(GL_DEPTH_TEST);\r
        //glCullFace(OldCullFaceMode);\r
        glDepthFunc(OldDepthFuncMode);\r

diff --git a/Weave/Graphix/Model/SkyBox.h b/Weave/Graphix/Model/SkyBox.h
index 33715732c78f9aa22a2171a457c8efa120a7f4af..2ce87da536aa74c31962af70d7d3437715669621 100644 (file)
--- a/Weave/Graphix/Model/SkyBox.h
+++ b/Weave/Graphix/Model/SkyBox.h
@@ -10,7 +10,7 @@ public:
        SkyBox();\r
        ~SkyBox();\r
 \r
-       void drawModel(Texture* texture, const mat4& modelMat) const override;\r
+       void drawModel(const mat4& modelMat) const override;\r
 \r
        //uncommend following lines to use default Loaders\r
        //void useModelMat(const mat4& model, Shader* shader) const override;\r

diff --git a/Weave/Scene/SceneObject.cpp b/Weave/Scene/SceneObject.cpp
index dc0fc4ae7e1ad6d8e5eee99187153505bb51d4c1..c2ecd431a9263bd18fdcfd5fac08a208e4b7a511 100644 (file)
--- a/Weave/Scene/SceneObject.cpp
+++ b/Weave/Scene/SceneObject.cpp
@@ -233,12 +233,12 @@ void SceneObject::draw() const
        /* Draw Object*/
        shader->useShader();
        texture->useTexture();
-       model->drawModel(texture, modelMat);
+       model->drawModel(modelMat);
 
        if (Events::isKToggleActive(SDLK_F6) && collision != nullptr)
        {
                collision->drawBBox(modelMat);
-               //collision->drawWire(shader, modelMat);
+               //collision->drawWire(modelMat);
        }
 }