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
383 Commits 5 Branches 41 Tags
e1545134ac92e2c7f63995cc4e17fcc2f84467c2
Commit Graph

383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimír Vondruš
e1545134ac Properly fail also when external *.bin are missing from *.glb. 
Consistency with behavior for external *.bin files referenced from
*.gltf.
 2018-08-16 21:07:56 +02:00
Syoyo Fujita
536f9a36b8 Merge branch 'devel' of github.com:syoyo/tinygltf into devel 2018-08-16 15:57:28 +09:00
Syoyo Fujita
7196b0ca67 Fix typo(n2.z -> n1.z) 2018-08-16 15:56:13 +09:00
Syoyo Fujita
4560cd0631 Add link to px_render. 2018-08-09 01:58:40 +09:00
Syoyo Fujita
6190633db7 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
2b77f4cc14 Merge pull request #80 from mosra/texture-name 
Import texture names as well
 2018-07-25 13:51:41 +09:00
Syoyo Fujita
b6b71a1f92 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š
bcc8272129 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š
462dbb01df Import texture names as well. 
Every other structure has it already.
 2018-07-24 23:23:56 +02:00
Syoyo Fujita
d7423bad31 Consider Data URI buffers in binary. Fixes #79. 2018-07-11 02:46:52 +09:00
Syoyo Fujita
7b2be014e3 Merge pull request #78 from UberLambda/devel 
Added filesystem callback support (#77)
 2018-07-08 15:17:13 +09:00
Paolo Jovon
54d51d2b75 Fixed C++11 compliance of previous commit 2018-07-07 21:50:01 +02:00
Paolo Jovon
fb93287ebc 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
da9be5f6f8 Merge pull request #76 from mynz/devel 
parse extras on the root object
 2018-06-28 20:25:23 +02:00
mynz
8616225618 parse extras on the root object 2018-06-28 23:06:00 +09:00
Syoyo Fujita
23a3688f7c Merge pull request #75 from holzon/fix/allextras 
Adding missing extras field serializaton
 2018-06-04 19:07:49 +09:00
Jens Olsson
5ab2823e00 adding missing extras field serializaton 2018-06-04 11:56:00 +02:00
Syoyo Fujita
5911e2fd5e Merge pull request #73 from holzon/fix/extras 
Added missing extras serialization for nodes
 2018-05-24 23:59:56 +09:00
Jens Olsson
d9714fa7c4 fixing typo 2018-05-24 15:48:49 +02:00
Jens Olsson
e5927e30d0 added missing extras serialization for nodes 2018-05-24 15:29:54 +02:00
Syoyo Fujita
4211060802 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
1fe27829cf Remove use of optional 2018-04-25 15:13:05 -07:00
Ben Buzbee
ab569c3a7e Serialization fixes 2018-04-24 11:39:30 -07:00
Syoyo Fujita
ce1c1b8e90 typedef struct -> struct for enabling forward declarations of struct. 2018-04-17 15:45:42 +09:00
Syoyo Fujita
98ca13b9b7 Suppress clang warnings. 2018-04-15 18:40:55 +09:00
Syoyo Fujita
f144fbb4db Describe supported VS 2015 update revision. 2018-04-12 11:52:14 +09:00
Syoyo Fujita
8d0af92954 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
f8f136a99b Merge remote-tracking branch 'origin/devel' into generic_extension_support 
# Conflicts:
#	tiny_gltf.h
 2018-04-04 18:34:30 +02:00
Syoyo Fujita
f297b684e4 Merge branch 'devel' into Selmar-generic_extension_support 2018-04-05 01:27:03 +09:00
Selmar Kok
d0809ceed0 serialize texture extensions 2018-04-04 18:10:37 +02:00
Selmar Kok
1716f9ff93 Changed ExtensionMap to use Value instead of ParameterMap 2018-04-04 18:10:20 +02:00
Syoyo Fujita
4afc1a7e91 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
fec24cd89c bugfix, serializer skipped texture samplers refering to first index. 2018-04-02 07:29:29 +02:00
Syoyo Fujita
a5ae89ad3c Merge pull request #61 from bowald/fix/readme-update 
Updated readme
 2018-04-02 12:42:49 +09:00
johan bowald
b5b6a6f042 updated readme: fixed example, fixed dead links to stb_image/stb_image_write 2018-04-01 22:57:07 +02:00
Syoyo Fujita
5f273781e7 Suppress clang warnings. 2018-04-02 02:04:24 +09:00
johan bowald
90e28a4d34 update examples with new defines 2018-04-01 14:08:45 +02:00
johan bowald
841d8f5811 added stb_image_write.h 2018-04-01 13:31:09 +02:00
johan bowald
794c92542c output both embedded and image files, small fix to serializer. 2018-04-01 12:37:18 +02:00
Syoyo Fujita
696c682bc3 Suppress clang warnings. 
Apply clang-format.
 2018-03-30 19:26:35 +09:00
Syoyo Fujita
6ee5afc885 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
d2cd12ec27 added embed buffers as an option in serializer 2018-03-30 11:52:56 +02:00
Syoyo Fujita
7dcdc475a6 Merge pull request #58 from bowald/Bowald-serializer-fixes 
Serializer skips null values
 2018-03-28 22:09:08 +09:00
Johan Bowald
12f9350d16 Serializer skips null values 2018-03-28 14:54:22 +02:00
Syoyo Fujita
6b42ff7312 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
d6dc10dcfa Add Magnum's TinyGltfImporter plugin to projects 2018-03-28 12:19:42 +02:00
Selmar Kok
d8d2732d69 Merge remote-tracking branch 'origin/devel' into generic_extension_support 2018-03-26 16:22:18 +02:00
Selmar Kok
3c6f087c22 Merge remote-tracking branch 'origin/Selmar-generic_extension_support' into generic_extension_support 2018-03-26 16:20:44 +02:00
Syoyo Fujita
4f5eea8f94 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)
2eacdef110 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