132 Commits

Author	SHA1	Message	Date
Omar Shehata	a8dc3ccc23	Fixed linting	2018-08-30 16:02:54 -04:00
Omar Shehata	e8fc8ab04e	Replaced materialsCommon with unlit	2018-08-30 15:55:32 -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	400dc3227b	Better usemtl handling	2017-12-28 16:17:24 -05:00
Sean Lilley	1bebb590ef	Updated to version 2.1.0	2017-12-28 14:34:30 -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	2869560aab	Don't add a face that contains only two vertices	2017-12-12 09:34:35 -05:00
Sean Lilley	57a95a6623	Try to load files in root directory when secure is true	2017-11-29 14:21:59 -05:00
likangning93	e85d64f021	Merge pull request #116 from AnalyticalGraphicsInc/mtllib-spaces ... Load mtllib that has spaces in its path	2017-11-29 13:54:37 -05:00
Sean Lilley	0eddab51f9	Change extension check	2017-11-29 13:49:30 -05:00
likangning93	4b6421273b	Merge pull request #115 from AnalyticalGraphicsInc/texture-load-order ... Switched texture loading order so diffuse is always first	2017-11-29 13:09:07 -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
Sean Lilley	4b85d87655	Switched texture loading order so diffuse is always first	2017-11-07 09:20:42 -05:00
Sean Lilley	37cf7858cc	Node 8 upgrade	2017-11-06 09:46:45 -05:00
Tim Knip	bdebfeadee	proper indent	2017-10-10 15:06:45 +02:00
Tim Knip	fab88cfdfa	remove texture options from texture name	2017-10-10 13:23:09 +02:00
Tim Knip	3e41cdc7f6	Fix texture options ending up in texture filename #109 ... This happens when in `*.mtl` a relative texture path does not have a `./` prefix. eg: map_bump -bm 0.1 foo.jpg	2017-10-02 01:52:31 +02:00
Tim Knip	3cff129933	fixing merge conflict #109	2017-09-29 20:21:02 +02:00
Tim Knip	3ec919e9c4	better regexp for #109	2017-09-29 20:16:55 +02:00
Tim Knip	ac756bed05	fix texture paths and parse texture map options ... When the mtl has statements like ```map_Bump -bm 0.2 ./foo.jpg``` then the options end up in the texture path. eg: ```./-bm 0.2/foo.jpg```. This commit fixes the path and parses the options.	2017-09-29 19:31:14 +02:00
Tim Knip	c18f8c49eb	fix texture paths and parse texture map options ... When the mtl has statements like `map_Bump -bm 0.2 ./foo.jpg` then the options end up in the texture path. eg: `/bar/-bm 0.2/foo.jpg`. This commit fixes the path and parses the options.	2017-09-29 19:26:51 +02:00
Sean Lilley	3c5f055182	Constant lighting added back to materialsCommon	2017-09-21 10:40:44 -04:00
Sean Lilley	e36668ab14	Treat alpha of 0 as 1	2017-09-19 11:59:51 -04:00
Sean Lilley	b2e4fb6deb	Add doc	2017-08-11 12:01:23 -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
Rachel Hwang	3293621155	correct winding order check bug	2017-08-08 11:59:02 -04:00
Sean Lilley	cda657e9a6	Fixed interleaving and added comment	2017-07-28 18:00:39 -04:00
Sean Lilley	487eca91f8	Move incompatible argument checking to bin file	2017-07-28 17:34:56 -04:00
Sean Lilley	3da691df62	Cleanup overriding images	2017-07-28 17:01:45 -04:00
Rachel Hwang	563d5243a2	cleanup edits	2017-07-27 14:05:10 -04:00
Sean Lilley	e54f3af37f	Async image reading/writing and other cleanup	2017-07-27 11:28:14 -04:00
Sean Lilley	2a44e0d1a8	Misc fixes	2017-07-25 12:32:24 -04:00
Sean Lilley	b8c5ebc8aa	Fix texture index when texture is shared by multiple material values	2017-07-25 11:41:39 -04:00
Sean Lilley	3b4e30d5e3	Supply images on the command line	2017-07-24 21:26:56 -04:00
Sean Lilley	9da383e434	Style edits	2017-07-24 16:42:03 -04:00
Sean Lilley	b52f63543e	Small fixes	2017-07-24 09:36:45 -04:00
Sean Lilley	aaf44e75dc	Fix incompatible byte strides	2017-07-19 17:56:24 -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
Matthew Amato	912ab5edff	Remove dependency on event-stream ... Node has built in functions for reading lines from a file, so there's no need to depend on `event-stream` just for it.	2017-06-28 13:15:56 -04:00