Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-11-08 00:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
339 Commits 5 Branches 42 Tags
d0809ceed02cc5b1d2c93a915214d879bc9b7fca
Commit Graph
339 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Syoyo Fujita 5727596f3f Fix storing uri to Buffer.uri. Fixes #50. 
Fix decoding DataURI with 'data:application/gltf-buffer;base64' mime.
 2018-03-15 11:01:05 -05:00
Syoyo Fujita a85ef89208 Merge pull request #45 from Squareys/custom-image-loaders 
Allow custom image loaders
 2018-03-14 10:07:49 +09:00
Squareys b613c4007a Allow opting out of STB_IMAGE dependency 
Signed-off-by: Squareys <squareys@googlemail.com>
 2018-03-13 23:08:03 +01:00
Squareys a22c6b24fb Allow specifying custom image loader callback 
Signed-off-by: Squareys <squareys@googlemail.com>
 2018-03-13 23:08:03 +01:00
Squareys 6bc80acfb3 Clean up obsolete debug output 
Signed-off-by: Squareys <squareys@googlemail.com>
 2018-03-13 22:29:31 +01:00
Squareys 660aec3973 Remove trailing whitespaces 
Signed-off-by: Squareys <squareys@googlemail.com>
 2018-03-13 22:20:48 +01:00
Squareys 781aa4b770 Fix minor typo 
Signed-off-by: Squareys <squareys@googlemail.com>
 2018-03-13 22:20:01 +01:00
Syoyo Fujita 5bd6a463fc Fix empty serialization. Fixes #44. 2018-03-06 12:04:51 +09:00
Syoyo Fujita a605c00a48 Merge pull request #43 from Ybalrid/devel 
raytrace: remove code that ouput the 1st loaded texture as PPM
 2018-03-03 02:15:44 +09:00
Arthur Brainville 4236dccc3f raytrace: remove code that ouput the 1st loaded texture as PPM 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-02 16:58:30 +01:00
Syoyo Fujita f7f2354a7c Merge pull request #42 from Ybalrid/pr_raytrace_texture_loading 
raytrace: add simple code that load texture data
 2018-03-03 00:55:58 +09:00
Syoyo Fujita 83b8218c97 Merge pull request #41 from Ybalrid/pr_upgrade_imgui_imguizmo_raytrace 
Upgraded dear imgui and ImGuizmo to the latest version
 2018-03-03 00:43:18 +09:00
Arthur Brainville bd16abeb25 Restored previous behavior when moving node in scene 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-02 16:21:28 +01:00
Arthur Brainville 82533402a4 Update scene when moving gizmo 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-02 16:10:20 +01:00
Arthur Brainville b3fd75f89e Upgraded dear imgui and ImGuizmo to the latest version 
The Gizmo feels a little bit nicer to use in the latest version

Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-02 15:49:01 +01:00
Arthur Brainville 4acfd9b037 raytrace: add simple code that load texture data 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-03-02 13:57:37 +01:00
Syoyo Fujita 88b6a9e911 Fix return location. 2018-02-28 19:59:32 +09:00
Syoyo Fujita 6d7748759d Merge pull request #40 from Ybalrid/pr_raytrace_example 
Pr raytrace example
 2018-02-28 00:04:07 +09:00
Arthur Brainville 721ac3b4bf Fixed triangle fan indices 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-27 12:47:06 +01:00