Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-09-21 17:54:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
380 Commits 5 Branches 41 Tags
7c8d4ed7482b4d4cc6da2e0e269701d8d178a69c
Commit Graph

380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
7c8d4ed748 Added 'warning' message parameter to glTF loader API. 
Asset loading failure messages(e.g. image file is missing) are now stored in `warning` message, not `error` message.
 2018-07-27 16:49:10 +09:00
Syoyo Fujita
a71be9cc98 Merge pull request #80 from mosra/texture-name 
Import texture names as well
 2018-07-25 13:51:41 +09:00
Syoyo Fujita
8c29e35b42 Merge pull request #81 from mosra/emscripten-file-paths 
Don't try to expand file paths on Emscripten.
 2018-07-25 13:51:00 +09:00
Vladimír Vondruš
9f04583280 Don't try to expand file paths on Emscripten. 
Since the same is done on all mobile platforms already, I think it
should not do any harm. Without this I was getting compilation/linker
errors.
 2018-07-24 23:32:17 +02:00
Vladimír Vondruš
239be2c09f Import texture names as well. 
Every other structure has it already.
 2018-07-24 23:23:56 +02:00
Syoyo Fujita
39abfb5f91 Consider Data URI buffers in binary. Fixes #79. 2018-07-11 02:46:52 +09:00
Syoyo Fujita
81bbf86e2a Merge pull request #78 from UberLambda/devel 
Added filesystem callback support (#77)
 2018-07-08 15:17:13 +09:00
Paolo Jovon
b2a587af96 Fixed C++11 compliance of previous commit 2018-07-07 21:50:01 +02:00
Paolo Jovon
e6601bfb4b Added filesystem callback support 
Now a library like PhysFS can be used to load files by defining custom
callbacks and disabling the builtin ones by #define TINYGLTF_NO_FS
 2018-07-07 20:43:33 +02:00
Syoyo Fujita
90e2c9cc74 Merge pull request #76 from mynz/devel 
parse extras on the root object
 2018-06-28 20:25:23 +02:00
mynz
c0d4d1c50c parse extras on the root object 2018-06-28 23:06:00 +09:00
Syoyo Fujita
0f282f7e26 Merge pull request #75 from holzon/fix/allextras 
Adding missing extras field serializaton
 2018-06-04 19:07:49 +09:00
Jens Olsson
b3af2f1cf6 adding missing extras field serializaton 2018-06-04 11:56:00 +02:00
Syoyo Fujita
a48f12d2fc Merge pull request #73 from holzon/fix/extras 
Added missing extras serialization for nodes
 2018-05-24 23:59:56 +09:00
Jens Olsson
a9718668b4 fixing typo 2018-05-24 15:48:49 +02:00
Jens Olsson
b96f6966ab added missing extras serialization for nodes 2018-05-24 15:29:54 +02:00
Syoyo Fujita
7c56f8eb9e Merge pull request #69 from benbuzbee/serialization-fixes 
Serialization fixes for single-number values and integers
 2018-04-26 14:06:18 +09:00
Ben Buzbee
f6af224135 Remove use of optional 2018-04-25 15:13:05 -07:00
Ben Buzbee
3b735bb878 Serialization fixes 2018-04-24 11:39:30 -07:00
Syoyo Fujita
2d17a31d3b typedef struct -> struct for enabling forward declarations of struct. 2018-04-17 15:45:42 +09:00
Syoyo Fujita
48f6db0994 Suppress clang warnings. 2018-04-15 18:40:55 +09:00
Syoyo Fujita
c89fc5f06b Describe supported VS 2015 update revision. 2018-04-12 11:52:14 +09:00
Syoyo Fujita
1e629c8efe Fix printing accessor.min and accessor.max in loader_example. 
Initial support for printing extensions(no pretty printing at the moment).
Merge branch 'generic_extension_support' of https://github.com/Selmar/tinygltf into Selmar-generic_extension_support
 2018-04-05 15:37:57 +09:00
Selmar Kok
341fc31aee Merge remote-tracking branch 'origin/devel' into generic_extension_support 
# Conflicts:
#	tiny_gltf.h
 2018-04-04 18:34:30 +02:00
Syoyo Fujita
7b0bbc6570 Merge branch 'devel' into Selmar-generic_extension_support 2018-04-05 01:27:03 +09:00
Selmar Kok
9eae110946 serialize texture extensions 2018-04-04 18:10:37 +02:00
Selmar Kok
fa7022f364 Changed ExtensionMap to use Value instead of ParameterMap 2018-04-04 18:10:20 +02:00
Syoyo Fujita
6c67da478f Merge pull request #62 from bowald/feature/serializer-handle-image-output 
small bugfix, serializer skipped texture samplers refering to first index.
 2018-04-02 15:24:04 +09:00
johan bowald
b97d34cfee bugfix, serializer skipped texture samplers refering to first index. 2018-04-02 07:29:29 +02:00
Syoyo Fujita
142aed7499 Merge pull request #61 from bowald/fix/readme-update 
Updated readme
 2018-04-02 12:42:49 +09:00
johan bowald
ca80a591e0 updated readme: fixed example, fixed dead links to stb_image/stb_image_write 2018-04-01 22:57:07 +02:00
Syoyo Fujita
dc4bb86bf1 Suppress clang warnings. 2018-04-02 02:04:24 +09:00
johan bowald
ef151a4fed update examples with new defines 2018-04-01 14:08:45 +02:00
johan bowald
0894de77f9 added stb_image_write.h 2018-04-01 13:31:09 +02:00
johan bowald
642a343684 output both embedded and image files, small fix to serializer. 2018-04-01 12:37:18 +02:00
Syoyo Fujita
719d7e4a74 Suppress clang warnings. 
Apply clang-format.
 2018-03-30 19:26:35 +09:00
Syoyo Fujita
13fd7152ee Merge pull request #59 from bowald/feature/serializer-embed-buffer 
Added embed buffers as an option in serializer
 2018-03-30 19:17:18 +09:00
johan bowald
30c5347afe added embed buffers as an option in serializer 2018-03-30 11:52:56 +02:00
Syoyo Fujita
841c858bfd Merge pull request #58 from bowald/Bowald-serializer-fixes 
Serializer skips null values
 2018-03-28 22:09:08 +09:00
Johan Bowald
faa2722f45 Serializer skips null values 2018-03-28 14:54:22 +02:00
Syoyo Fujita
ae751c4882 Merge pull request #57 from Squareys/patch-1 
Add Magnum's TinyGltfImporter plugin to projects
 2018-03-28 19:23:39 +09:00
Jonathan Hale
6a04c87807 Add Magnum's TinyGltfImporter plugin to projects 2018-03-28 12:19:42 +02:00
Selmar Kok
5210f1539e Merge remote-tracking branch 'origin/devel' into generic_extension_support 2018-03-26 16:22:18 +02:00
Selmar Kok
35c798ed28 Merge remote-tracking branch 'origin/Selmar-generic_extension_support' into generic_extension_support 2018-03-26 16:20:44 +02:00
Syoyo Fujita
5e379693cb Merge pull request #55 from Ybalrid/pr_add_ogre_gltf_to_readme 
Add Ogre_glTF to the list of projects using the lib
 2018-03-22 02:09:49 +09:00
Arthur Brainville (Ybalrid)
a403cd8736 Add Ogre_glTF to the list of projects using the lib 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-21 18:02:36 +01:00
Syoyo Fujita
246654a15a Code clean-up. Reviewed by @Squareeyes. 2018-03-21 20:32:22 +09:00
Syoyo Fujita
ba28ddcc9e Modify error message. 2018-03-21 20:05:11 +09:00
Syoyo Fujita
8e2c24fb92 Refactor ParseImage function. 
Returns error when both `bufferView` and `uri` are defined in Image.
 2018-03-21 19:54:38 +09:00
Syoyo Fujita
ba809ff52f Merge branch 'devel' of github.com:syoyo/tinygltf into devel 2018-03-21 18:52:53 +09:00