Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-08-04 12:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
669 Commits 5 Branches 41 Tags
24fdf47392f826ea12dbdd2b3f87f0c6485beec6
Commit Graph

669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
24fdf47392 Merge pull request #219 from syoyo/travis-gcc-4.8 
Travis gcc 4.8
 2019-10-31 19:34:33 +09:00
Syoyo Fujita
9ea5c88a66 Fix travis script. 2019-10-31 02:17:22 +09:00
Syoyo Fujita
36cc729aba Introduce TINYGLTF_BUILD_EXAMPLES option to CMakeLists.txt. Fixes #218 2019-10-31 01:55:57 +09:00
Syoyo Fujita
aefe6e8449 Add gcc-4.8 build on Travis. 2019-10-31 01:02:43 +09:00
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
Syoyo Fujita
ab04376fa4 Merge pull request #216 from harokyang/feature/utf8_path 
Feature/utf8 path
 2019-10-30 17:40:22 +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
8574834f66 Merge remote-tracking branch 'origin/Selmar-move_operator' into move_operator 2019-10-29 16:09:40 +01:00
Selmar Kok
b7f6b0ae23 TINYGLTF_USE_NOEXCEPT 2019-10-29 16:09:32 +01:00
Syoyo Fujita
67cc11d5f4 Merge pull request #213 from dmuir/master 
Validate model_length against length in LoadBinaryFromMemory.
 2019-10-29 02:20:31 +09:00
Doug Muir
633a74e6cc Fix check for invalid glTF to consider invalid length/model_length combinations. 2019-10-28 09:51:13 -07:00
Syoyo Fujita
6e97d22f2b Show clang version in Travis build. 2019-10-23 00:41:40 +09: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
Syoyo Fujita
fd009790ef Merge pull request #211 from Selmar/add_missing_serialization 
small serialization additions
 2019-10-19 15:18:19 +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
45ccfda5bb Merge pull request #209 from patriciogonzalezvivo/master 
Adding glslViewer
 2019-10-08 19:21:51 +09:00
Patricio Gonzalez Vivo
6249d917d3 adding glslViewer 2019-10-08 03:07:58 -07:00
Syoyo Fujita
c9256eaf71 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
8992e69cc3 Added project to Readme.md (QuickLook GLTF plugin) 2019-09-15 01:25:47 +03:00
Syoyo Fujita
4668a1f061 Do not serialize pbrMetallicRoughness when they have all default values. Fixes #204 2019-09-13 15:32:22 +09:00
Syoyo Fujita
3a1e8fcec2 Add a link to Lighthouse 2. 2019-09-09 20:07:54 +09:00
Syoyo Fujita
04d5108af5 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)
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
Syoyo Fujita
9bc8ddc2cb Merge branch 'master' of https://github.com/jrkoonce/tinygltf into jrkoonce-master 2019-09-05 14:22:51 +09:00
jrkoonce
8271949eed Removing RapidJSON toggle 2019-09-04 13:46:59 -05: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
Syoyo Fujita
be20d6d266 Use const reference for Buffer to fix compilation. 
Removed UTF BOM?
 2019-09-04 14:26:58 +09: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