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

284 Commits

Author SHA1 Message Date
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
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
Shehzan Mohammed a0a3938323
Merge pull request #136 from AnalyticalGraphicsInc/normalize-normals 
Normalize normals
 2018-03-21 09:57:53 -04:00
Sean Lilley c2c90b3a3b Updated CHANGES.md 2018-03-20 23:36:54 -04:00
Sean Lilley 5499fa46aa Updated CHANGES.md 2018-03-20 23:32: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 bbdecdece2
Merge pull request #128 from hpinkos/master 
Add cloc
 2018-01-30 11:27:22 -05:00
Sean Lilley 3dbfed85e2
Update gulpfile.js 2018-01-30 11:27:03 -05:00
hpinkos 739602b2fa add cloc 2018-01-29 16:50:56 -05:00
Sean Lilley 36c72e1e25 Updated for 2.2.0 release 2018-01-29 15:08:11 -05:00
Shehzan Mohammed dc2196e937
Merge pull request #127 from AnalyticalGraphicsInc/diffuse-ambient 
Ignore ambient texture if it is the same as the diffuse texture
 2018-01-29 09:43:32 -05:00
Sean Lilley 1140e50987 Merge branch 'master' into diffuse-ambient 2018-01-29 09:28:55 -05:00
Shehzan Mohammed bb3a189ff0
Merge pull request #124 from AnalyticalGraphicsInc/alpha-texture 
Added alpha texture support
 2018-01-24 14:31:05 -08:00
Sean Lilley bbc88e7d50 Updated CHANGES.md 2018-01-19 11:14:20 -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 260b3e67e3
Merge branch 'master' into alpha-texture 2018-01-19 10:44:37 -05:00
Shehzan Mohammed c33694d85a
Merge pull request #126 from AnalyticalGraphicsInc/fix-output-name 
Fix output name
 2018-01-12 07:15:14 -08:00
Sean Lilley 9861c357c0 Update CHANGES.md 2018-01-11 13:35:08 -05:00
Sean Lilley 906429d8f3 Update doc for -g 2018-01-11 13:32:45 -05:00
Sean Lilley 15d078f764 Fix output name 2018-01-11 13:32:30 -05:00
Sean Lilley 378479b8f1 Added alpha texture support 2018-01-03 21:01:10 -05:00
Shehzan Mohammed b017f67c7a
Merge pull request #123 from AnalyticalGraphicsInc/usemtl-fix 
Better usemtl handling
 2017-12-29 09:10:50 -08:00
Sean Lilley 60c99a3f63 Added test 2017-12-29 11:59:15 -05:00
Shehzan Mohammed 32a85ec35b
Merge pull request #122 from AnalyticalGraphicsInc/update-readme 
Update readme with more info about mtl slots
 2017-12-29 07:42:35 -08:00
Sean Lilley 400dc3227b Better usemtl handling 2017-12-28 16:17:24 -05:00
Sean Lilley 1e0a8cd0cd Update readme with more info about mtl slots 2017-12-28 14:53:51 -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