Skip to content

Commit

Permalink
Updates (#57)
Browse files Browse the repository at this point in the history
* Protect against bad glb header data (AFL fuzzing run)
* Fix Viewer project file; asset copy didn't work

* Updated test version of nlohmann::json
* Update glTF-Sample-Models and tests
* Update linux test environment
* Update CLI11
* Update d3dx12.h
* Update catch2
* Tweak readme
  • Loading branch information
jessey-git authored May 9, 2019
1 parent 7568a3b commit 9b2a839
Show file tree
Hide file tree
Showing 10 changed files with 12,020 additions and 9,923 deletions.
27 changes: 24 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: cpp

dist: trusty
dist: xenial
sudo: required
group: edge

Expand Down Expand Up @@ -51,7 +51,7 @@ matrix:
- TEST_LANGUAGE_STANDARD=14
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-5.0']
packages: ['g++-7', 'clang-5.0', 'ninja-build']

- os: linux
Expand All @@ -61,9 +61,30 @@ matrix:
- TEST_LANGUAGE_STANDARD=17
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-6.0']
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-6.0']
packages: ['g++-7', 'clang-6.0', 'ninja-build']

- os: linux
compiler: clang
env:
- COMPILER=clang++-7
- TEST_LANGUAGE_STANDARD=17
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-7']
packages: ['g++-8', 'clang-7', 'ninja-build']

- os: linux
compiler: clang
env:
- COMPILER=clang++-8
- TEST_LANGUAGE_STANDARD=17
addons:
apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-8']
packages: ['g++-8', 'clang-8', 'ninja-build']


################
# build script #
################
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ See the DirectX 12 enabled [viewer](examples/viewer) example for a demonstration
| ------------| -------------------------- |
| .gltf files w/external resources | 100% complete and passing |
| .gltf files w/embedded resources | 100% complete and passing (2 models excluded due to out-of-spec mimetypes) |
| .gltf files w/pbrSpecularGlossiness extension | 100% complete and passing |
| .gltf files w/Draco extension | 100% complete and passing |
| .glb files | 100% complete and passing |

* Safety
Expand Down
Loading

0 comments on commit 9b2a839

Please sign in to comment.