562 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arthur Brainville (Ybalrid)	3d3abb4d2c	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
Syoyo Fujita	53c0ce3568	Merge pull request #170 from Ybalrid/msvc_warn_fix ... Fix C4267 warning (size_t -> int) convertion	2019-06-15 15:58:03 +09:00
Arthur Brainville (Ybalrid)	62235695d0	Fix C4267 warning (size_t -> int) convertion	2019-06-15 07:32:38 +02:00
Syoyo Fujita	ec5f0a3653	Merge pull request #169 from Ybalrid/remove_mesh_targets ... Remove Mesh::targets, as targets only exists inside `Primitive`	2019-05-26 16:23:46 +09:00
Arthur Brianville (Ybalrid)	d53dba0ae1	Remove Mesh::targets, as targets only exists inside Primitive	2019-05-25 22:30:55 +02:00
Syoyo Fujita	1cc4353ed8	Merge branch 'master' of github.com:syoyo/tinygltf	2019-05-16 16:55:09 +09:00
Syoyo Fujita	33629293f9	Remove CATMULLROMSPLINE, which was removed in the final glTF 2.0 spec.	2019-05-16 16:54:28 +09:00
Syoyo Fujita	d7566f59ae	Merge pull request #164 from DiligentGraphics/master ... Updated readme: added link to Diligent Engine	2019-05-09 12:47:24 +09:00
DiligentGraphics	4f19fb156e	Updated readme: added link to Diligent Engine	2019-05-08 18:33:26 -07:00
Syoyo Fujita	4e832b7872	Merge pull request #162 from ux3d/master ... add REQUIRE_VERSION to gltf validation and use it as default instead of REQUIRE_ALL	2019-05-03 15:08:36 +09:00
Syoyo Fujita	8edf30416d	Merge pull request #163 from jwmcglynn/fix-test-gltfs-standalone ... Add "asset" section to BoundsChecking test models	2019-05-03 15:06:38 +09:00
Jeff McGlynn	f1819b947d	Add "asset" section to BoundsChecking test models ... These test assets were trimmed down and erroneously didn't have an "asset" section or version number, which is required by the glTF spec. This fixes test failures with pull request #162.	2019-05-02 23:05:13 -07:00
Benjamin Schmithüsen	dab2402cac	add REQUIRE_VERSION to gltf validation and use it as default instead of REQUIRE_ALL	2019-05-02 14:44:20 +02:00
Syoyo Fujita	576146c79e	Merge pull request #161 from rainliang000/patch-1 ... if image.uri empty, should use image.bufferView	2019-04-29 17:48:47 +09:00
rainliang000	8e0a60213e	if image.uri empty, should use bufferview ... if uri empty, shoud use mimeType and bufferview	2019-04-29 09:54:27 +08:00
Syoyo Fujita	f138744e2b	Merge pull request #160 from jwmcglynn/parse-integer ... Parse integers directly instead of casting doubles	2019-04-27 14:57:54 +09:00
Jeff McGlynn	469e039169	Parse integers directly instead of casting doubles ... When parsing numeric values as doubles, its possible for users to specify values that cannot be converted to integers, such as Inf, NaN, and extremes such as 1e100. If this value is received, and then cast to an int, it is undefined behavior, which trips ubsan when running tinygltf under a fuzzer. Instead of parsing integral values as doubles, use nlohmann/json's built-in support to parse integer and unsigned values directly, with .is_number_integer() and .is_number_unsigned(). Add ParseIntegerProperty, ParseUnsignedProperty, and ParseIntegerArrayProperty helpers that allow parsing directly to int/uint values and update code to use them when appropriate.	2019-04-26 17:20:50 -07:00
Syoyo Fujita	8f82515085	Merge pull request #158 from jwmcglynn/bounds-checking ... Add checks for boundary conditions for malformed glTF files	2019-04-26 12:56:21 +09:00
Jeff McGlynn	38657337fc	Add checks for boundary conditions for malformed glTF files ... When loading untrusted glTF files, ideally an error should be returned if the file is malformed instead of an exception/crash. Add additional validation for crashes found when running tinygltf under a fuzzer, and add test cases to confirm: 1. Validate that the primitive indices value is within the model->accessors bounds before dereferencing. 2. Validate that the accessors bufferView index if valid. 3. Validate that the buffer's index is valid when parsing images. 4. For glb files, validate that the overall length is within the provided input buffer.	2019-04-25 16:51:09 -07:00
Jeff McGlynn	80781214df	Set up tests to run in travis-ci and ignore test outputs in .gitignore	2019-04-25 16:26:26 -07:00
Syoyo Fujita	c80f1c8a0f	Merge pull request #157 from Selmar/patch-1 ... correct Value::Equals mistake	2019-04-17 03:19:00 +09:00
Selmar	2d5f6dcbd7	correct Value::Equals mistake ... a missing exclamation mark... ^^	2019-04-16 16:57:43 +02:00
Syoyo Fujita	bc105bb7d8	Merge pull request #155 from ffreling/accessor-normalized ... Serialize accessor 'normalized' attribute.	2019-03-22 01:32:34 +09:00
Fabien Freling	35ac2aea2c	Serialize accessor 'normalized' attribute.	2019-03-21 17:06:22 +01:00
Syoyo Fujita	f08ccba829	Add build option with draco in Makefile. v2.2.0	2019-03-08 14:01:06 +09:00
Syoyo Fujita	521f23064b	Merge pull request #154 from Ybalrid/patch-3 ... Fix the display of the version history	2019-03-08 13:32:31 +09:00
Arthur Brainville	83c778be06	Fix the display of the version history ... Markdown is like HTML: simple line-breaks don't work. Besides, making a list with dots here looks nicer :)	2019-03-07 19:40:57 +01:00
Syoyo Fujita	2b84242600	Merge pull request #153 from Ybalrid/patch-2 ... fix a few typos in README.md	2019-03-07 21:30:20 +09:00
Arthur Brainville	07ed27f4e5	fix a few typos in README.md	2019-03-07 13:23:59 +01:00
Syoyo Fujita	11656a589f	Merge branch '16bit-lodepng'	2019-03-07 21:04:25 +09:00
Syoyo Fujita	0f2506725f	Update README. ... Check bit depth when saving image as PNG.	2019-03-07 20:50:58 +09:00
Syoyo Fujita	52b331b95e	Update README.	2019-03-07 01:05:02 +09:00
Syoyo Fujita	e981c8994b	Merge pull request #150 from Ybalrid/sparse_accessor ... Sparse accessor	2019-03-07 00:49:29 +09:00
Arthur Brainville (Ybalrid)	5cf468ce1c	glview can now load static geometry modified by sparse accessor	2019-03-06 14:48:44 +00:00
Arthur Brainville (Ybalrid)	fb43948c7f	Ran clang-format on tiny_gltf.h	2019-03-06 14:00:56 +00:00
Arthur Brainville (Ybalrid)	f3898ae012	clang-format + added sparse accessor in loader_example	2019-03-06 12:39:39 +00:00
Arthur Brainville (Ybalrid)	e95d35c7b2	Parse sparse accessors	2019-03-06 12:27:23 +00:00
Arthur Brainville (Ybalrid)	83f0a1e1fe	Fix accessor ctor	2019-03-06 11:33:30 +00:00
Arthur Brainville (Ybalrid)	edf81ce458	added sparse structure to accessors	2019-03-06 11:30:00 +01:00
Syoyo Fujita	5a4e3ef6e9	Update TinyEXR.	2019-03-04 02:15:03 +09:00
Syoyo Fujita	378927c804	Merge pull request #148 from Ybalrid/16bit-lodepng-good-byteswap ... When writing out a 16bit image with lodepng, simplify the byteswap to big-endian	2019-03-04 01:15:20 +09:00
Arthur Brainville (Ybalrid)	ad65b5949d	Simplify byteswap code to convert to big endian 16bit	2019-03-03 16:26:20 +01:00
Syoyo Fujita	8978bdd6a3	Reorder 16 bit pixel data to big endian when saving it as 16 png, since lodepng::encode expects image data is in big endian manner. ... Add OpenEXR saver for 16bit image as a bonus.	2019-03-03 21:21:18 +09:00
Syoyo Fujita	f5dcd85c34	Add lodepng to save 16bit PNG. ... Suppress clang/gcc warnings.	2019-03-03 17:04:49 +09:00
Syoyo Fujita	deff077560	Merge pull request #146 from WARP-LAB/master ... Fix for when json and stb is aready used in project	2019-03-03 15:31:09 +09:00
kroko	640898750b	rename TINYGLTF_BYPASS_INCLUDE_x to TINYGLTF_NO_INCLUDE_x	2019-03-03 08:28:49 +02:00
Syoyo Fujita	49acb85a78	Merge pull request #145 from Ybalrid/upgrade_stb_libs ... Upgrade the STB libraries, and fix #132	2019-03-03 13:39:10 +09:00
kroko	009f7d4cbb	be more precise in readme about include bypassing flags	2019-03-03 01:56:34 +02:00
kroko	12fc2afc9f	Fix for when json and stb is aready used in project v2	2019-03-03 01:28:45 +02:00
kroko	3fadc0a664	Fix for when json and stb is aready used in project	2019-03-03 01:11:31 +02:00