796 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Syoyo Fujita	719d7e4a74	Suppress clang warnings. ... Apply clang-format.	2018-03-30 19:26:35 +09:00
Syoyo Fujita	13fd7152ee	Merge pull request #59 from bowald/feature/serializer-embed-buffer ... Added embed buffers as an option in serializer	2018-03-30 19:17:18 +09:00
johan bowald	30c5347afe	added embed buffers as an option in serializer	2018-03-30 11:52:56 +02:00
Syoyo Fujita	841c858bfd	Merge pull request #58 from bowald/Bowald-serializer-fixes ... Serializer skips null values	2018-03-28 22:09:08 +09:00
Johan Bowald	faa2722f45	Serializer skips null values	2018-03-28 14:54:22 +02:00
Syoyo Fujita	ae751c4882	Merge pull request #57 from Squareys/patch-1 ... Add Magnum's TinyGltfImporter plugin to projects	2018-03-28 19:23:39 +09:00
Jonathan Hale	6a04c87807	Add Magnum's TinyGltfImporter plugin to projects	2018-03-28 12:19:42 +02:00
Selmar Kok	5210f1539e	Merge remote-tracking branch 'origin/devel' into generic_extension_support	2018-03-26 16:22:18 +02:00
Selmar Kok	35c798ed28	Merge remote-tracking branch 'origin/Selmar-generic_extension_support' into generic_extension_support	2018-03-26 16:20:44 +02:00
Syoyo Fujita	5e379693cb	Merge pull request #55 from Ybalrid/pr_add_ogre_gltf_to_readme ... Add Ogre_glTF to the list of projects using the lib	2018-03-22 02:09:49 +09:00
Arthur Brainville (Ybalrid)	a403cd8736	Add Ogre_glTF to the list of projects using the lib ... Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-21 18:02:36 +01:00
Syoyo Fujita	246654a15a	Code clean-up. Reviewed by @Squareeyes.	2018-03-21 20:32:22 +09:00
Syoyo Fujita	ba28ddcc9e	Modify error message.	2018-03-21 20:05:11 +09:00
Syoyo Fujita	8e2c24fb92	Refactor ParseImage function. ... Returns error when both `bufferView` and `uri` are defined in Image.	2018-03-21 19:54:38 +09:00
Syoyo Fujita	ba809ff52f	Merge branch 'devel' of github.com:syoyo/tinygltf into devel	2018-03-21 18:52:53 +09:00
Syoyo Fujita	d1f8bae89c	Print extensions.	2018-03-21 18:48:03 +09:00
Syoyo Fujita	70d8b7a42b	Merge pull request #53 from Ybalrid/gltfutil ... Gltf utility	2018-03-20 11:01:22 +09:00
Syoyo Fujita	3f1c5a90d3	Merge pull request #54 from Ybalrid/fix_msvc_build_usage ... Fix MSVC build: removing static keyowrd befor tinygltf::LoadImageData	2018-03-20 10:36:26 +09:00
Arthur Brainville	2960379eba	Can select image file format with -f argument in gltf util ... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 20:24:00 +01:00
Arthur Brainville	4ba01f5968	Add a "not specified" option to the enum class for image formats ... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 20:06:59 +01:00
Arthur Brainville	cd366ddd1d	Fix MSVC build: removing static keyowrd befor tinygltf::LoadImageData ... This is peculiar: It looks like MSVC doesn't want to build when multiple compilation units (e.g. multiple .cc files) uses tiny_gltf and this funciton is static. The only one file that will build without error is the one that defined the `TINYGLTF_IMPLEMENTATION` macro. Removing `static` here solves the issue... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 19:54:05 +01:00
Arthur Brainville	68174a3fb3	Fix MSVC build: removing static keyowrd befor tinygltf::LoadImageData ... This is peculiar: It looks like MSVC doesn't want to build when multiple compilation units (e.g. multiple .cc files) uses tiny_gltf and this funciton is static. The only one file that will build without error is the one that defined the `TINYGLTF_IMPLEMENTATION` macro. Removing `static` here solves the issue... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 19:40:04 +01:00
Arthur Brainville (Ybalrid)	34c8b60325	Can specify output directory for dumped texture with -o ... Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 17:21:18 +01:00
Arthur Brainville (Ybalrid)	8d8840f809	Added basic texture dumper ... Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 17:11:53 +01:00
Selmar Kok	85b3cbc44d	Merge branch 'devel' into generic_extension_support	2018-03-19 16:15:22 +01:00
Arthur Brainville	ea2b1c5e5d	Start working on a gltf utility program ... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-19 15:49:14 +01:00
Syoyo Fujita	d5b0244e2c	Serialize lights under as KHR_lights_cmn extension.	2018-03-17 16:12:42 -05:00
Syoyo Fujita	f1cdd1c4cb	Merge pull request #52 from Selmar/opt_out_external_image_loading ... Allow opting out of external image loading	2018-03-16 17:26:49 -05:00
Selmar Kok	2a15f387bc	Merge branch 'devel' into generic_extension_support ... # Conflicts: # tiny_gltf.h	2018-03-16 12:32:52 +01:00
Selmar Kok	5b8eb9b429	Merge branch 'devel' into opt_out_external_image_loading	2018-03-16 12:15:13 +01:00
Selmar	67af3c98aa	Allow opting out of external image loading ... We do not require image loading for external files, we have separate texture directories at the moment. I've also added saving the image->uri when loading a binary gltf.	2018-03-16 11:48:19 +01:00
Syoyo Fujita	580d7c8b9f	Parse defaultScene value correcrly. Fixes #47.	2018-03-15 22:09:01 -05:00
Syoyo Fujita	e69069d53c	Loading a GLB file without BIN data fails. Fixes #49.	2018-03-15 22:01:18 -05:00
Syoyo Fujita	d42767e63f	Store relative URI in Buffer serializer. Fixes #48. ... Apply clang-format. Add simple saver sample.	2018-03-15 21:52:00 -05:00
Selmar	7d8cbba8e4	removed code from another issue	2018-03-15 17:32:27 +01:00
Selmar	09d2ff12d8	generic extension support ... Two issues remaining: - The lights data exists twice on export; once outside of the gltf specification and once in the extensions. - A lot of objects are still missing the extensions property.	2018-03-15 17:30:42 +01:00
Syoyo Fujita	20244e1e4e	Fix storing uri to Buffer.uri. Fixes #50. ... Fix decoding DataURI with 'data:application/gltf-buffer;base64' mime.	2018-03-15 11:01:05 -05:00
Syoyo Fujita	4f0b893d73	Merge pull request #45 from Squareys/custom-image-loaders ... Allow custom image loaders	2018-03-14 10:07:49 +09:00
Squareys	2d3594de22	Allow opting out of STB_IMAGE dependency ... Signed-off-by: Squareys <squareys@googlemail.com>	2018-03-13 23:08:03 +01:00
Squareys	ff644d82c9	Allow specifying custom image loader callback ... Signed-off-by: Squareys <squareys@googlemail.com>	2018-03-13 23:08:03 +01:00
Squareys	f99f760b07	Clean up obsolete debug output ... Signed-off-by: Squareys <squareys@googlemail.com>	2018-03-13 22:29:31 +01:00
Squareys	4337463c79	Remove trailing whitespaces ... Signed-off-by: Squareys <squareys@googlemail.com>	2018-03-13 22:20:48 +01:00
Squareys	188965b11e	Fix minor typo ... Signed-off-by: Squareys <squareys@googlemail.com>	2018-03-13 22:20:01 +01:00
Syoyo Fujita	179edbf054	Fix empty serialization. Fixes #44.	2018-03-06 12:04:51 +09:00
Syoyo Fujita	1e94d05012	Merge pull request #43 from Ybalrid/devel ... raytrace: remove code that ouput the 1st loaded texture as PPM	2018-03-03 02:15:44 +09:00
Arthur Brainville	92000ddeed	raytrace: remove code that ouput the 1st loaded texture as PPM ... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-02 16:58:30 +01:00
Syoyo Fujita	abf4bd1800	Merge pull request #42 from Ybalrid/pr_raytrace_texture_loading ... raytrace: add simple code that load texture data	2018-03-03 00:55:58 +09:00
Syoyo Fujita	c14616d21c	Merge pull request #41 from Ybalrid/pr_upgrade_imgui_imguizmo_raytrace ... Upgraded dear imgui and ImGuizmo to the latest version	2018-03-03 00:43:18 +09:00
Arthur Brainville	e832baf229	Restored previous behavior when moving node in scene ... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-02 16:21:28 +01:00
Arthur Brainville	df9003ea08	Update scene when moving gizmo ... Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>	2018-03-02 16:10:20 +01:00