Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-09-15 14:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
669 Commits 5 Branches 41 Tags
24fdf47392f826ea12dbdd2b3f87f0c6485beec6
Commit Graph

227 Commits

Author SHA1 Message Date
Syoyo Fujita
5a9605983d Merge pull request #217 from syoyo/store-json-string-for-extras-and-extensions 
Add feature to store original JSON string for extras and extensions
 2019-10-30 19:08:08 +09:00
Harokyang
3d78ab1bd9 fix build error on C++11/C++14 2019-10-30 16:30:00 +08:00
Syoyo Fujita
7cde1091ae Add feature to store original JSON string for extras and extensions(for user-specific JSON parsing). # Fixes 215 
Fix some glTF object(e.g. Skin) does not have extras and/or extensions property.
 2019-10-30 17:25:38 +09:00
Harokyang
c18a33178d support writing with utf-8 filepath 2019-10-30 16:14:10 +08:00
Harokyang
453f243b6b Treat all filepath string as utf-8 encoded 
On Windows, convert utf-8 to wchar string before interact with filepath
 2019-10-30 15:17:09 +08:00
Syoyo Fujita
61e9c396b9 Allow parsing integer number value as double(For example, glTF-Sample-Models/2.0/Cameras/glTF has zfar number property with integer value, which trigerred a parsing failure). 2019-10-30 15:18:55 +09:00
Syoyo Fujita
07d4fa0798 Merge pull request #212 from Selmar/move_operator 
Move semantics
 2019-10-30 15:11:26 +09:00
Selmar Kok
0b752fc2e4 revert some local modifications, oops.... >_> 2019-10-29 16:25:37 +01:00
Selmar Kok
b91b13e75a replace TINYGLTF_USE_NO_EXCEPT with GNU compiler version check 2019-10-29 16:22:07 +01:00
Selmar Kok
b7f6b0ae23 TINYGLTF_USE_NOEXCEPT 2019-10-29 16:09:32 +01:00
Doug Muir
633a74e6cc Fix check for invalid glTF to consider invalid length/model_length combinations. 2019-10-28 09:51:13 -07:00
Selmar Kok
cc5fef7835 pbrMetallicRoughnes default noexcept move operator 2019-10-21 19:23:15 +02:00
Selmar Kok
87cedfc36d Merge remote-tracking branch 'origin/master' into move_operator 2019-10-21 17:58:57 +02:00
Selmar Kok
6d1ff876af use default noexcept move constructor / operator 2019-10-21 17:58:09 +02:00
Syoyo Fujita
ac5c351563 Fix parsing a glTF file with 2GB+ or lareger size. 2019-10-20 17:47:50 +09:00
Selmar Kok
b4e435ccac set default values for baseColorFactor so that it has correct values when parsing a material without a pbrMetallicRoughness struct 2019-10-18 18:22:35 +02:00
Selmar Kok
006fe0e06c add some missing serialization // add mesh==() weights comparison // use const iterator for extension serialization 2019-10-18 16:08:44 +02:00
Syoyo Fujita
4668a1f061 Do not serialize pbrMetallicRoughness when they have all default values. Fixes #204 2019-09-13 15:32:22 +09:00
Arthur Brainville (Ybalrid)
b098ebea2f Fix copy-assignment operator 
When manual move constructor are declared, C++ compilers deletes the
copy constructor and copy-assign operator.

Most of these structures recently got a move ctor added, and copy ctor
re-enabled ( = default ). But copy-assignment are missing, thus in some
context, breaking instantiations of templates like std::vector<>.
 2019-09-05 13:02:05 +02:00
Syoyo Fujita
5be7b3bb61 Suppress variable-is-shadowed warnings. 
Apply clang-format.
Add note on RapidJSON and C++14 compilation flags.
 2019-09-05 14:40:32 +09:00
jrkoonce
40cf075785 Removing warnings 2019-09-04 13:46:45 -05:00
jrkoonce
5ab6a109b1 Support simultaneous gltf load/saves 
Added support for RapidJSON's CrtAllocator which is stateless and allows multiple documents to be in use at once, removing that restriction on default documents.  Enable with TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR
 2019-09-04 13:31:44 -05:00
jrkoonce
c1be95f167 Revert "Support simultaneous gltf load/saves" 
This reverts commit 6c81ffca8f.
 2019-09-04 13:30:02 -05:00
jrkoonce
6c81ffca8f Support simultaneous gltf load/saves 
Added support for RapidJSON's CrtAllocator which is stateless and allows multiple documents to be in use at once, removing that restriction on default documents.  Enable with TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR
 2019-09-04 12:19:27 -05:00
