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
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
Sean Lilley
e2db0ac59d
More accurate error messages
2017-12-21 22:23:28 -05:00
likangning93
09271d284a
Merge pull request #120 from AnalyticalGraphicsInc/loading-fix
...
Don't add a face that contains only two vertices
2017-12-20 16:51:36 -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
likangning93
e85d64f021
Merge pull request #116 from AnalyticalGraphicsInc/mtllib-spaces
...
Load mtllib that has spaces in its path
2017-11-29 13:54:37 -05:00
Sean Lilley
0eddab51f9
Change extension check
2017-11-29 13:49:30 -05:00
likangning93
4b6421273b
Merge pull request #115 from AnalyticalGraphicsInc/texture-load-order
...
Switched texture loading order so diffuse is always first
2017-11-29 13:09:07 -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
Ed Mackey
42c4b33521
Merge pull request #114 from AnalyticalGraphicsInc/npmrc
...
Prevent npm from creating package-lock.json
2017-11-07 11:52:52 -05:00
Sean Lilley
21c4b94d26
Prevent npm from creating package-lock.json
2017-11-07 09:33:11 -05:00
Sean Lilley
4b85d87655
Switched texture loading order so diffuse is always first
2017-11-07 09:20:42 -05:00
likangning93
90b0f319c0
Merge pull request #113 from AnalyticalGraphicsInc/node-8
...
Node 8 upgrade
2017-11-06 15:25:22 -05:00
Sean Lilley
37cf7858cc
Node 8 upgrade
2017-11-06 09:46:45 -05:00
Sean Lilley
a3c2c38a99
Merge pull request #109 from timknip/master
...
fix texture paths and parse texture map options
2017-10-12 09:09:14 -04:00
Tim Knip
bdebfeadee
proper indent
2017-10-10 15:06:45 +02:00
Tim Knip
fab88cfdfa
remove texture options from texture name
2017-10-10 13:23:09 +02:00
Tim Knip
3e41cdc7f6
Fix texture options ending up in texture filename #109
...
This happens when in `*.mtl` a relative texture path does not have a
`./` prefix.
eg: map_bump -bm 0.1 foo.jpg
2017-10-02 01:52:31 +02:00
Tim Knip
3cff129933
fixing merge conflict #109
2017-09-29 20:21:02 +02:00
Tim Knip
3ec919e9c4
better regexp for #109
2017-09-29 20:16:55 +02:00
Tim Knip
ac756bed05
fix texture paths and parse texture map options
...
When the mtl has statements like ```map_Bump -bm 0.2 ./foo.jpg``` then
the options end up in the texture path.
eg: ```./-bm 0.2/foo.jpg```.
This commit fixes the path and parses the options.
2017-09-29 19:31:14 +02:00
Tim Knip
c18f8c49eb
fix texture paths and parse texture map options
...
When the mtl has statements like `map_Bump -bm 0.2 ./foo.jpg` then
the options end up in the texture path.
eg: `/bar/-bm 0.2/foo.jpg`.
This commit fixes the path and parses the options.
2017-09-29 19:26:51 +02:00
Shehzan Mohammed
8f3f0d3862
Merge pull request #108 from AnalyticalGraphicsInc/constant-lighting
...
Constant lighting added back to materialsCommon
2017-09-21 10:53:44 -04:00
Sean Lilley
723a059e3e
Update CHANGES.md
2017-09-21 10:45:56 -04:00
Sean Lilley
3c5f055182
Constant lighting added back to materialsCommon
2017-09-21 10:40:44 -04:00
Shehzan Mohammed
3934450b56
Merge pull request #107 from AnalyticalGraphicsInc/alpha-0
...
Treat alpha of 0 as 1
2017-09-19 13:28:57 -04:00
