965 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
viperscape	9df05806ad	find missing bufferView target types and fill them in	2018-12-05 14:11:01 -05:00
Chris Gill	93db9e20c0	Merge pull request #1 from syoyo/master ... update to latest	2018-12-05 13:03:44 -05:00
Syoyo Fujita	2c5597f591	Merge pull request #115 from Selmar/serialization_fixes ... some serialization fixes	2018-12-06 02:05:26 +09:00
Tan Meng Yue	2dcf79566f	Add CMake configuration for glview ... So that we can build more of the examples consistently with CMake	2018-12-05 23:56:23 +11:00
Tan Meng Yue	f20888ae8b	Added top level CMake configuration file	2018-12-05 23:55:53 +11:00
Selmar Kok	5892d3e3ea	Set a default for sampler.wrapR, because it was serializing an uninitialized value	2018-12-04 19:55:56 +01:00
Selmar Kok	27aab61d62	Fix prettyprint to really not print pretty	2018-11-30 18:01:31 +01:00
Syoyo Fujita	d80f0f9a6c	Merge pull request #111 from viperscape/master ... This is a basic example I added after figuring out how to use the tinygltf library	2018-11-16 14:01:13 +09:00
Syoyo Fujita	5110820ebb	Merge pull request #110 from AlvaroBarua/warnings_cleanup ... Removed unreachable code and fixed ambiguity warning.	2018-11-16 14:00:33 +09:00
viperscape	c3e34c2ff7	add screenshot	2018-11-15 17:03:38 -05:00
viperscape	0ddfaead8f	add basic example	2018-11-15 17:02:20 -05:00
Unknown	ae2cf8e26f	Removed unreachable code and fixed ambiguity warning.	2018-11-15 18:36:59 +00:00
Syoyo Fujita	8b7cdde30c	Merge pull request #109 from viperscape/master ... Windows build with provided VS solution	2018-11-15 00:28:06 +09:00
viperscape	764bcb5a8a	add win32 includes	2018-11-14 10:19:39 -05:00
viperscape	50ada7ff11	rework to include VS 2017 project, fully configured and tested	2018-11-14 10:15:58 -05:00
Syoyo Fujita	16fae080f9	Merge branch 'master' of github.com:syoyo/tinygltf	2018-11-10 20:08:02 +09:00
Syoyo Fujita	90c0008b0e	Merge branch 'loomai-master'	2018-11-10 20:07:47 +09:00
Syoyo Fujita	b572650d26	Merge branch 'master' of https://github.com/loomai/tinygltf into loomai-master	2018-11-10 20:07:15 +09:00
Syoyo Fujita	6af9e886cd	Merge pull request #107 from Selmar/serialization_fixes ... Add missing serialization of `sampler.wrapR`	2018-11-10 02:32:56 +09:00
Selmar Kok	60f97325b1	Merge remote-tracking branch 'origin/master' into serialization_fixes	2018-11-09 10:34:55 +01:00
Selmar Kok	a3595488e3	Fix missing serialization: sampler.wrapR	2018-11-09 10:34:39 +01:00
Syoyo Fujita	cf60322e73	Merge pull request #105 from rapidimages/bugfix/write_image_to_disk ... Fixed a reference error which cause an error when writing images to disk	2018-11-07 00:56:34 +09:00
Johan Bowald	77decfaff8	fixed a reference error which cause an error when writing images to disk	2018-11-06 14:28:20 +01:00
Syoyo Fujita	e26117e026	Merge branch 'master' of github.com:syoyo/tinygltf	2018-11-05 13:33:27 +09:00
Syoyo Fujita	33514af61a	Fix logic error. Fixes #104	2018-11-05 13:32:43 +09:00
Syoyo Fujita	ba3c3c99ef	Merge pull request #102 from 1div0/master ... Building glview failed	2018-10-28 15:30:21 +09:00
Syoyo Fujita	8d96b4a14e	Merge pull request #103 from Selmar/serialization_fixes ... [serialization] handle failing buffer file writes	2018-10-26 02:12:24 +09:00
Selmar Kok	1cef6dcf33	Merge remote-tracking branch 'origin/master' into serialization_fixes	2018-10-25 16:48:14 +02:00
Selmar Kok	e46774940c	fail serialization if a buffer file fails to be written (e.g. due to access rights)	2018-10-25 16:45:49 +02:00
Peter Kovář	dddaee695d	Merge branch 'master' of https://github.com/1div0/tinygltf	2018-10-17 15:30:33 +02:00
Peter Kovář	a645cfc840	Added include directory ../common/ for trackball.h	2018-10-17 15:29:56 +02:00
Peter Kovář	040310e0d3	Added include direectory ../common/ for trackball.h	2018-10-17 15:24:59 +02:00
Syoyo Fujita	d9eddbfeb9	Merge pull request #101 from 1div0/master ... make lint	2018-10-16 19:11:17 +09:00
Peter Kovář	10365a53ff	Fixed make lint	2018-10-16 12:03:45 +02:00
Peter Kovář	d0e293fd7d	Fixed typos	2018-10-16 12:00:24 +02:00
Syoyo Fujita	3b25d9130a	Merge pull request #100 from Selmar/serialization_fixes ... yet another serialization fix	2018-10-11 01:25:12 +09:00
Selmar Kok	db7f4e4d04	fix an issue when serializing an empty extension object would serialize as type null (and thus deserialize as type null, causing it to be ignored)	2018-10-10 18:10:58 +02:00
Syoyo Fujita	30bbe0fe3c	Merge pull request #99 from Selmar/serialization_fixes ... Pretty print & some (de)serialization fixes	2018-10-09 02:12:38 +09:00
Selmar Kok	ee3d06646d	// pretty print as optional parameter, default true ... // serialize name instead of type for camera.name // create empy Value::Object if extension value parsing failed	2018-10-08 16:20:43 +02:00
Syoyo Fujita	924d86e362	Serialize extension with empty object. Fixes #97 ... Use pretty printing JSON when serializing for the readability.	2018-10-08 21:18:33 +09:00
Syoyo Fujita	68353f1b34	Merge branch 'master' of github.com:syoyo/tinygltf	2018-10-07 20:35:14 +09:00
Syoyo Fujita	05a8d0bc52	Fix premake script.	2018-10-07 20:34:45 +09:00
Syoyo Fujita	39a263c2a8	Merge branch 'master' of github.com:syoyo/tinygltf	2018-10-06 03:20:31 +09:00
Syoyo Fujita	61673a62ef	Update README.	2018-10-06 03:20:11 +09:00
Syoyo Fujita	fdf105645b	Merge pull request #96 from Selmar/serialization_fixes ... Serialization & comparison fixes	2018-10-06 01:36:27 +09:00
Selmar Kok	440cb1e66b	tabs to spaces	2018-10-05 16:30:50 +02:00
Selmar Kok	c884e5827e	better implementation for bin file name checking	2018-10-05 16:25:54 +02:00
Selmar Kok	7cb31e4e23	- support writing multiple bin files ... - use existing buffer.uri as filename if not empty and not a data uri	2018-10-05 16:02:29 +02:00
Selmar Kok	2bda71c8fb	- always check Parameter::number_value to catch user errors, e.g. setting number_value without setting has_number_value, which will cause it to serialize as a bool but read back in as a float anyway	2018-10-05 14:36:05 +02:00
Selmar Kok	13b6402388	Merge branch 'master' of github.com:syoyo/tinygltf into serialization_fixes	2018-10-05 14:30:16 +02:00