v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2647 from FabienPean/patch-1 

Update Sample_SimpleOpenGL.c
pull/2646/head^2
Kim Kulling 2019-09-13 18:51:52 +02:00 committed by GitHub
parent ee1ed502e7 cc7ba5288c
commit 446381e1ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/SimpleOpenGL/CMakeLists.txt
View File

@ -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
) )

4
samples/SimpleOpenGL/Sample_SimpleOpenGL.c
View File

@ -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;