Skip to content

Commit e2c1c41

Browse files
committed
support KHR_draco_mesh_compression and KHR_materials_pbrSpecularGlossiness
1 parent 8385694 commit e2c1c41

32 files changed

+2060
-689
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
/.vscode
1+
/**/.vs
2+
/**/.vscode
3+
24
/output
35
/build
46

.gitlab-ci.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ test_win32:
3333
- 'cd build'
3434
- 'cmake -G "Visual Studio 14 2015" ../'
3535
- 'msbuild libgltf.sln /t:Rebuild /p:Configuration="Debug" /p:Platform="Win32"'
36-
- '..\output\bin\win32\Debug\runtest.exe ..\resource\example-2.0\BarramundiFish.gltf'
36+
- '..\output\bin\win32\Debug\runtest.exe ..\resource\example-2.0\glTF-BarramundiFish.gltf'
37+
- '..\output\bin\win32\Debug\runtest.exe ..\resource\example-2.0\glTF-Draco-BarramundiFish.gltf'
38+
- '..\output\bin\win32\Debug\runtest.exe ..\resource\example-2.0\glTF-pbrSpecularGlossinessBarramundiFish.gltf'
3739
- 'cd ../'
3840
tags:
3941
- win32
@@ -50,7 +52,9 @@ test_win64:
5052
- 'cd build'
5153
- 'cmake -G "Visual Studio 14 2015 Win64" ../'
5254
- 'msbuild libgltf.sln /t:Rebuild /p:Configuration="Debug" /p:Platform="x64"'
53-
- '..\output\bin\win64\Debug\runtest.exe ..\resource\example-2.0\BarramundiFish.gltf'
55+
- '..\output\bin\win64\Debug\runtest.exe ..\resource\example-2.0\glTF-BarramundiFish.gltf'
56+
- '..\output\bin\win64\Debug\runtest.exe ..\resource\example-2.0\glTF-Draco-BarramundiFish.gltf'
57+
- '..\output\bin\win64\Debug\runtest.exe ..\resource\example-2.0\glTF-pbrSpecularGlossinessBarramundiFish.gltf'
5458
- 'cd ../'
5559
tags:
5660
- win64
@@ -66,8 +70,10 @@ test_linux:
6670
- 'make'
6771
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls'
6872
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/nothing.gltf'
73+
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/glTF-BarramundiFish.gltf'
74+
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/glTF-Draco-BarramundiFish.gltf'
75+
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/glTF-pbrSpecularGlossinessBarramundiFish.gltf'
6976
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/AnimatedMorphCube.gltf'
70-
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/BarramundiFish.gltf'
7177
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/BoxAnimated.gltf'
7278
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/Cameras.gltf'
7379
- 'valgrind --leak-check=full --show-leak-kinds=all ./../output/bin/linux/runtest --coveralls ../resource/example-2.0/DamagedHelmet.Embedded.gltf'
@@ -90,7 +96,9 @@ test_macos:
9096
- 'cd build'
9197
- 'cmake -G "Unix Makefiles" ../'
9298
- 'make'
93-
- './../output/bin/macos/runtest ../resource/example-2.0/BarramundiFish.gltf'
99+
- './../output/bin/macos/runtest ../resource/example-2.0/glTF-BarramundiFish.gltf'
100+
- './../output/bin/macos/runtest ../resource/example-2.0/glTF-Draco-BarramundiFish.gltf'
101+
- './../output/bin/macos/runtest ../resource/example-2.0/glTF-pbrSpecularGlossinessBarramundiFish.gltf'
94102
- 'cd ../'
95103
tags:
96104
- macos

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ script:
3131
after_success:
3232
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls; fi
3333
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./nothing.gltf; fi
34+
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/glTF-BarramundiFish.gltf; fi
35+
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/glTF-Draco-BarramundiFish.gltf; fi
36+
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/glTF-pbrSpecularGlossinessBarramundiFish.gltf; fi
3437
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/AnimatedMorphCube.gltf; fi
35-
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/BarramundiFish.gltf; fi
3638
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/BoxAnimated.gltf; fi
3739
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/Cameras.gltf; fi
3840
- if [ $RUN_COVERALLS == true ]; then ./output/bin/linux/runtest --coveralls ./resource/example-2.0/DamagedHelmet.Embedded.gltf; fi

external/glTF

Submodule glTF updated 151 files

0 commit comments

Comments
 (0)