Merge remote-tracking branch 'gitlab/master'

code4game · Jul 31, 2019 · 761bc74 · 761bc74
2 parents 1bbb330 + ec59691
commit 761bc74
Show file tree

Hide file tree

Showing 130 changed files with 22,475 additions and 29,913 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,11 +1,12 @@
-version: 0.1.4.{build}
+version: 0.1.6.{build}
 
 build:
   verbosity: minimal
 
 image:
 - Visual Studio 2015
-#- Visual Studio 2017
+- Visual Studio 2017
+- Visual Studio 2019
 
 configuration:
 #- Debug
@@ -15,7 +16,7 @@ platform:
 - x86
 - x64
 - ARM
-#- Any CPU
+- Any CPU
 
 branches:
   only:
@@ -31,6 +32,10 @@ init:
 - if "%PLATFORM%" equ "x64" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2017" (set TARGET_VSENV=VS15_WIN64))
 - if "%PLATFORM%" equ "ARM" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2017" (set TARGET_VSENV=VS15_ARM))
 - if "%PLATFORM%" equ "Any CPU" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2017" (set TARGET_VSENV=VS15_ANYCPU))
+- if "%PLATFORM%" equ "x86" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2019" (set TARGET_VSENV=VS15_WIN32))
+- if "%PLATFORM%" equ "x64" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2019" (set TARGET_VSENV=VS15_WIN64))
+- if "%PLATFORM%" equ "ARM" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2019" (set TARGET_VSENV=VS15_ARM))
+- if "%PLATFORM%" equ "Any CPU" (if "%APPVEYOR_BUILD_WORKER_IMAGE%" equ "Visual Studio 2019" (set TARGET_VSENV=VS15_ANYCPU))
 
 install:
 - git submodule update --init
@@ -47,6 +52,10 @@ before_build:
 - if "%TARGET_VSENV%" equ "VS15_WIN64" cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_15 ../
 - if "%TARGET_VSENV%" equ "VS15_ARM" cmake -G "Visual Studio 15 2017 ARM" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_15 ../
 - if "%TARGET_VSENV%" equ "VS15_ANYCPU" cmake -G "Visual Studio 15 2017" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_15 ../
+- if "%TARGET_VSENV%" equ "VS15_WIN32" cmake -G "Visual Studio 16 2019" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_16 ../
+- if "%TARGET_VSENV%" equ "VS15_WIN64" cmake -G "Visual Studio 16 2019 Win64" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_16 ../
+- if "%TARGET_VSENV%" equ "VS15_ARM" cmake -G "Visual Studio 16 2019 ARM" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_16 ../
+- if "%TARGET_VSENV%" equ "VS15_ANYCPU" cmake -G "Visual Studio 16 2019" -D CMAKE_CONFIGURATION_TYPES=%CONFIGURATION% -D CMAKE_CXX_COMPILER_ID=MSVC_16 ../
 - cd ..
 
 build_script:
@@ -58,6 +67,10 @@ build_script:
 - if "%TARGET_VSENV%" equ "VS15_WIN64" msbuild build/libgltf.sln /p:Platform="x64"
 - if "%TARGET_VSENV%" equ "VS15_ARM" msbuild build/libgltf.sln /p:Platform="ARM"
 - if "%TARGET_VSENV%" equ "VS15_ANYCPU" msbuild build/libgltf.sln /p:Platform="Any CPU"
+- if "%TARGET_VSENV%" equ "VS16_WIN32" msbuild build/libgltf.sln /p:Platform="Win32"
+- if "%TARGET_VSENV%" equ "VS16_WIN64" msbuild build/libgltf.sln /p:Platform="x64"
+- if "%TARGET_VSENV%" equ "VS16_ARM" msbuild build/libgltf.sln /p:Platform="ARM"
+- if "%TARGET_VSENV%" equ "VS16_ANYCPU" msbuild build/libgltf.sln /p:Platform="Any CPU"
 
 after_build:
 - if "%APPVEYOR_REPO_TAG%" equ "true" 7z a libgltf.%APPVEYOR_REPO_TAG_NAME%.windows.%PLATFORM%.zip %APPVEYOR_BUILD_FOLDER%\output\

diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,8 @@
+*.bmp filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.psd filter=lfs diff=lfs merge=lfs -text
+*.3ds filter=lfs diff=lfs merge=lfs -text
+*.fbx filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,9 @@
 /build
 
 /**/*.pyc
+/**/*.pyo
 
 /**/.DS_Store
 
 /**/*.*~
+/**/*.swp
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -23,44 +23,62 @@ checked_by_cppcheck:
         - python
         - cppcheck
 
-compile.windows:
+compile.windows.vs2015:
     stage: build
     script:
-        - 'cd tools/batch/ && python .\..\..\tools\jsonschematoc11 glTF_2.0_schema.ini && cd ../../'
+        - 'cd tools/batch/ && update_parser_by_scheme.bat && cd ../../'
         - 'if exist build rmdir /s /q build'
         - 'mkdir build && cd build'
-        - 'mkdir vs2017 && cd vs2017'
-        - 'call "%VS2017COMNTOOLS%VsDevCmd.bat"'
+        - 'mkdir vs2015 && cd vs2015'
+        - 'call "%VS140COMNTOOLS%VsDevCmd.bat"'
         - 'mkdir win32 && cd win32'
-        - 'cmake -G "Visual Studio 15 2017" -DLIBGLTF_WITH_UNICODE=TRUE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
+        - 'cmake -G "Visual Studio 14 2015" -DLIBGLTF_STRING_TYPE=UNICODE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
         - 'msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="Win32"'
-        - 'output\bin\win32\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-BarramundiFish.gltf'
-        - 'output\bin\win32\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-Draco-BarramundiFish.gltf'
-        - 'output\bin\win32\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-pbrSpecularGlossinessBarramundiFish.gltf'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF\Monster.gltf'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Binary\Monster.glb'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Draco\Monster.gltf'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Embedded\Monster.gltf'
         - 'cd ../'
         - 'mkdir win64 && cd win64'
-        - 'cmake -G "Visual Studio 15 2017 Win64" -DLIBGLTF_WITH_UNICODE=TRUE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
+        - 'cmake -G "Visual Studio 14 2015 Win64" -DLIBGLTF_STRING_TYPE=UNICODE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
         - 'msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="x64"'
-        - 'output\bin\win64\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-BarramundiFish.gltf'
-        - 'output\bin\win64\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-Draco-BarramundiFish.gltf'
-        - 'output\bin\win64\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-pbrSpecularGlossinessBarramundiFish.gltf'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF\Monster.gltf'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Binary\Monster.glb'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Draco\Monster.gltf'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Embedded\Monster.gltf'
         - 'cd ../'
         - 'cd ../'
-        - 'mkdir vs2015 && cd vs2015'
-        - 'call "%VS140COMNTOOLS%VsDevCmd.bat"'
+        - 'cd ../'
+    tags:
+        - win32
+        - win64
+        - python
+        - cmake
+        - vs2015
+
+compile.windows.vs2017:
+    stage: build
+    script:
+        - 'cd tools/batch/ && update_parser_by_scheme.bat && cd ../../'
+        - 'if exist build rmdir /s /q build'
+        - 'mkdir build && cd build'
+        - 'mkdir vs2017 && cd vs2017'
+        - 'call "%VS2017COMNTOOLS%VsDevCmd.bat"'
         - 'mkdir win32 && cd win32'
-        - 'cmake -G "Visual Studio 14 2015" -DLIBGLTF_WITH_UNICODE=TRUE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
+        - 'cmake -G "Visual Studio 15 2017" -DLIBGLTF_STRING_TYPE=UNICODE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
         - 'msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="Win32"'
