94 Commits

Author	SHA1	Message	Date
Sean Lilley	c43fa01a12	Merge branch 'master' into fix-texture-sharing	2019-10-26 20:52:22 -04:00
Sean Lilley	d912e28571	Fix for when specular and diffuse reference the same texture	2019-10-26 20:07:29 -04:00
Jesse Vander Does	a1b1860da2	Fixed code styling	2019-08-20 10:32:32 -07:00
Jesse Vander Does	876cbefe74	Restored lost code and fixed tests	2019-08-19 16:33:12 -07:00
Sean Lilley	3cf338107d	Added up axis options back	2019-08-19 11:01:36 -07:00
Sean Lilley	080f5debf7	Revert some changes from diffuse-alpha-same	2019-07-22 18:39:30 -04:00
Tom Fili	0fa1ec528d	Made alpha images work if same as diffuse	2019-07-19 14:52:12 -04:00
Tom Fili	b0de7d1bc1	Added test	2019-07-19 13:15:38 -04:00
Sean Lilley	2fb661c8cf	Fix negative indices	2019-04-07 17:31:22 -04:00
Sean Lilley	73205a874b	Don't let separate resources exceed Node buffer size limit	2019-03-19 21:25:42 -04:00
Sean Lilley	d979a93745	Merge branch 'master' into newmtl-without-name	2019-02-10 09:45:46 -05:00
Sean Lilley	075beb60d4	var to let/const	2019-02-05 22:03:42 -05:00
Sean Lilley	50f4192afd	Removed matchers	2019-02-05 20:59:00 -05:00
Sean Lilley	ed54251fec	Fix parsing mtl with newmtl without a name	2019-01-03 20:51:39 -05:00
Omar Shehata	7e9a7a87b8	Cleanup	2018-12-04 14:34:04 -05:00
Sean Lilley	b5da7be229	Merge branch 'master' into unlit	2018-11-24 17:04:09 -05:00
Sean Lilley	5d522daaa8	Merge branch 'master' into material-duplication	2018-11-01 18:43:11 -04:00
Sean Lilley	a55ea69661	Cleanup test	2018-10-29 23:58:55 -04:00
Sean Lilley	1bca54c376	Added test	2018-10-29 18:19:55 -04:00
Sean Lilley	82ad86370b	Change test	2018-10-17 21:52:14 -04:00
Sean Lilley	1426d0e43d	Update triangulation algorithm	2018-10-11 16:58:54 -04:00
Sean Lilley	a87087b0dd	Reset vertex count properly	2018-10-10 18:37:52 -04:00
Sean Lilley	30bf9095fa	Discard faces that don't have the same attributes	2018-08-30 23:37:03 -04:00
Omar Shehata	a8dc3ccc23	Fixed linting	2018-08-30 16:02:54 -04:00
Omar Shehata	5ae3175907	Updated tests	2018-08-30 15:55:40 -04:00
Sean Lilley	574d06db2b	Adding position, normals, and uvs to primitive level rather than mesh level	2018-08-30 15:24:34 -04:00
Sean Lilley	26db16d892	Fixed normalizing Windows paths	2018-08-30 12:08:12 -04:00
Sean Lilley	af2e6aa43e	Merge branch 'master' into missing-usemtl	2018-03-21 10:21:29 -04:00
Sean Lilley	7d934503ad	Normalize normals	2018-03-20 22:38:37 -04:00
Sean Lilley	5730d2371f	Set default material if usemtl is missing	2018-03-06 19:22:06 -05:00
Sean Lilley	1140e50987	Merge branch 'master' into diffuse-ambient	2018-01-29 09:28:55 -05:00
Sean Lilley	902e877eca	Ignore ambient texture if it is the same as the diffuse texture	2018-01-19 11:02:14 -05:00
Sean Lilley	378479b8f1	Added alpha texture support	2018-01-03 21:01:10 -05:00
Sean Lilley	60c99a3f63	Added test	2017-12-29 11:59:15 -05:00
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