GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-08 20:31:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
965 Commits 46 Branches 37 Tags
Commit Graph

965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Syoyo Fujita
d1f8bae89c Print extensions. 2018-03-21 18:48:03 +09:00
Syoyo Fujita
70d8b7a42b
Merge pull request #53 from Ybalrid/gltfutil 
Gltf utility
 2018-03-20 11:01:22 +09:00
Syoyo Fujita
3f1c5a90d3
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
2960379eba
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
4ba01f5968
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
cd366ddd1d
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
68174a3fb3
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)
34c8b60325
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)
8d8840f809
Added basic texture dumper 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-19 17:11:53 +01:00
Selmar Kok
85b3cbc44d Merge branch 'devel' into generic_extension_support 2018-03-19 16:15:22 +01:00
Arthur Brainville
ea2b1c5e5d
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
d5b0244e2c Serialize lights under as KHR_lights_cmn extension. 2018-03-17 16:12:42 -05:00
Syoyo Fujita
f1cdd1c4cb
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
2a15f387bc Merge branch 'devel' into generic_extension_support 
# Conflicts:
#	tiny_gltf.h
 2018-03-16 12:32:52 +01:00
Selmar Kok
5b8eb9b429 Merge branch 'devel' into opt_out_external_image_loading 2018-03-16 12:15:13 +01:00
Selmar
67af3c98aa
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