GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-06 09:55:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
965 Commits 46 Branches 37 Tags
Commit Graph

965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
aea514a975
Merge pull request #216 from harokyang/feature/utf8_path 
Feature/utf8 path
 2019-10-30 17:40:22 +09:00
Harokyang
05a4456948 fix build error on C++11/C++14 2019-10-30 16:30:00 +08:00
Syoyo Fujita
6e08b17ce3 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
fb256609f2 support writing with utf-8 filepath 2019-10-30 16:14:10 +08:00
Harokyang
5cecef2b92 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
1100f0f1eb 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
2b66c81f67
Merge pull request #212 from Selmar/move_operator 
Move semantics
 2019-10-30 15:11:26 +09:00
Selmar Kok
f29375f59b revert some local modifications, oops.... >_> 2019-10-29 16:25:37 +01:00
Selmar Kok
79e3df26a8 replace TINYGLTF_USE_NO_EXCEPT with GNU compiler version check 2019-10-29 16:22:07 +01:00
Selmar Kok
e3cf5edb94 Merge remote-tracking branch 'origin/Selmar-move_operator' into move_operator 2019-10-29 16:09:40 +01:00
Selmar Kok
b74fadef8e TINYGLTF_USE_NOEXCEPT 2019-10-29 16:09:32 +01:00
Syoyo Fujita
a11709a9ff
Merge pull request #213 from dmuir/master 
Validate model_length against length in LoadBinaryFromMemory.
 2019-10-29 02:20:31 +09:00
Doug Muir
cf668683f9 Fix check for invalid glTF to consider invalid length/model_length combinations. 2019-10-28 09:51:13 -07:00
Syoyo Fujita
817bbcfb58 Show clang version in Travis build. 2019-10-23 00:41:40 +09:00
Selmar Kok
23467959ca pbrMetallicRoughnes default noexcept move operator 2019-10-21 19:23:15 +02:00
Selmar Kok
6f08785e9f Merge remote-tracking branch 'origin/master' into move_operator 2019-10-21 17:58:57 +02:00
Selmar Kok
ff2b1f92dd use default noexcept move constructor / operator 2019-10-21 17:58:09 +02:00
Syoyo Fujita
e886247329 Fix parsing a glTF file with 2GB+ or lareger size. 2019-10-20 17:47:50 +09:00
Syoyo Fujita
83bb1a48d7
Merge pull request #211 from Selmar/add_missing_serialization 
small serialization additions
 2019-10-19 15:18:19 +09:00
Selmar Kok
c3353e1acd 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
81b672bcc2 add some missing serialization // add mesh==() weights comparison // use const iterator for extension serialization 2019-10-18 16:08:44 +02:00
Syoyo Fujita
cece6ee6d2
Merge pull request #209 from patriciogonzalezvivo/master 
Adding glslViewer
 2019-10-08 19:21:51 +09:00
Patricio Gonzalez Vivo
31f875ddbc adding glslViewer 2019-10-08 03:07:58 -07:00
Syoyo Fujita
8dccf9bf4e
Merge pull request #208 from toshiks/patch-1 
Added project to Readme.md (QuickLook GLTF plugin)
 2019-09-15 14:50:06 +09:00
Anton Klochkov
508dcfa2e6
Added project to Readme.md (QuickLook GLTF plugin) 2019-09-15 01:25:47 +03:00
Syoyo Fujita
7e009041e3 Do not serialize pbrMetallicRoughness when they have all default values. Fixes #204 2019-09-13 15:32:22 +09:00
Syoyo Fujita
14977937c2 Add a link to Lighthouse 2. 2019-09-09 20:07:54 +09:00
Syoyo Fujita
8bb18fbd9c
Merge pull request #202 from Ybalrid/fix_copy_assignment_operator 
Fix broken copy-assignment operators
 2019-09-06 13:58:54 +09:00
Arthur Brainville (Ybalrid)
9eeaf20133 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
a34aa8ea77 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
Syoyo Fujita
59b2966f81 Merge branch 'master' of https://github.com/jrkoonce/tinygltf into jrkoonce-master 2019-09-05 14:22:51 +09:00
jrkoonce
7481011fd9 Removing RapidJSON toggle 2019-09-04 13:46:59 -05:00
jrkoonce
0d2b6efa6f Removing warnings 2019-09-04 13:46:45 -05:00
jrkoonce
ce7fa7419b 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
906f98fa74 Revert "Support simultaneous gltf load/saves" 
This reverts commit d2a2703ec59fcd86f546c350f68502199eded8e6.
 2019-09-04 13:30:02 -05:00
jrkoonce
d2a2703ec5 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
95f05757d6 Revert "Support simultaneous gltf load/saves (TINYGLTF_USE_RAPIDJSON_CRTALLOCATOR)" 
This reverts commit ab63db63188375dfa4f4b70383365c9b3f0a85b4.
 2019-09-04 12:15:51 -05:00
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
Syoyo Fujita
c29bd3d9ce Use const reference for Buffer to fix compilation. 
Removed UTF BOM?
 2019-09-04 14:26:58 +09: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