djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
446 Commits 5 Branches 32 Tags 1.1 MiB
Commit Graph

57 Commits

Author SHA1 Message Date
Sanjeet Suhag e9ccf36169 Updates eslint configuration 2022-05-25 10:18:31 -04:00
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 5fc3ff8d6e Add triangle winding order sanitization option 2021-08-01 20:20:49 -04:00
Sean Lilley b69281573f Remove triangle winding order check 2021-08-01 20:19:25 -04:00
Sean Lilley dd163b77bd
Merge branch 'master' into absolute-paths 2019-10-29 13:59:34 -04:00
Sean Lilley e7bd6d6461 Check for incomplete attributes 2019-10-27 15:00:35 -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
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 2fb661c8cf Fix negative indices 2019-04-07 17:31:22 -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 ed54251fec Fix parsing mtl with newmtl without a name 2019-01-03 20:51:39 -05:00
Sean Lilley b3d5407a26 Don't discard primitives that don't match the attribute layout 2018-10-17 21:42:28 -04:00
Sean Lilley 1426d0e43d Update triangulation algorithm 2018-10-11 16:58:54 -04:00
Sean Lilley ce1591c860 Clear vertex cache too 2018-10-11 13:20:50 -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
Sean Lilley 0c897a6847 Only assign default material if obj file doesn't call usemtl 2018-08-30 23:04:45 -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 400dc3227b Better usemtl handling 2017-12-28 16:17:24 -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
Sean Lilley 0eddab51f9 Change extension check 2017-11-29 13:49:30 -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 3c5f055182 Constant lighting added back to materialsCommon 2017-09-21 10:40:44 -04:00
Sean Lilley 72baced2ed Merge branch 'master' into gltf-2.0 2017-08-10 09:52: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
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 9da383e434 Style edits 2017-07-24 16:42:03 -04:00
Rachel Hwang f526e9b0d8 refactor regexes and correct line buffering bug 2017-06-28 10:05:25 -04:00
Rachel Hwang 2706b95b5b correct cross product calculation 2017-06-26 12:49:57 -04:00
Rachel Hwang a07ef6a3ab refactor line buffering 2017-06-26 12:23:34 -04:00
Rachel Hwang 2105e7bf82 adding winding order sanitization when normals are provided 2017-06-16 14:08:12 -04:00
Rachel Hwang 2396899f5d refactored face line parsing to support multiline faces 2017-06-16 12:59:34 -04:00
Rachel Hwang 7e82e90b35 adding convexivity test and fan method for convex polygon triangulation 2017-06-15 11:11:27 -04:00
Rachel Hwang 50d26f4fd7 loads concave faces with more than 3 vertices 2017-06-14 17:08:55 -04:00