-        - 'output\bin\win32\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-BarramundiFish.gltf'
-        - 'output\bin\win32\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-Draco-BarramundiFish.gltf'
-        - 'output\bin\win32\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-pbrSpecularGlossinessBarramundiFish.gltf'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF\Monster.gltf'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Binary\Monster.glb'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Draco\Monster.gltf'
+        - '..\..\..\output\bin\win32\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Embedded\Monster.gltf'
         - 'cd ../'
         - 'mkdir win64 && cd win64'
-        - 'cmake -G "Visual Studio 14 2015 Win64" -DLIBGLTF_WITH_UNICODE=TRUE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
+        - 'cmake -G "Visual Studio 15 2017 Win64" -DLIBGLTF_STRING_TYPE=UNICODE -DCUSTOM_OUT_PATH="%CD%\output" ../../../'
         - 'msbuild libgltf.sln /t:Build /p:Configuration="Debug" /p:Platform="x64"'
-        - 'output\bin\win64\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-BarramundiFish.gltf'
-        - 'output\bin\win64\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-Draco-BarramundiFish.gltf'
-        - 'output\bin\win64\Debug\runtest.exe ..\..\..\resource\example-2.0\glTF-pbrSpecularGlossinessBarramundiFish.gltf'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF\Monster.gltf'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Binary\Monster.glb'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Draco\Monster.gltf'
+        - '..\..\..\output\bin\win64\Debug\runtest.exe ..\..\..\resource\2.0\Monster\glTF-Embedded\Monster.gltf'
         - 'cd ../'
         - 'cd ../'
         - 'cd ../'
@@ -69,7 +87,6 @@ compile.windows:
         - win64
         - python
         - cmake
-        - vs2015
         - vs2017
 
 compile.linux:
@@ -81,14 +98,20 @@ compile.linux:
         - 'make'
         - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls'
         - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/nothing.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/glTF-BarramundiFish.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/glTF-Draco-BarramundiFish.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/glTF-pbrSpecularGlossinessBarramundiFish.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/AnimatedMorphCube.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/BoxAnimated.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/Cameras.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/DamagedHelmet.Embedded.gltf'
-        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/RiggedSimple.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF/Monster.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF-Binary/Monster.glb'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF-Draco/Monster.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Monster/glTF-Embedded/Monster.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Avocado/glTF-pbrSpecularGlossiness/Avocado.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Cameras/glTF/Cameras.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/EnvironmentTest/glTF-IBL/EnvironmentTest.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/Triangle/glTF/Triangle.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/UnlitTest/glTF/UnlitTest.gltf'
+        - 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/2.0/VertexColorTest/glTF/VertexColorTest.gltf'
         - 'gcov source/runtest/CMakeFiles/runtest.dir/runtest.cpp.gcda'
         - 'gcovr --root=../source/ .'
         - 'cd ../'
@@ -107,9 +130,10 @@ compile.macos:
         - 'mkdir build && cd build'
         - 'cmake -G "Unix Makefiles" ../'
         - 'make'
-        - './../output/bin/macos/runtest ../resource/example-2.0/glTF-BarramundiFish.gltf'
-        - './../output/bin/macos/runtest ../resource/example-2.0/glTF-Draco-BarramundiFish.gltf'
-        - './../output/bin/macos/runtest ../resource/example-2.0/glTF-pbrSpecularGlossinessBarramundiFish.gltf'
+        - './../output/bin/macos/runtest ../resource/2.0/Monster/glTF/Monster.gltf'
+        - './../output/bin/macos/runtest ../resource/2.0/Monster/glTF-Binary/Monster.glb'
+        - './../output/bin/macos/runtest ../resource/2.0/Monster/glTF-Draco/Monster.gltf'
+        - './../output/bin/macos/runtest ../resource/2.0/Monster/glTF-Embedded/Monster.gltf'
         - 'cd ../'
     tags:
         - macos
