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

411 Commits

Author SHA1 Message Date
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
Sean Lilley b458856904 Update version to 3.0.0 2018-12-05 09:26:58 -05:00
Sean Lilley fd2407512f
Merge pull request #152 from OmarShehata/unlit 
Replace materialsCommon with unlit
 2018-12-04 15:16:41 -05:00
Omar Shehata 56a06eee2d Error if use mutiple material types 2018-12-04 15:05:00 -05:00
Omar Shehata f417504095 Update README and CHANGES 2018-12-04 14:59:25 -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 2fde781c99
Merge pull request #167 from AnalyticalGraphicsInc/gulp4 
Upgrade to gulp4
 2018-11-06 17:58:39 -05:00
Matthew Amato 62954bffb9 Proper gulp4 usage 2018-11-06 12:38:49 -05:00
Matthew Amato 94987d7343 Upgrade to gulp4 
`gulp.task` was replaced with `module.exports` but no other changes were
required.
 2018-11-06 12:15:18 -05:00
AnalyticalGraphics 094a292cb6
Merge pull request #166 from AnalyticalGraphicsInc/greenkeeper/initial 
Add Greenkeeper badge 🌴
 2018-11-06 12:14:40 -05:00
greenkeeper[bot] fa1e5400ff docs(readme): add Greenkeeper badge 2018-11-06 15:55:05 +00:00
Sean Lilley 0b30a11e3a Update to version 2.3.2 2018-11-02 22:25:58 -04:00
likangning93 ac03e9f8ee
Merge pull request #162 from AnalyticalGraphicsInc/material-duplication 
Duplicate materials with mismatching attributes
 2018-11-02 09:55:59 -04:00
Sean Lilley 5d522daaa8
Merge branch 'master' into material-duplication 2018-11-01 18:43:11 -04:00
Sean Lilley e6dcf08c23
Merge pull request #161 from AnalyticalGraphicsInc/keep-mixed-attributes 
Keep mixed attributes
 2018-11-01 18:42:39 -04:00
Sean Lilley eaca567a25 Updates 2018-10-31 21:12:25 -04:00
Sean Lilley a55ea69661 Cleanup test 2018-10-29 23:58:55 -04:00
Sean Lilley 1f0278ad0c Update CHANGES.md 2018-10-29 23:14:59 -04:00
Sean Lilley 1bca54c376 Added test 2018-10-29 18:19:55 -04:00
Sean Lilley 9cc1ba8ec5 Split incompatible materials 2018-10-29 18:19:55 -04:00
Sean Lilley db3d5c4c11 Update CHANGES.md 2018-10-29 18:18:43 -04:00
Sean Lilley 82ad86370b Change test 2018-10-17 21:52:14 -04: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 b781459234
Merge pull request #157 from AnalyticalGraphicsInc/fix-triangulation 
Update triangulation algorithm
 2018-10-16 10:37:20 -04:00
Sean Lilley 41f53410dd Update date 2018-10-16 09:49:45 -04:00
Sean Lilley 1426d0e43d Update triangulation algorithm 2018-10-11 16:58:54 -04:00
Sean Lilley fc53a48d93
Merge pull request #155 from AnalyticalGraphicsInc/vertex-count-fix 
Fix objs with interleaved materials
 2018-10-11 16:38:49 -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 0197ffa15f Update to 2.3.0 2018-09-19 20:02:25 -04:00
Matthew Amato 6554214010
Merge pull request #153 from AnalyticalGraphicsInc/fix-uv-error 
Remove faces that don't match the same attribute layout
 2018-09-19 15:34:13 -04:00
Sean Lilley 55f7b27442
Merge branch 'master' into fix-uv-error 2018-09-18 20:35:40 -04:00
Sean Lilley bcf01b111c Update CHANGES.md 2018-09-18 20:11:04 -04:00
Matthew Amato 37f55a008a
Merge pull request #150 from AnalyticalGraphicsInc/fix-paths 
Normalize Windows paths correctly
 2018-08-31 14:59:38 -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 a7d47947ac Update CHANGES.md 2018-08-30 22:49:46 -04:00
Omar Shehata a8dc3ccc23 Fixed linting 2018-08-30 16:02:54 -04:00
Omar Shehata e92b68d947 Updated README 2018-08-30 15:55:46 -04:00
Omar Shehata 5ae3175907 Updated tests 2018-08-30 15:55:40 -04:00
Omar Shehata e8fc8ab04e Replaced materialsCommon with unlit 2018-08-30 15:55:32 -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
Shehzan Mohammed 26526c0f51
Merge pull request #139 from AnalyticalGraphicsInc/empty-input-output 
Handle empty -i -o arguments in CLI
 2018-04-03 10:08:58 -04:00
Sean Lilley c5851f49ea Use coerce instead 2018-03-31 11:27:47 -04:00
Sean Lilley 96b8d17009 Handle -i -o without following name 2018-03-30 09:54:51 -04:00
likangning93 705f95592e
Merge pull request #133 from AnalyticalGraphicsInc/missing-usemtl 
Set default material if usemtl is missing
 2018-03-21 10:22:36 -04:00
Sean Lilley af2e6aa43e
Merge branch 'master' into missing-usemtl 2018-03-21 10:21:29 -04:00