fixed transform dataType

moved modelMat to IMesh

diff --git a/Weave/Graphix/Model/IMesh.cpp b/Weave/Graphix/Model/IMesh.cpp
index ef7bb2f7e2cb670a886b2d6de3b95dca67a1436a..e7fabee8212dbc24da981a46c72ce4991bbfadc7 100644 (file)
--- a/Weave/Graphix/Model/IMesh.cpp
+++ b/Weave/Graphix/Model/IMesh.cpp
@@ -32,7 +32,7 @@ IMesh::IMesh(const string& _modelpath, uint _mindex)
 
 }
 
-IMesh::IMesh(const aiMesh* _mesh, mat4* transformation)
+IMesh::IMesh(const aiMesh* _mesh, const mat4& _transformation) : modelMat(_transformation)
 {
 
        float *vertex = nullptr, *normals = nullptr, *uvs = nullptr;
@@ -40,8 +40,6 @@ IMesh::IMesh(const aiMesh* _mesh, mat4* transformation)
 
        import(_mesh, numvertices, numfaces, vertex, uvs, normals, index);
 
-       modelMat = *transformation;
-
        updateBB(vertex);
 
        genBuffer(vertexBuffer, numvertices * 3 * sizeof(float), (void*)vertex);

diff --git a/Weave/Graphix/Model/IMesh.h b/Weave/Graphix/Model/IMesh.h
index bf63286f5cef1002d9d5661df8bded79fb2c230b..51117f96f87e40f0eeed61b6b3dfc7c74f5dfa16 100644 (file)
--- a/Weave/Graphix/Model/IMesh.h
+++ b/Weave/Graphix/Model/IMesh.h
@@ -15,7 +15,7 @@ class IMesh : public Model
 {
 public:
        IMesh(const string& modelpath, uint index=0);
-       IMesh(const aiMesh* mesh, mat4* transformation);
+       IMesh(const aiMesh* mesh, const mat4& transformation);
 
        virtual ~IMesh();
 
@@ -27,6 +27,8 @@ public:
 
 protected:
 
+       mat4 modelMat;
+
        // Mesh Speichern?
        bool import(const string& modelpath, uint& numvertices, uint& numfaces, float*& vertex, float*& uvs, float*& normals, uint*& index , uint mindex = 0) const;
        bool import(const aiMesh* mesh, uint& numvertices, uint& numfaces, float*& vertex, float*& uvs, float*& normals, uint*& index) const;

diff --git a/Weave/Graphix/Model/IMetaMesh.cpp b/Weave/Graphix/Model/IMetaMesh.cpp
index 9f4c84acd4c3348ae8fb2c52668430a2cb752cff..921189ae52a773bec04f55264b35148cea3713da 100644 (file)
--- a/Weave/Graphix/Model/IMetaMesh.cpp
+++ b/Weave/Graphix/Model/IMetaMesh.cpp
@@ -32,7 +32,7 @@ IMetaMesh::IMetaMesh(const string& _modelpath)
 
                tmpModelMat = mat4(aimat->a1, aimat->c1, -aimat->b1, aimat->d1, aimat->a2, aimat->c2, -aimat->b2, aimat->d2, aimat->a3, aimat->c3, -aimat->b3, aimat->d3, aimat->a4, aimat->c4, -aimat->b4, aimat->d4);
 
-               tmpIMesh = new IMesh(scene->mMeshes[0], &tmpModelMat);
+               tmpIMesh = new IMesh(scene->mMeshes[0], tmpModelMat);
                models.push_back(tmpIMesh);
                tmpIMesh->getBBmm(BBmin, BBmax);
 
@@ -42,7 +42,7 @@ IMetaMesh::IMetaMesh(const string& _modelpath)
 
                        tmpModelMat = mat4(aimat->a1, aimat->c1, -aimat->b1, aimat->d1, aimat->a2, aimat->c2, -aimat->b2, aimat->d2, aimat->a3, aimat->c3, -aimat->b3, aimat->d3, aimat->a4, aimat->c4, -aimat->b4, aimat->d4);
 
-                       tmpIMesh = new IMesh(scene->mMeshes[i], &tmpModelMat);
+                       tmpIMesh = new IMesh(scene->mMeshes[i], tmpModelMat);
                        models.push_back(tmpIMesh);
                        tmpIMesh->getBBmm(tmpMin, tmpMax);
                        for (auto j = 0; j < 3; ++j)

diff --git a/Weave/Graphix/Model/Model.h b/Weave/Graphix/Model/Model.h
index ea2a4a8d2ebedb343d8a0cc8e2bcae5a3c29731b..ea5645e47a82dda31fd627eb787faa16bdf53a4a 100644 (file)
--- a/Weave/Graphix/Model/Model.h
+++ b/Weave/Graphix/Model/Model.h
@@ -29,7 +29,6 @@ public:
 protected:
        uint numvertices, numfaces;
        uint vertexBuffer, indexBuffer, normalBuffer, uvBuffer;
-       mat4 modelMat;
 
        std::unordered_map<uint, uint> shader_map;