nortega/ttt3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using assimp instead for model importing.

Browse Source
This commit is contained in:
Nicolás A. Ortega Froysa 2018-12-12 08:57:14 +01:00
parent 16d2bd6466
commit e2d9fe9189
2 changed files with 5 additions and 2553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -31,13 +31,14 @@ message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
# prefer newer versions of OpenGL # prefer newer versions of OpenGL
set(OpenGL_GL_PREFERENCE "GLVND") set(OpenGL_GL_PREFERENCE "GLVND")
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
find_package(GLUT REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(GLUT REQUIRED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_search_module(ASSIMP REQUIRED assimp)
pkg_search_module(SDL2 REQUIRED sdl2) pkg_search_module(SDL2 REQUIRED sdl2)
include_directories( include_directories(
SYSTEM "include/" SYSTEM ${ASSIMP_INCLUDE_DIRS}
SYSTEM ${SDL2_INCLUDE_DIRS}) SYSTEM ${SDL2_INCLUDE_DIRS})
set(SRCS set(SRCS
@ -66,6 +67,7 @@ add_executable(${TARGET_NAME}
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
OpenGL::OpenGL OpenGL::OpenGL
OpenGL::GLU OpenGL::GLU
${GLUT_LIBRARIES} ${ASSIMP_LIBRARIES}
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
${GLUT_LIBRARIES}
${SDL2_LIBRARIES}) ${SDL2_LIBRARIES})

2550
include/tiny_obj_loader.h
View File

File diff suppressed because it is too large Load Diff