GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-11 23:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
845 Commits 46 Branches 37 Tags
Commit Graph

302 Commits

Author SHA1 Message Date
jrkoonce
ab63db6318 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
6ff95392b0 Fix Compiler Warnings 2019-09-04 10:50:55 -05:00
jrkoonce
63419a11e1 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
06c30c4d04 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
67e6160a9a Fixed move bugs 2019-09-03 10:42:39 -05:00
jrkoonce
a3b8b355ae Merge branch 'pr/1' 2019-09-03 10:30:19 -05:00
jrkoonce
5145394239 Made C++14 optional, default off. 2019-09-03 09:48:30 -05:00
Syoyo Fujita
67aa2ca75e
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
ce25385eab remove extra parenthesis 2019-09-02 13:43:24 +02:00
Benjamin Schmithüsen
6143c6662b don't fail if a scene has no nodes property (which is not required) 2019-09-02 13:41:59 +02:00
Syoyo Fujita
81d75df48a Rename typeSizeInBytes to numComponents. 2019-08-30 19:19:52 +09:00
DingboDingboDingbo
83ccb9f28d
GetTypeSizeInBytes not returning Type Size In Bytes 
Changed name to be less misleading.
 2019-08-29 18:49:15 -04:00
jrkoonce
9b6f52e98a Fix bug in ParseNumberArrayProperty() 
Only doubles were being accepted instead of any number (including ordinals)
 2019-08-29 13:56:58 -05:00
jrkoonce
5cecc41db9 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
cba5d6caae 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
d1e1472992 Update tiny_gltf.h 
Add/Enable move semantics to most all structs/classes
 2019-08-27 11:51:02 -05:00
Syoyo Fujita
ff51570c26 Apply clang format. 
Remove `const static std::string` global variable.
 2019-08-24 16:29:14 +09:00
Syoyo Fujita
a472a3fa0f Add Set/Get SerializeDefaultValues method(W.I.P.) 2019-08-21 14:23:00 +09:00
Syoyo Fujita
1f160d5b8f
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
5150a46072 Merge branch 'master' of github.com:syoyo/tinygltf 2019-08-20 17:11:29 +09:00
Syoyo Fujita
cea69e37a5 Suppress clang warnings. 2019-08-20 17:10:30 +09:00
Benjamin Schmithüsen
c7e205be87 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
6dba6c6aac [emissiveFactor] correct default values 2019-08-19 11:23:31 +02:00
Selmar Kok
6df800d2b6 [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
af5a5ef026 Merge branch 'master' of github.com:syoyo/tinygltf into animation_extension_properties 2019-08-16 17:54:14 +02:00
Benjamin Schmithüsen
74c3c10121 serialize node weights 2019-08-16 14:24:26 +02:00
Benjamin Schmithüsen
ad63bf748b parse node weights 2019-08-16 14:19:27 +02:00
Selmar Kok
5d43cf8e64 Merge branch 'master' of github.com:syoyo/tinygltf 2019-08-16 14:08:31 +02:00
Selmar Kok
4e2988eebd add extension property for Animation and AnimationChannel 2019-08-16 14:08:08 +02:00
Syoyo Fujita
ee179b2cb6 Set default value of minFilter and magFilter in Sampler to -1(unset), since glTF 2.0 spec does not declare default values for it. 
Fixes #186
 2019-08-16 13:11:30 +09:00
Syoyo Fujita
4ebd6368fb Fix inequality of texture index check when serializing texture of material. 
Texture info was written even if it have invalid index(-1). Fixes #189
 2019-08-15 12:25:50 +09:00
Patrick Härtl
d9a468bbb4 Fixed saving of alphaMode if not OPAQUE 
Removed duplicated code for alphaCutoff
 2019-08-14 14:14:07 +02:00
Benjamin Schmithüsen
1c84fc22a5 fix default value checks for serialization 2019-07-25 16:07:27 +02:00
Syoyo Fujita
150f243b1b Change the behavior of NUMBER value in Value class. NUMBER now reprents the value is either int or real(floating point). 2019-07-25 19:22:44 +09:00
Syoyo Fujita
046400b17f Now material is parsed as a struct with explicit parameter definitions. 
Implement Material struct serialization.
 2019-07-24 19:26:48 +09:00
Syoyo Fujita
89fd93f815 Introduce TextureInfo class(W.I.P.) 2019-07-23 22:37:06 +09:00
Syoyo Fujita
e940337796
Merge pull request #180 from ux3d/master 
Explicitly use the correct constructor for empty object
 2019-07-23 18:55:34 +09:00
Johan Bowald
52936a00e0 clang format 2019-07-17 09:06:45 +02:00
Benjamin Schmithüsen
f3ef880029 call json constructor explicitly 2019-07-16 17:07:45 +02:00
Johan Bowald
1af7c1d784 can write to streams 2019-07-16 15:56:18 +02:00
Benjamin Schmithüsen
051f4be2f1 serialize lights 2019-07-09 17:59:20 +02:00
Benjamin Schmithüsen
4557b6aa22 fix spot light parsingg 2019-07-09 16:55:55 +02:00
Benjamin Schmithüsen
b2d7d88dbc parse additional light properties and fix defaults 2019-07-09 16:32:42 +02:00
Benjamin Schmithüsen
b7ca7c9381 update lights to follow the KHR_lights_punctual extension 2019-07-08 18:04:24 +02:00
Arthur Brianville (Ybalrid)
2a9d9deb67 Applied clang-format 2019-07-05 00:30:47 +02:00
Arthur Brainville
8a98d98cd9 Add Paramter::TextureStrength(). Precise default values. 
The default values on these methods as been set to what is described [here](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0?ts=4#normaltextureinfo) and [here](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0?ts=4#occlusiontextureinfo).

This is to keep consistent with the API behavior from #144
 2019-07-05 00:30:20 +02:00
Christophe
820ede87db Adding texture scale reading (for normal maps) + asset copyright and texture names to the export 2019-07-04 15:21:21 +09:00
Syoyo Fujita
d6b0d0a61f Explicitly define copy constructor and copy assignment operator for Model an Node. 2019-06-29 17:31:13 +09:00
Arthur Brainville (Ybalrid)
dab0daaedf Material names are stored once in material.name, then duplicated in "additionalValues" 
This patch prevent this duplication
 2019-06-23 21:50:10 +02:00
Arthur Brainville (Ybalrid)
811e1d3899 Fix C4267 warning (size_t -> int) convertion 2019-06-15 07:32:38 +02:00