Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-11-04 06:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
495 Commits 5 Branches 41 Tags
24840cdbed488a1f0eff638068d7ffded247a0ae
Commit Graph
122 Commits
Author SHA1 Message Date
Alexander Wood fe11dc418d Updates to draco decoding: 
- When injecting draco decoded meshes into accessor data, update count to match the optimized and decoded draco mesh
 - accessor.componentType is now used for extraction of decoded draco meshes.

Fixes #135
 2019-01-26 08:58:45 -05:00
Alex Wood eb07083296 Looks like I'm colliding with work by syoyo. Only difference so far appears to be our macro name. 2019-01-24 15:45:16 -05:00
Alex Wood 5fd4d4d662 Merge branch 'draco' of https://github.com/abwood/tinygltf into draco 2019-01-24 15:40:28 -05:00
Alex Wood 07a015d6a2 Initial support for draco mesh compression. In this PR, we establish that draco is a dependency built external to tinygltf, which breaks from the current tradition of header only dependencies. For that reason, this feature is hidden behind a #define TINYGLTF_ENABLE_DRACO and requires developers to explicitly opt-in for draco support. 
In this change, tinygltf any primitive using draco compression will:
If indices are specified
1) Decode the index buffer using draco, creating a new buffer and bufferview, adding to Model::bufferViews and Model::buffer collections
2) Update the primitive's accessor id to reference this new decoded bufferview.
For each attribute semantic specified by the draco extension
1) Decode the vertex buffer using draco, creating a new buffer and bufferview, adding to Model::bufferViews and Model::buffer collections
2) Update the primitive's accessor id to reference this new decoded bufferview.
 2019-01-24 15:38:16 -05:00
Syoyo Fujita 446b3147e0 Begin supporting draco. 2019-01-19 03:03:22 +09:00
Syoyo Fujita 207b7b3ebd Show more expressive messages when parsing image. 2019-01-06 18:55:57 +09:00
Sascha Willems 5278dfff58 Added new feature for loading all gltf related files (including textures, binaries, etc.) from assets packaged with an Android app 2018-12-28 20:53:41 +01:00
Peter Le Bek 8d23e8c6aa Fix incorrect index into bufferViews array 2018-12-08 16:04:42 -08:00
viperscape 4deeaa1a03 find missing bufferView target types and fill them in 2018-12-05 14:11:01 -05:00
Selmar Kok 126fee11b5 Set a default for sampler.wrapR, because it was serializing an uninitialized value 2018-12-04 19:55:56 +01:00
Selmar Kok bbaa65ce93 Fix prettyprint to really not print pretty 2018-11-30 18:01:31 +01:00
Unknown 1983cfc536 Removed unreachable code and fixed ambiguity warning. 2018-11-15 18:36:59 +00:00
Syoyo Fujita c04e762b64 Merge branch 'master' of github.com:syoyo/tinygltf 2018-11-10 20:08:02 +09:00
Syoyo Fujita 8f25f8400c Merge branch 'master' of https://github.com/loomai/tinygltf into loomai-master 2018-11-10 20:07:15 +09:00
Selmar Kok adc900a97a Merge remote-tracking branch 'origin/master' into serialization_fixes 2018-11-09 10:34:55 +01:00
Selmar Kok f273efe4e9 Fix missing serialization: sampler.wrapR 2018-11-09 10:34:39 +01:00
Johan Bowald eb14d8ea25 fixed a reference error which cause an error when writing images to disk 2018-11-06 14:28:20 +01:00
Syoyo Fujita a0617fd244 Merge branch 'master' of github.com:syoyo/tinygltf 2018-11-05 13:33:27 +09:00
Syoyo Fujita 67faff5842 Fix logic error. Fixes #104 2018-11-05 13:32:43 +09:00
Selmar Kok eae3ba05df fail serialization if a buffer file fails to be written (e.g. due to access rights) 2018-10-25 16:45:49 +02:00
Selmar Kok 863fd440e3 fix an issue when serializing an empty extension object would serialize as type null (and thus deserialize as type null, causing it to be ignored) 2018-10-10 18:10:58 +02:00
Selmar Kok 2c0c4fc62d // pretty print as optional parameter, default true 
// serialize name instead of type for camera.name
// create empy Value::Object if extension value parsing failed
 2018-10-08 16:20:43 +02:00
Syoyo Fujita 48b6826198 Serialize extension with empty object. Fixes #97 
Use pretty printing JSON when serializing for the readability.
 2018-10-08 21:18:33 +09:00
Selmar Kok 7f13e3e912 tabs to spaces 2018-10-05 16:30:50 +02:00
Selmar Kok b2c232c76c better implementation for bin file name checking 2018-10-05 16:25:54 +02:00
Selmar Kok 17b319e3b5 - support writing multiple bin files 
- use existing buffer.uri as filename if not empty and not a data uri
 2018-10-05 16:02:29 +02:00
Selmar Kok e398a5855b - always check Parameter::number_value to catch user errors, e.g. setting number_value without setting has_number_value, which will cause it to serialize as a bool but read back in as a float anyway 2018-10-05 14:36:05 +02:00
Selmar Kok 11eb5a8da7 Merge branch 'master' of github.com:syoyo/tinygltf into serialization_fixes 2018-10-05 14:30:16 +02:00
Selmar Kok 58d7b1064e - Parse image extras property 
- Optionally serialize texture.source (it is not required in the current spec)
 2018-10-05 14:29:35 +02:00
Syoyo Fujita 2737d51d6a Update to v2.0.1 2018-10-04 15:45:13 +09:00
Syoyo Fujita 9cae999b69 Suppress clang warnings. 
Apply clang-format.
 2018-10-04 15:43:33 +09:00
Syoyo Fujita f83a779430 Merge pull request #95 from Selmar/equality_operator_and_some_additions 
Equality operator and some additions
 2018-10-04 13:56:35 +09:00
Syoyo Fujita c87a0ba84a Merge branch 'master' into devel 2018-10-04 13:55:21 +09:00
Selmar Kok f0a934d0c8 Merge branch 'master' of github.com:syoyo/tinygltf into equality_operator_and_some_additions 
# Conflicts:
#	tiny_gltf.h
 2018-10-03 15:46:23 +02:00
Selmar Kok 3a94598aef // equality operator for tinygltf::Model and types contained by it 
// double comparison (although perhaps not necessary, as json reads/writes bytes directly? unsure..)
// initialize some variables for operator==() reliabiltiy
// change some floats to doubles
// intellisense define
// serialize accessor.name
// dont serialize some names if they're empty
// return false if writing gltf file fails
 2018-10-03 15:39:05 +02:00
Syoyo Fujita 39dbbe2e88 Add as-is flag to Image. Tentative solution for issue #82 2018-09-02 16:58:43 +09:00
Syoyo Fujita 395ede911c Parse extensions property of Image. 2018-09-02 15:36:17 +09:00
David Harmon 0be43b7133 Enable support for writing binary glTF. 2018-08-30 08:06:05 -04:00
Syoyo Fujita 08433c45b3 Merge branch 'master' of github.com:syoyo/tinygltf 2018-08-28 21:34:06 +09:00
Syoyo Fujita 6e3ed4649a Suppress unknown pragma warning on clang 3.7 2018-08-28 21:33:40 +09:00
Keiji Yoshimi e8f1ba8181 handling stbi_write_xxx_to_func return code 2018-08-28 21:13:03 +09:00
Victor Bushong 6eebc3cfe8 Force default image loader to use 32-bit images for Vulkan compatibility. 2018-08-22 22:03:30 -05:00
Selmar Kok aec2e8a1ad add required parameter to LoadExternalFile 2018-08-22 19:04:21 +02:00
Selmar Kok 95dbaeeae5 change from warning to error for missing bin files 2018-08-22 18:26:10 +02:00
Selmar Kok fe21dbc7b9 forward declare DataURI helper functions to allow usage outside of implementation file (in case of custom image handling) 2018-08-22 14:01:57 +02:00
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 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
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