jrkoonce
86fd5819da Revert "Support simultaneous gltf load/saves (TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR)" 
This reverts commit 2a6fda6e9c.
 2019-09-04 12:15:51 -05:00
jrkoonce
2a6fda6e9c Support simultaneous gltf load/saves (TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR) 
This allows multiple gltf's to be loaded/saved in parallel.  It removes the restriction of a single JsonDocument active at once which is default behavior.  Enable with TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR
 2019-09-04 12:01:39 -05:00
jrkoonce
1060872f0d Fix Compiler Warnings 2019-09-04 10:50:55 -05:00
jrkoonce
9dea81428d Revert accidental committed change 
Put "JsonX" helpers back in anonymous namespace to keep them inside local translation unit.
 2019-09-03 17:06:41 -05:00
jrkoonce
1ecd828e27 Fixed Bugs/Unit Tests Pass 
Fixed bugs found by unit tests and got unit tests running with RapidJSON as well as nlohmann.
 2019-09-03 15:56:48 -05:00
jrkoonce
5b6eec110d Fixed move bugs 2019-09-03 10:42:39 -05:00
jrkoonce
1a9f68f933 Merge branch 'pr/1' 2019-09-03 10:30:19 -05:00
jrkoonce
d241703dd2 Made C++14 optional, default off. 2019-09-03 09:48:30 -05:00
Syoyo Fujita
e000c3094a Merge pull request #200 from ux3d/feature/allow-scenes-without-nodes 
allow scenes without nodes
 2019-09-02 22:12:15 +09:00
Benjamin Schmithüsen
67a4a96803 remove extra parenthesis 2019-09-02 13:43:24 +02:00
Benjamin Schmithüsen
3e8a0d9c55 don't fail if a scene has no nodes property (which is not required) 2019-09-02 13:41:59 +02:00
Syoyo Fujita
c6254a4fad Rename typeSizeInBytes to numComponents. 2019-08-30 19:19:52 +09:00
DingboDingboDingbo
6d32726edf GetTypeSizeInBytes not returning Type Size In Bytes 
Changed name to be less misleading.
 2019-08-29 18:49:15 -04:00
jrkoonce
176b41d5db Fix bug in ParseNumberArrayProperty() 
Only doubles were being accepted instead of any number (including ordinals)
 2019-08-29 13:56:58 -05:00
jrkoonce
e7bf47ac8a More cleanup 
1. Reserve array memory when converting JSON to Value for heap efficiency.
2. Grouped more JSON abstraction functions together and put in anonymous namespace instead of making each static.
 2019-08-29 11:45:04 -05:00
jrkoonce
cfdf552137 RapidJson 1.1 support + More move semantics 
*Support for RapidJson 1.1, use TINYGLTF_USE_RAPIDJSON to toggle between RapidJson and nlohmann

*Lot more move semantics enabled.  All parsing and serialization now move all json objects with far fewer copies
 2019-08-29 11:26:22 -05:00
jrkoonce
37f8c09e5a Update tiny_gltf.h 
Add/Enable move semantics to most all structs/classes
 2019-08-27 11:51:02 -05:00
Syoyo Fujita
19c394de3f Apply clang format. 
Remove `const static std::string` global variable.
 2019-08-24 16:29:14 +09:00
Syoyo Fujita
8733047d09 Add Set/Get SerializeDefaultValues method(W.I.P.) 2019-08-21 14:23:00 +09:00
Syoyo Fujita
d44eccda9a Merge pull request #195 from ux3d/fix/parse-int-as-double 
(also) parse int as double
 2019-08-20 19:33:20 +09:00
Syoyo Fujita
8935b0120e Merge branch 'master' of github.com:syoyo/tinygltf 2019-08-20 17:11:29 +09:00
Syoyo Fujita
f20f38ac5e Suppress clang warnings. 2019-08-20 17:10:30 +09:00
Benjamin Schmithüsen
ab4280c8c1 when parsing a number from an int, also set the 'real value' to the value 2019-08-19 16:16:43 +02:00
Selmar Kok
0bf4804fa9 [emissiveFactor] correct default values 2019-08-19 11:23:31 +02:00
Selmar Kok
a67e3142b6 [emissiveFactor] fix inconsistency with baseColorFactor where default values were set only for baseColorFactor and not emissiveFactor 2019-08-19 11:05:28 +02:00
Selmar Kok
360fcceffd Merge branch 'master' of github.com:syoyo/tinygltf into animation_extension_properties 2019-08-16 17:54:14 +02:00