Remove ambiguity in render.*

diff --git a/render.c b/render.c
index c10f8f1f03a85b6faf56f69c468bb18c66255e95..bceaec3f4497855df5cd6e729f798bee282961e7 100644 (file)
--- a/render.c
+++ b/render.c
@@ -21,7 +21,7 @@ void renderScene() {
        glEnable(GL_LIGHTING);
        
        glEnable(GL_LIGHT0);
-       drawModelRecursive(levelScene, levelScene->mRootNode);
+       drawSceneRecursive(levelScene, levelScene->mRootNode);
        glDisable(GL_LIGHT0);
        
        glFlush();
@@ -57,13 +57,13 @@ void drawAxes() {
        glEnd();
 }
 
-void drawModelRecursive(const AiScene* model, const AiNode* node) {
-       if (((*model).mFlags & AI_SCENE_FLAGS_INCOMPLETE) == AI_SCENE_FLAGS_INCOMPLETE) {
+void drawSceneRecursive(const AiScene* scene, const AiNode* node) {
+       if (((*scene).mFlags & AI_SCENE_FLAGS_INCOMPLETE) == AI_SCENE_FLAGS_INCOMPLETE) {
                return;
        }
        
        for (int i = 0; i < (*node).mNumMeshes; ++i) {
-               const AiMesh* mesh = (*model).mMeshes[(*node).mMeshes[i]];
+               const AiMesh* mesh = (*scene).mMeshes[(*node).mMeshes[i]];
                for (int k = 0; k < (*mesh).mNumFaces; ++k) {
                        const AiFace face = (*mesh).mFaces[k];
                        
@@ -87,6 +87,6 @@ void drawModelRecursive(const AiScene* model, const AiNode* node) {
        }
        
        for (int i = 0; i < (*node).mNumChildren; ++i) {
-               drawModelRecursive(model, (*node).mChildren[i]);
+               drawSceneRecursive(scene, (*node).mChildren[i]);
        }
 }

diff --git a/render.h b/render.h
index 6d87ffca34d12212ee02c4596f442bbd034729ea..c65e4912dc8be5d8ce91fedbb2fba741af307a1b 100644 (file)
--- a/render.h
+++ b/render.h
@@ -1,10 +1,10 @@
 #ifndef RENDER_H_
 #define RENDER_H_
 
-const struct aiScene* model; // TODO remove
+#include "assimp_types.h"
 
 void renderScene();
 void drawAxes();
-void drawModelRecursive(const struct aiScene* model, const struct aiNode* node);
+void drawSceneRecursive(const AiScene* scene, const AiNode* node);
 
 #endif