Skip to content

Commit

Permalink
support KHR_draco_mesh_compression and KHR_materials_pbrSpecularGloss…
Browse files Browse the repository at this point in the history
…iness
  • Loading branch information
alexchicn committed Mar 12, 2018
1 parent 8385694 commit e2c1c41
Show file tree
Hide file tree
Showing 32 changed files with 2,060 additions and 689 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/.vscode
/**/.vs
/**/.vscode

/output
/build

Expand Down
16 changes: 12 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ test_win32:
- 'cd build'
- 'cmake -G "Visual Studio 14 2015" ../'
- 'msbuild libgltf.sln /t:Rebuild /p:Configuration="Debug" /p:Platform="Win32"'
- '..\output\bin\win32\Debug\runtest.exe ..\resource\example-2.0\BarramundiFish.gltf'
- '..\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'
- 'cd ../'
tags:
- win32
Expand All @@ -50,7 +52,9 @@ test_win64:
- 'cd build'
- 'cmake -G "Visual Studio 14 2015 Win64" ../'
- 'msbuild libgltf.sln /t:Rebuild /p:Configuration="Debug" /p:Platform="x64"'
- '..\output\bin\win64\Debug\runtest.exe ..\resource\example-2.0\BarramundiFish.gltf'
- '..\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'
- 'cd ../'
tags:
- win64
Expand All @@ -66,8 +70,10 @@ test_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/BarramundiFish.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'
Expand All @@ -90,7 +96,9 @@ test_macos:
- 'cd build'
- 'cmake -G "Unix Makefiles" ../'
- 'make'
- './../output/bin/macos/runtest ../resource/example-2.0/BarramundiFish.gltf'
- './../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'
- 'cd ../'
tags:
- macos
Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ 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/BarramundiFish.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
Expand Down
2 changes: 1 addition & 1 deletion external/glTF
Submodule glTF updated 151 files
Loading

0 comments on commit e2c1c41

Please sign in to comment.