From 2657d6f254e8b0b4d1a23e9ed816fc8a87eafe6c Mon Sep 17 00:00:00 2001 From: Michal Marcinkowski Date: Mon, 23 Feb 2015 17:24:03 -0500 Subject: [PATCH] changes to openspace-data, NH now loaded as separate modules --- openspace-data | 2 +- src/rendering/model/renderablemodel.cpp | 1 - src/rendering/model/wavefrontgeometry.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openspace-data b/openspace-data index e118d32086..fa3087a76d 160000 --- a/openspace-data +++ b/openspace-data @@ -1 +1 @@ -Subproject commit e118d3208666caccf84938289b3488c835b8117d +Subproject commit fa3087a76d9450948080be4d93da8ab7d96b6b0c diff --git a/src/rendering/model/renderablemodel.cpp b/src/rendering/model/renderablemodel.cpp index 8168057c62..f5e3a12351 100644 --- a/src/rendering/model/renderablemodel.cpp +++ b/src/rendering/model/renderablemodel.cpp @@ -153,7 +153,6 @@ void RenderableModel::render(const RenderData& data) _programObject->setUniform("_performShading", false); - // Bind texture ghoul::opengl::TextureUnit unit; unit.activate(); diff --git a/src/rendering/model/wavefrontgeometry.cpp b/src/rendering/model/wavefrontgeometry.cpp index 1081af7200..967886d150 100644 --- a/src/rendering/model/wavefrontgeometry.cpp +++ b/src/rendering/model/wavefrontgeometry.cpp @@ -96,7 +96,7 @@ void WavefrontGeometry::loadObj(const char *filename){ //copy indices for (int f = 0; f < shapes[0].mesh.indices.size(); f++) { - _iarray[f] = shapes[0].mesh.indices[f]; + _iarray[f] = f;// shapes[0].mesh.indices[f]; } //shapes[0].mesh.texcoords.resize(2 * _isize);