some fixes

BBox unsichtbar????

diff --git a/.gitignore b/.gitignore
index 380053fc714b4f9772ef74b3aabbccade4048b13..4f15c4c2a5cb74e512b8e69018f42ef4522e118b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.opensdf
 build-*
 *.opendb
+*.db
 
 *.exe
 *.pdb

diff --git a/Weave/Graphix/Model/BBox.cpp b/Weave/Graphix/Model/BBox.cpp
index 6d6646ee99949493320aae8aff59a8626c3f16f6..0833b7a5c0a458a0d72f91becf82a386a40458f6 100644 (file)
--- a/Weave/Graphix/Model/BBox.cpp
+++ b/Weave/Graphix/Model/BBox.cpp
@@ -12,7 +12,7 @@ BBox::BBox()
 \r
        //import("skybox.dae", numvertices, numfaces, vertex, uvs, normals, index, 0);\r
 \r
-       bindModel();\r
+       //bindModel();\r
        bt_init();\r
 \r
        name = "BBox";\r

diff --git a/Weave/Graphix/Model/Model.cpp b/Weave/Graphix/Model/Model.cpp
index 589ede7a42daa4a780e42e06200dc616604269d1..be721f213f711f9706a3d4a55c9929a58f3b4c1b 100644 (file)
--- a/Weave/Graphix/Model/Model.cpp
+++ b/Weave/Graphix/Model/Model.cpp
@@ -259,6 +259,7 @@ Model* Model::getBBoxModel()
        if (BoundingBox == nullptr)\r
        {\r
                BoundingBox = new BBox();\r
+               BoundingBox->bindModel();\r
                BoundingBox->bindShader(Graphix::shader_BBox);\r
        }\r
        return BoundingBox;\r
@@ -269,6 +270,7 @@ Model* Model::getSkyBoxModel()
        if (SkyBoxModel == nullptr)\r
        {\r
                SkyBoxModel = new SkyBox();\r
+               SkyBoxModel->bindModel();\r
                //SkyBoxModel->bindShader(Graphix::shader_);\r
        }\r
        return SkyBoxModel;\r

diff --git a/Weave/Graphix/Model/SkyBox.cpp b/Weave/Graphix/Model/SkyBox.cpp
index 723a684ae8b0a051b1bb1af62ccf3c3081eb3441..9a9f6cdea24a38d5652e10d5ccd209a8313434ab 100644 (file)
--- a/Weave/Graphix/Model/SkyBox.cpp
+++ b/Weave/Graphix/Model/SkyBox.cpp
@@ -14,6 +14,7 @@ SkyBox::SkyBox()
        name = "SkyBox";\r
 \r
        delete normals;\r
+       normals = nullptr;\r
 \r
        bindModel();\r
 \r