From: Peter Schaefer Date: Wed, 30 Mar 2016 11:12:01 +0000 (+0200) Subject: some fixes X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=ee2514c73eb7d7873b90ea24a3fcbb9b2ca7e5a6;p=cgue_weave.git some fixes BBox unsichtbar???? --- diff --git a/.gitignore b/.gitignore index 380053f..4f15c4c 100644 --- 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 6d6646e..0833b7a 100644 --- a/Weave/Graphix/Model/BBox.cpp +++ b/Weave/Graphix/Model/BBox.cpp @@ -12,7 +12,7 @@ BBox::BBox() //import("skybox.dae", numvertices, numfaces, vertex, uvs, normals, index, 0); - bindModel(); + //bindModel(); bt_init(); name = "BBox"; diff --git a/Weave/Graphix/Model/Model.cpp b/Weave/Graphix/Model/Model.cpp index 589ede7..be721f2 100644 --- a/Weave/Graphix/Model/Model.cpp +++ b/Weave/Graphix/Model/Model.cpp @@ -259,6 +259,7 @@ Model* Model::getBBoxModel() if (BoundingBox == nullptr) { BoundingBox = new BBox(); + BoundingBox->bindModel(); BoundingBox->bindShader(Graphix::shader_BBox); } return BoundingBox; @@ -269,6 +270,7 @@ Model* Model::getSkyBoxModel() if (SkyBoxModel == nullptr) { SkyBoxModel = new SkyBox(); + SkyBoxModel->bindModel(); //SkyBoxModel->bindShader(Graphix::shader_); } return SkyBoxModel; diff --git a/Weave/Graphix/Model/SkyBox.cpp b/Weave/Graphix/Model/SkyBox.cpp index 723a684..9a9f6cd 100644 --- a/Weave/Graphix/Model/SkyBox.cpp +++ b/Weave/Graphix/Model/SkyBox.cpp @@ -14,6 +14,7 @@ SkyBox::SkyBox() name = "SkyBox"; delete normals; + normals = nullptr; bindModel();