110 Commits

Author	SHA1	Message	Date
likangning93	365efa10fd	Merge pull request #117 from AnalyticalGraphicsInc/resources-in-root ... Attempt to load missing resources by looking in the same directory as the obj	2017-12-28 13:19:52 -05:00
Sean Lilley	e2db0ac59d	More accurate error messages	2017-12-21 22:23:28 -05:00
Sean Lilley	57a95a6623	Try to load files in root directory when secure is true	2017-11-29 14:21:59 -05:00
Sean Lilley	2c21105d38	Attempt to load missing resources by looking in the same directory as the obj	2017-11-17 15:11:59 -05:00
Sean Lilley	78a41c35a7	Load mtllib that has spaces in its path	2017-11-17 11:54:32 -05:00
Tim Knip	fab88cfdfa	remove texture options from texture name	2017-10-10 13:23:09 +02:00
Sean Lilley	3c5f055182	Constant lighting added back to materialsCommon	2017-09-21 10:40:44 -04:00
Sean Lilley	3015383fa3	Added test and updated CHANGES.md	2017-09-19 13:10:32 -04:00
Sean Lilley	72baced2ed	Merge branch 'master' into gltf-2.0	2017-08-10 09:52:19 -04:00
Sean Lilley	b20df62524	Merge pull request #85 from rahwang/more-vertices-faces ... Support concave and/or n-vertex faces	2017-08-09 17:54:19 -04:00
Sean Lilley	60a080be46	Reorganization of material loading and returning buffer rather than writing file	2017-08-08 15:09:00 -04:00
Sean Lilley	3da691df62	Cleanup overriding images	2017-07-28 17:01:45 -04:00
Sean Lilley	e54f3af37f	Async image reading/writing and other cleanup	2017-07-27 11:28:14 -04:00
Sean Lilley	125edddef9	Fix eslint error	2017-07-25 13:04:38 -04:00
Sean Lilley	2a44e0d1a8	Misc fixes	2017-07-25 12:32:24 -04:00
Sean Lilley	3b4e30d5e3	Supply images on the command line	2017-07-24 21:26:56 -04:00
Sean Lilley	b52f63543e	Small fixes	2017-07-24 09:36:45 -04:00
Sean Lilley	ab6786e463	Remove dependence on gltf-pipeline and added gltfToGlb function	2017-07-19 13:23:06 -04:00
Sean Lilley	608234dcc4	Rounded out materialCommon, pbrMetallicRoughness, and pbrSpecularGlosiness tests	2017-07-17 17:45:58 -04:00
Sean Lilley	df20748d60	Merge branch 'master' into gltf-2.0	2017-07-17 14:38:20 -04:00
Sean Lilley	3df055c42a	Rework fragile tests	2017-07-11 11:33:18 -04:00
Sean Lilley	d728340ad4	Keep diffuse intact so that shader generation for generateNormals works correctly	2017-06-22 21:18:12 -04:00
Rachel Hwang	d1ac5816d4	make mip-mapping on by default	2017-06-14 19:27:14 -04:00
Rachel Hwang	50d26f4fd7	loads concave faces with more than 3 vertices	2017-06-14 17:08:55 -04:00
Ottavio Hartman	f2c3e05d8f	Enable no-unused-vars and fix eslint errors	2017-06-12 15:10:35 -04:00
Ottavio Hartman	c8adca3324	Replace JSHint with ESLint shareable config	2017-06-12 11:42:37 -04:00
Matthew Amato	f141c2d9c9	Update npm dependencies ... A few npm dependencies were major versions behind, so this updates `yargs`, `fs-extra`, and `jasmin-spec-reporter` to their latest versions. The major change here is `fs-extra`, which now has promise implementations of all functions by default, this means there's no reason to manually `Promisify` a function any more, the result is less code overall. There is one important edge case, `fs-extra` uses built-in native Node promises, which do not have a `finally` function. If you start a promise change with an `fs-extra` function, you need to wrap it in `Promise.resolve` in order to make use of finally at the end (assuming you are using finally at all, if not you don't need to worry about it. The upside is that your code will always error if you forget to do this.	2017-05-19 11:37:33 -04:00
Sean Lilley	f62e2bd6cf	Fix test	2017-05-18 09:37:45 -04:00
Sean Lilley	c2af8f5098	Tests	2017-05-10 13:10:59 -04:00
Sean Lilley	dc4ba7fc6a	Merge branch 'master' into gltf-2.0	2017-05-04 14:34:33 -04:00
Ed Mackey	f9c0e130aa	Merge pull request #62 from AnalyticalGraphicsInc/single-bin ... Don't save out two bins	2017-04-25 16:27:31 -04:00
Sean Lilley	403e4cf68e	Spec improvements	2017-04-25 13:02:14 -04:00
likangning93	930b14a350	Merge pull request #68 from AnalyticalGraphicsInc/up-axis ... Options to convert up axis	2017-04-25 10:15:34 -04:00
Sean Lilley	20bbd17cd9	Fix ambient of 1,1,1	2017-04-23 13:34:09 -04:00
Sean Lilley	6f99265a65	Merge branch 'master' into single-bin	2017-04-20 14:56:45 -04:00
Sean Lilley	1ccf070a6e	Fix tests	2017-04-20 14:55:47 -04:00
Sean Lilley	93dac5ebdc	Convert up axis	2017-04-20 14:43:59 -04:00
Sean Lilley	d6d0d392c6	Remove occurences of khr_materials_common for code (not tests yet)	2017-04-20 10:23:00 -04:00
Sean Lilley	ce5221c80a	2.0	2017-04-19 17:53:10 -04:00
Sean Lilley	63a5178441	Fixed spec names	2017-04-19 15:48:07 -04:00
Sean Lilley	37febbcd93	Renaming files	2017-04-12 16:55:03 -04:00
Sean Lilley	cc8fee19c4	Many updates	2017-04-11 17:38:03 -04:00
Sean Lilley	e93e7106b7	Add missing test files	2017-04-05 10:49:31 -04:00
Sean Lilley	965402c535	Handle file path errors and better promise handling	2017-04-05 10:44:28 -04:00
Sean Lilley	bedbb6ef96	Fix tests and jshint	2017-04-04 17:57:01 -04:00
Sean Lilley	c7b4fc3cb1	Custom logger	2017-04-04 17:33:25 -04:00
Sean Lilley	3c958e1d86	Add secure checking of paths	2017-04-04 16:45:21 -04:00
Sean Lilley	83e7723b1c	Transparency and other updates	2017-03-21 14:43:09 -04:00
Sean Lilley	05b1e3adbd	Added flag checkTextureAlpha	2017-03-17 16:13:00 -04:00
Sean Lilley	0bf726cea7	Better handling of encoding base64 uris	2017-03-17 15:44:01 -04:00
Sean Lilley	dea55fec0f	Updates	2017-03-17 11:40:54 -04:00
Sean Lilley	5f6d84581f	Check for transparent pixels and fix for khr_materials_common	2017-03-15 13:05:32 -04:00
Sean Lilley	41956dd70d	Output separate resources even when --bypassPipeline is set	2017-03-14 16:42:42 -04:00
Sean Lilley	b8b118bca0	Refactor and tests	2017-03-14 10:43:28 -04:00
Sean Lilley	c79684b10e	Added compress flag and updated version number	2016-08-25 13:48:34 -04:00
Robert Taglang	dc1a1976db	Last few tweaks	2016-07-22 16:17:27 -04:00
Robert Taglang	68582967ac	Changed callback code to promises	2016-07-22 14:09:13 -04:00
Sean Lilley	5d8d3c0098	Fix test	2016-07-20 11:54:47 -04:00
Sean Lilley	ddd99ea33d	Added a unit test	2016-07-11 12:27:15 -04:00
Sean Lilley	63e6fed264	Updated project for publishing	2016-07-08 18:10:18 -04:00