GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-14 18:25:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'draco' of https://github.com/abwood/tinygltf into draco

Browse Source
This commit is contained in:
Alex Wood 2019-01-24 15:40:28 -05:00
commit df39e04e7b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/glview/CMakeLists.txt
View File

@ -1,8 +1,10 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.5)
project(glview) project(glview)
set ( CMAKE_PREFIX_PATH cmake ) set ( CMAKE_PREFIX_PATH cmake )
set ( DRACO_DIR "" CACHE STRING "Path to draco" )
find_package ( GLEW REQUIRED ) find_package ( GLEW REQUIRED )
find_package ( GLFW3 REQUIRED ) find_package ( GLFW3 REQUIRED )
find_package ( OpenGL REQUIRED ) find_package ( OpenGL REQUIRED )
@ -21,6 +23,12 @@ endif (APPLE)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
if (${DRACO_DIR} STREQUAL "")
else ()
add_definitions(-DTINYGLTF_USE_DRACO)
include_directories(${DRACO_DIR}/include)
endif ()
include_directories( include_directories(
../../ ../../
../common ../common

5
tiny_gltf.h
View File

@ -26,6 +26,7 @@
// THE SOFTWARE. // THE SOFTWARE.
// Version: // Version:
// - v2.1.0 Add draco compression.
// - v2.0.1 Add comparsion feature(Thanks to @Selmar). // - v2.0.1 Add comparsion feature(Thanks to @Selmar).
// - v2.0.0 glTF 2.0!. // - v2.0.0 glTF 2.0!.
// //
@ -1077,6 +1078,10 @@ class TinyGLTF {
#include "stb_image_write.h" #include "stb_image_write.h"
#endif #endif
#ifdef TINYGLTF_USE_DRACO
#include "draco/compression/decode.h"
#endif // TINYGLTF_USE_DRACO
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif