Merge remote-tracking branch 'origin/master' into serialization_fixes

This commit is contained in:
Selmar Kok 2018-10-25 16:48:14 +02:00
commit 1cef6dcf33
2 changed files with 3 additions and 3 deletions

View File

@ -6,4 +6,4 @@ all:
clang++ $(EXTRA_CXXFLAGS) -std=c++11 -g -O0 -o loader_example loader_example.cc
lint:
./cpplint.py tiny_gltf_loader.h
deps/cpplint.py tiny_gltf.h

View File

@ -33,10 +33,10 @@ v2.0.0 release(22 Aug, 2018)!
* [x] Binary glTF(GLB)
* [x] PBR material description
* Buffers
* [x] Parse BASE64 encoded embedded buffer fata(DataURI).
* [x] Parse BASE64 encoded embedded buffer data(DataURI).
* [x] Load `.bin` file.
* Image(Using stb_image)
* [x] Parse BASE64 encoded embedded image fata(DataURI).
* [x] Parse BASE64 encoded embedded image data(DataURI).
* [x] Load external image file.
* [x] PNG(8bit only)
* [x] JPEG(8bit only)