Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-08-21 18:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
358 Commits 5 Branches 41 Tags
f144fbb4db0f76fd5fb2eba7e15fce88001dc9e0
Commit Graph

358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Syoyo Fujita
a84bb0eef4 Code clean-up. Reviewed by @Squareeyes. 2018-03-21 20:32:22 +09:00
Syoyo Fujita
abefa6e343 Modify error message. 2018-03-21 20:05:11 +09:00
Syoyo Fujita
0955e0f838 Refactor ParseImage function. 
Returns error when both `bufferView` and `uri` are defined in Image.
 2018-03-21 19:54:38 +09:00
Syoyo Fujita
9bdd12271f Merge branch 'devel' of github.com:syoyo/tinygltf into devel 2018-03-21 18:52:53 +09:00
Syoyo Fujita
8497824bd2 Print extensions. 2018-03-21 18:48:03 +09:00
Syoyo Fujita
ec3c072688 Merge pull request #53 from Ybalrid/gltfutil 
Gltf utility
 2018-03-20 11:01:22 +09:00
Syoyo Fujita
4f46e779b8 Merge pull request #54 from Ybalrid/fix_msvc_build_usage 
Fix MSVC build: removing static keyowrd befor tinygltf::LoadImageData
 2018-03-20 10:36:26 +09:00
Arthur Brainville
5a760c2814 Can select image file format with -f argument in gltf util 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 20:24:00 +01:00
Arthur Brainville
15dee6471e Add a "not specified" option to the enum class for image formats 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 20:06:59 +01:00
Arthur Brainville
76d44a643f Fix MSVC build: removing static keyowrd befor tinygltf::LoadImageData 
This is peculiar:
It looks like MSVC doesn't want to build when multiple compilation units
(e.g. multiple .cc files) uses tiny_gltf and this funciton is static.

The only one file that will build without error is the one that defined
the `TINYGLTF_IMPLEMENTATION` macro.

Removing `static` here solves the issue...

Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 19:54:05 +01:00
Arthur Brainville
386de3b7fb Fix MSVC build: removing static keyowrd befor tinygltf::LoadImageData 
This is peculiar:
It looks like MSVC doesn't want to build when multiple compilation units
(e.g. multiple .cc files) uses tiny_gltf and this funciton is static.

The only one file that will build without error is the one that defined
the `TINYGLTF_IMPLEMENTATION` macro.

Removing `static` here solves the issue...

Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 19:40:04 +01:00
Arthur Brainville (Ybalrid)
4b397b4ec3 Can specify output directory for dumped texture with -o 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 17:21:18 +01:00
Arthur Brainville (Ybalrid)
7e233ba2e5 Added basic texture dumper 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 17:11:53 +01:00
Selmar Kok
1265ce9c6b Merge branch 'devel' into generic_extension_support 2018-03-19 16:15:22 +01:00
Arthur Brainville
c9e0a5dac5 Start working on a gltf utility program 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 15:49:14 +01:00
Syoyo Fujita
f4c21a51cb Serialize lights under as KHR_lights_cmn extension. 2018-03-17 16:12:42 -05:00
Syoyo Fujita
47b5657fa5 Merge pull request #52 from Selmar/opt_out_external_image_loading 
Allow opting out of external image loading
 2018-03-16 17:26:49 -05:00
Selmar Kok
730e94b646 Merge branch 'devel' into generic_extension_support 
# Conflicts:
#	tiny_gltf.h
 2018-03-16 12:32:52 +01:00
Selmar Kok
15f167d6d0 Merge branch 'devel' into opt_out_external_image_loading 2018-03-16 12:15:13 +01:00
Selmar
b204805de2 Allow opting out of external image loading 
We do not require image loading for external files, we have separate texture directories at the moment.

I've also added saving the image->uri when loading a binary gltf.
 2018-03-16 11:48:19 +01:00
Syoyo Fujita
5302d9b627 Parse defaultScene value correcrly. Fixes #47. 2018-03-15 22:09:01 -05:00
Syoyo Fujita
809311a948 Loading a GLB file without BIN data fails. Fixes #49. 2018-03-15 22:01:18 -05:00
Syoyo Fujita
2faf429520 Store relative URI in Buffer serializer. Fixes #48. 
Apply clang-format.
Add simple saver sample.
 2018-03-15 21:52:00 -05:00
Selmar
2e4c0a50d4 removed code from another issue 2018-03-15 17:32:27 +01:00
Selmar
f17ab2c39e generic extension support 
Two issues remaining:
- The lights data exists twice on export; once outside of the gltf specification and once in the extensions.
- A lot of objects are still missing the extensions property.
 2018-03-15 17:30:42 +01:00