@@ -157,15 +181,15 @@ compile.ios:
         - 'cd tools/batch/ && ./update_parser_by_scheme.sh && cd ../../'
         - 'mkdir build && cd build'
         - 'mkdir os && cd os'
-        - 'cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/toolchain/iOS.cmake -DIOS_PLATFORM=OS -DLIBGLTF_PLATFORM_IOS=TRUE -DLIBGLTF_WITH_UNICODE=TRUE -DLIBGLTF_USING_CHAR16=TRUE ../../'
+        - 'cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/toolchain/iOS.cmake -DIOS_PLATFORM=OS -DLIBGLTF_PLATFORM_IOS=TRUE -DLIBGLTF_STRING_TYPE=UTF16 ../../'
         - 'make libgltf'
         - 'cd ../'
         - 'mkdir simulator && cd simulator'
-        - 'cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/toolchain/iOS.cmake -DIOS_PLATFORM=SIMULATOR -DLIBGLTF_PLATFORM_IOS=TRUE -DLIBGLTF_WITH_UNICODE=TRUE -DLIBGLTF_USING_CHAR16=TRUE ../../'
+        - 'cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/toolchain/iOS.cmake -DIOS_PLATFORM=SIMULATOR -DLIBGLTF_PLATFORM_IOS=TRUE -DLIBGLTF_STRING_TYPE=UTF16 ../../'
         - 'make libgltf'
         - 'cd ../'
         - 'mkdir watchos && cd watchos'
-        - 'cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/toolchain/iOS.cmake -DIOS_PLATFORM=WATCHOS -DLIBGLTF_PLATFORM_IOS=TRUE -DLIBGLTF_WITH_UNICODE=TRUE -DLIBGLTF_USING_CHAR16=TRUE ../../'
+        - 'cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../../external/ios-cmake/toolchain/iOS.cmake -DIOS_PLATFORM=WATCHOS -DLIBGLTF_PLATFORM_IOS=TRUE -DLIBGLTF_STRING_TYPE=UTF16 ../../'
         - 'make libgltf'
         - 'cd ../'
         - 'cd ../'

diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "external/ios-cmake"]
 	path = external/ios-cmake
 	url = https://github.com/Yangqing/ios-cmake.git
+[submodule "external/draco"]
+	path = external/draco
+	url = https://github.com/google/draco.git
diff --git a/.travis.yml b/.travis.yml
@@ -31,18 +31,21 @@ script:
 
 after_success:
 - if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./nothing.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/glTF-BarramundiFish.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/glTF-Draco-BarramundiFish.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/glTF-pbrSpecularGlossinessBarramundiFish.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/AnimatedMorphCube.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/BoxAnimated.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/Cameras.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/DamagedHelmet.Embedded.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/RiggedSimple.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/TextureCoordinateTest.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/TriangleWithoutIndices.gltf; fi
-- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/VC.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/nothing.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF/Monster.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF-Binary/Monster.glb; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF-Draco/Monster.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Monster/glTF-Embedded/Monster.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Avocado/glTF-pbrSpecularGlossiness/Avocado.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Cameras/glTF/Cameras.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/EnvironmentTest/glTF/EnvironmentTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/EnvironmentTest/glTF-IBL/EnvironmentTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/MorphPrimitivesTest/glTF/MorphPrimitivesTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/Triangle/glTF/Triangle.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/TriangleWithoutIndices/glTF/TriangleWithoutIndices.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/TwoSidedPlane/glTF/TwoSidedPlane.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/UnlitTest/glTF/UnlitTest.gltf; fi
+- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/2.0/VertexColorTest/glTF/VertexColorTest.gltf; fi
 - if [ $RUN_COVERALLS == true ]; then coveralls --exclude ./external/ --exclude ./build/CMakeFiles/ --exclude ./output/include/ --gcov-options '\-lp'; fi
 
 before_deploy: