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
427 Commits 5 Branches 41 Tags
863fd440e3c8896eb85eeb09ee71b487fd532839
Commit Graph
427 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Syoyo Fujita 6bb66b1264 Merge pull request #99 from Selmar/serialization_fixes 
Pretty print & some (de)serialization fixes
 2018-10-09 02:12:38 +09: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
Syoyo Fujita bb4010336b Merge branch 'master' of github.com:syoyo/tinygltf 2018-10-07 20:35:14 +09:00
Syoyo Fujita 5a2da1742a Fix premake script. 2018-10-07 20:34:45 +09:00
Syoyo Fujita 5e70262b38 Merge branch 'master' of github.com:syoyo/tinygltf 2018-10-06 03:20:31 +09:00
Syoyo Fujita 142b0e326b Update README. 2018-10-06 03:20:11 +09:00
Syoyo Fujita f29ed08e97 Merge pull request #96 from Selmar/serialization_fixes 
Serialization & comparison fixes
 2018-10-06 01:36:27 +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 45e9cc4058 Remove duplicated files. 2018-10-04 15:48:17 +09: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 523562aae9 Update TODOs. 2018-09-25 03:03:49 +09: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
Syoyo Fujita 68e52bd6bf Bump clang version from 3.7 to 3.9 since clang-3.7 apt source is untrusted. 2018-08-30 21:27:11 +09: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
Syoyo Fujita f0156929c5 Merge pull request #92 from walf443/respect_stb_image_write_error 
handling stbi_write_xxx_to_func return code
 2018-08-28 21:33:07 +09:00
Keiji Yoshimi e8f1ba8181 handling stbi_write_xxx_to_func return code 2018-08-28 21:13:03 +09:00
Syoyo Fujita 888936dfab Merge pull request #90 from victorbush/force_32bit_tex 
Force default image loader to use 32-bit images
 2018-08-23 12:51:43 +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
Syoyo Fujita ebdbff2ea5 Merge pull request #89 from Selmar/missing_bin_to_error_message 
missing bin files are reported as warning instead of error
 2018-08-23 02:16:10 +09: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
Syoyo Fujita b4a4868d8b Merge pull request #88 from Selmar/forward_declare_dataUri_utils 
forward declare DataURI helpers
 2018-08-22 21:36:16 +09: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
Syoyo Fujita 74d91b7490 Fix unit test. 
Update README.
 2018-08-22 20:35:04 +09:00
Syoyo Fujita eaa6686314 Merge branch 'devel' 2018-08-22 20:30:52 +09:00
Syoyo Fujita 40b350bd24 Merge pull request #86 from mosra/fail-when-bin-missing-from-glb 
Properly fail also when external *.bin are missing from *.glb.
 2018-08-17 19:52:09 +09: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 536f9a36b8 Merge branch 'devel' of github.com:syoyo/tinygltf into devel 2018-08-16 15:57:28 +09:00
Syoyo Fujita 7196b0ca67 Fix typo(n2.z -> n1.z) 2018-08-16 15:56:13 +09:00
Syoyo Fujita 4560cd0631 Add link to px_render. 2018-08-09 01:58:40 +09: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
Syoyo Fujita b6b71a1f92 Merge pull request #81 from mosra/emscripten-file-paths 
Don't try to expand file paths on Emscripten.
 2018-07-25 13:51:00 +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
Syoyo Fujita d7423bad31 Consider Data URI buffers in binary. Fixes #79. 2018-07-11 02:46:52 +09:00