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

43 Commits

Author SHA1 Message Date
Sean Lilley 359341f50c Update version to 3.1.3 2021-09-15 12:16:51 -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 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 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 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
Sean Lilley 2fb661c8cf Fix negative indices 2019-04-07 17:31:22 -04:00
Sean Lilley ed54251fec Fix parsing mtl with newmtl without a name 2019-01-03 20:51:39 -05:00
Sean Lilley 1bca54c376 Added test 2018-10-29 18:19:55 -04:00
Sean Lilley 30bf9095fa Discard faces that don't have the same attributes 2018-08-30 23:37:03 -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 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 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 2a44e0d1a8 Misc fixes 2017-07-25 12:32:24 -04:00
Sean Lilley b52f63543e Small fixes 2017-07-24 09:36:45 -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
Rachel Hwang 50d26f4fd7 loads concave faces with more than 3 vertices 2017-06-14 17:08:55 -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 93dac5ebdc Convert up axis 2017-04-20 14:43:59 -04:00
Sean Lilley e93e7106b7 Add missing test files 2017-04-05 10:49:31 -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 b8b118bca0 Refactor and tests 2017-03-14 10:43:28 -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