965 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Syoyo Fujita	d6b0d0a61f	Explicitly define copy constructor and copy assignment operator for Model an Node.	2019-06-29 17:31:13 +09:00
Syoyo Fujita	5f180aaf74	Merge pull request #171 from Ybalrid/fix_double_parse_material_name ... Material names are stored once in material.name, then duplicated in "additionalValues"	2019-06-24 14:06:55 +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
Syoyo Fujita	0ccc8dc262	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)	811e1d3899	Fix C4267 warning (size_t -> int) convertion	2019-06-15 07:32:38 +02:00
Syoyo Fujita	f65e06c5ca	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)	f29ae1a653	Remove Mesh::targets, as targets only exists inside Primitive	2019-05-25 22:30:55 +02:00
Syoyo Fujita	3bf16e4be5	Merge branch 'master' of github.com:syoyo/tinygltf	2019-05-16 16:55:09 +09:00
Syoyo Fujita	fbc4295770	Remove CATMULLROMSPLINE, which was removed in the final glTF 2.0 spec.	2019-05-16 16:54:28 +09:00
Syoyo Fujita	edf8d5cae1	Merge pull request #164 from DiligentGraphics/master ... Updated readme: added link to Diligent Engine	2019-05-09 12:47:24 +09:00
DiligentGraphics	b7f2473225	Updated readme: added link to Diligent Engine	2019-05-08 18:33:26 -07:00
Syoyo Fujita	ed7bf66255	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	caa36dd050	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	389d5016ad	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	d02ad0dede	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	8f67121deb	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	62be8d04cf	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	d11a4c4d71	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	19b806e052	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	e0ab69cb31	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	8915252407	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	9446f65667	Set up tests to run in travis-ci and ignore test outputs in .gitignore	2019-04-25 16:26:26 -07:00
Syoyo Fujita	fb9f709166	Merge pull request #157 from Selmar/patch-1 ... correct Value::Equals mistake	2019-04-17 03:19:00 +09:00
Selmar	a63cc6373d	correct Value::Equals mistake ... a missing exclamation mark... ^^	2019-04-16 16:57:43 +02:00
Syoyo Fujita	b3c1471317	Merge pull request #155 from ffreling/accessor-normalized ... Serialize accessor 'normalized' attribute.	2019-03-22 01:32:34 +09:00
Fabien Freling	9056aee823	Serialize accessor 'normalized' attribute.	2019-03-21 17:06:22 +01:00
Syoyo Fujita	29c431b2f2	Add build option with draco in Makefile. v2.2.0	2019-03-08 14:01:06 +09:00
Syoyo Fujita	d06b2c2022	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	339c9d578a	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	7c315fa8a8	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	0f04ed018a	fix a few typos in README.md	2019-03-07 13:23:59 +01:00
Syoyo Fujita	ca56f726d6	Merge branch '16bit-lodepng'	2019-03-07 21:04:25 +09:00
Syoyo Fujita	e8a46c4e1d	Update README. ... Check bit depth when saving image as PNG.	2019-03-07 20:50:58 +09:00
Syoyo Fujita	9cd14a461b	Update README.	2019-03-07 01:05:02 +09:00
Syoyo Fujita	1ef603ea2a	Merge pull request #150 from Ybalrid/sparse_accessor ... Sparse accessor	2019-03-07 00:49:29 +09:00
Arthur Brainville (Ybalrid)	14d259f361	glview can now load static geometry modified by sparse accessor	2019-03-06 14:48:44 +00:00
Arthur Brainville (Ybalrid)	9223d3133a	Ran clang-format on tiny_gltf.h	2019-03-06 14:00:56 +00:00
Arthur Brainville (Ybalrid)	9b321a8515	clang-format + added sparse accessor in loader_example	2019-03-06 12:39:39 +00:00
Arthur Brainville (Ybalrid)	7e9f734d73	Parse sparse accessors	2019-03-06 12:27:23 +00:00
Arthur Brainville (Ybalrid)	9d86405d3d	Fix accessor ctor	2019-03-06 11:33:30 +00:00
Arthur Brainville (Ybalrid)	1ccb4ff580	added sparse structure to accessors	2019-03-06 11:30:00 +01:00
Syoyo Fujita	8fd91aea04	Update TinyEXR.	2019-03-04 02:15:03 +09:00
Syoyo Fujita	8f76d790b8	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)	853f6df7b5	Simplify byteswap code to convert to big endian 16bit	2019-03-03 16:26:20 +01:00
Syoyo Fujita	758a1240c9	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	7bdfed3bec	Add lodepng to save 16bit PNG. ... Suppress clang/gcc warnings.	2019-03-03 17:04:49 +09:00
Syoyo Fujita	bf9c2f4abd	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	fc0116b323	rename TINYGLTF_BYPASS_INCLUDE_x to TINYGLTF_NO_INCLUDE_x	2019-03-03 08:28:49 +02:00
Syoyo Fujita	962552c5c8	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	606e5dde31	be more precise in readme about include bypassing flags	2019-03-03 01:56:34 +02:00