Add textures to renderer

wg-perception · Feb 18, 2016 · e715d50 · e715d50
1 parent 4bdd53e
commit e715d50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/model.cpp b/src/model.cpp
@@ -185,7 +185,7 @@ Model::get_bounding_box(aiVector3D* min, aiVector3D* max) const
 }
 
 void
-Model::recursive_render(const struct aiScene *sc, const aiNode* nd) const
+Model::recursive_render(const struct aiScene *sc, const aiNode* nd, int j) const
 {
   int i;
   unsigned int n = 0, t;
@@ -199,10 +199,11 @@ Model::recursive_render(const struct aiScene *sc, const aiNode* nd) const
   // draw all meshes assigned to this node
   for (; n < nd->mNumMeshes; ++n)
   {
+    glEnable(GL_TEXTURE_2D);
     const struct aiMesh* mesh = sc->mMeshes[nd->mMeshes[n]];
 
     if (n < texturesAndPaths.size())
-      glBindTexture(GL_TEXTURE_2D, texturesAndPaths[n].hTexture);
+      glBindTexture(GL_TEXTURE_2D, texturesAndPaths[j].hTexture);
 
     apply_material(sc->mMaterials[mesh->mMaterialIndex]);
 
@@ -257,15 +258,15 @@ Model::recursive_render(const struct aiScene *sc, const aiNode* nd) const
 
   // draw all children
   for (n = 0; n < nd->mNumChildren; ++n)
-    recursive_render(sc, nd->mChildren[n]);
+    recursive_render(sc, nd->mChildren[n],n);
 
   glPopMatrix();
 }
 
 void
 Model::Draw() const
 {
-  recursive_render(scene, scene->mRootNode);
+  recursive_render(scene, scene->mRootNode, 0);
 }
 
 void

diff --git a/src/model.h b/src/model.h
@@ -60,7 +60,7 @@ class Model
   void
   recursiveTextureLoad(const struct aiScene *sc, const struct aiNode* nd);
   void
-  recursive_render(const struct aiScene *sc, const struct aiNode* nd) const;
+  recursive_render(const struct aiScene *sc, const struct aiNode* nd, const int j) const;
 
   void
   get_bounding_box_for_node(const aiNode* nd, aiVector3D* min, aiVector3D* max, aiMatrix4x4* trafo) const;