106 Commits

Author	SHA1	Message	Date
Håkon Åmdal	9c29cc96d7	feat: allow for tab separated obj from Tinkercad ... This commit changes patterns for obj line parsing to recognize files where the elements are separated by any whitespace (regex \s). This way, we support files exported from Tinkercad.	2021-09-07 14:31:54 +02:00
Sean Lilley	dc3ec3074f	Run prettier	2021-08-02 11:31:59 -04:00
Sean Lilley	49df1a0655	Added test	2021-08-01 20:20:49 -04:00
Sean Lilley	dd163b77bd	Merge branch 'master' into absolute-paths	2019-10-29 13:59:34 -04:00
Sean Lilley	b14a883f95	Merge branch 'master' into fix-texture-sharing	2019-10-29 13:51:19 -04:00
Sean Lilley	ff26d5d0ae	eslint fixes	2019-10-27 15:28:30 -04:00
Sean Lilley	e7bd6d6461	Check for incomplete attributes	2019-10-27 15:00:35 -04:00
Sean Lilley	2a7f0e5c7b	PR feedback	2019-10-27 13:30:51 -04:00
Sean Lilley	d6df0ebf9d	PR feedback	2019-10-27 13:28:52 -04:00
Sean Lilley	c43fa01a12	Merge branch 'master' into fix-texture-sharing	2019-10-26 20:52:22 -04:00
Sean Lilley	f399e82b9d	Handle absolute paths properly	2019-10-26 20:42:12 -04:00
Sean Lilley	52ce2938f5	Merge branch 'master' into missing-attributes	2019-10-26 20:17:31 -04:00
Sean Lilley	f502b805b8	Handle face signature containing attributes that are missing	2019-10-26 20:15:10 -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