Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-11-07 08:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
326 Commits 5 Branches 41 Tags
abefa6e343a8cd7d15ccbca227f9d89cdc3ea1bd
Commit Graph
326 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 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 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
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
Arthur Brainville (Ybalrid) 65cc97eb6d Enforece some const correctness. Add comments. 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-25 01:23:04 +01:00
Arthur Brainville (Ybalrid) d54853e812 Reorder UVs in vacevaying order 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-25 01:14:57 +01:00
Arthur Brainville (Ybalrid) 038ebb230b Handle all types of triangle-based vertex buffer. 
Some small codepath changes too.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-25 00:52:50 +01:00
Arthur Brainville (Ybalrid) ef5d264f35 Fix pesudo -> pseudo typo 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-25 00:42:35 +01:00
Arthur Brainville (Ybalrid) 49466f0280 Check the type of vectors before checking the type of their component 
This order makes more sense.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-24 22:09:17 +01:00
Arthur Brainville (Ybalrid) 1c00bdf009 Fix the loading of normals by putting them into facevarying order 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-24 21:52:53 +01:00
Arthur Brainville (Ybalrid) 4e375075b6 Fixes problem when mesh in glTF file doesn't have a name 
a "unnamed_X" name will be genrated.

This fixes the loading of Trinagle.gltf from khronos

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-23 15:15:33 +01:00
Arthur Brainville (Ybalrid) cad562a390 Merge branch 'pr_raytrace_example' of github.com:Ybalrid/tinygltf into pr_raytrace_example 2018-02-23 14:26:55 +01:00
Arthur Brainville (Ybalrid) 4899323a06 Log the types of data used by the currently loaded GLTF file 
This will help test and improve compatibilitiy.

Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-23 14:23:30 +01:00
Arthur Brainville (Ybalrid) e1b7cb5e06 load texture coordinates 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:24 +01:00
Arthur Brainville b0d3f22701 Small code cleanup 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:23 +01:00
Arthur Brainville 7c0e935f5d Switch to unsigned int for the int arrays. Fix compatibility issue 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:23 +01:00
Arthur Brainville 92eb0927cf added loading of doubles for position 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
 2018-02-22 21:50:23 +01:00