浏览代码

Merge pull request #2647 from FabienPean/patch-1

Update Sample_SimpleOpenGL.c
Kim Kulling 6 年之前
父节点
当前提交
446381e1ca
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      samples/SimpleOpenGL/CMakeLists.txt
  2. 2 2
      samples/SimpleOpenGL/Sample_SimpleOpenGL.c

+ 1 - 0
samples/SimpleOpenGL/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(
   ${Assimp_SOURCE_DIR}/include
   ${Assimp_SOURCE_DIR}/include
   ${Assimp_SOURCE_DIR}/code
   ${Assimp_SOURCE_DIR}/code
   ${OPENGL_INCLUDE_DIR}
   ${OPENGL_INCLUDE_DIR}
+  ${GLUT_INCLUDE_DIR}
   ${Assimp_SOURCE_DIR}/samples/freeglut/include
   ${Assimp_SOURCE_DIR}/samples/freeglut/include
 )
 )
 
 

+ 2 - 2
samples/SimpleOpenGL/Sample_SimpleOpenGL.c

@@ -49,7 +49,7 @@ void reshape(int width, int height)
 }
 }
 
 
 /* ---------------------------------------------------------------------------- */
 /* ---------------------------------------------------------------------------- */
-void get_bounding_box_for_node (const a<C_STRUCT iNode* nd,
+void get_bounding_box_for_node (const C_STRUCT aiNode* nd,
 	C_STRUCT aiVector3D* min,
 	C_STRUCT aiVector3D* min,
 	C_STRUCT aiVector3D* max,
 	C_STRUCT aiVector3D* max,
 	C_STRUCT aiMatrix4x4* trafo
 	C_STRUCT aiMatrix4x4* trafo
@@ -86,7 +86,7 @@ void get_bounding_box_for_node (const a<C_STRUCT iNode* nd,
 /* ---------------------------------------------------------------------------- */
 /* ---------------------------------------------------------------------------- */
 void get_bounding_box(C_STRUCT aiVector3D* min, C_STRUCT aiVector3D* max)
 void get_bounding_box(C_STRUCT aiVector3D* min, C_STRUCT aiVector3D* max)
 {
 {
-	aiMatrix4x4 trafo;
+	C_STRUCT aiMatrix4x4 trafo;
 	aiIdentityMatrix4(&trafo);
 	aiIdentityMatrix4(&trafo);
 
 
 	min->x = min->y = min->z =  1e10f;
 	min->x = min->y = min->z =  1e10f;