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
400dc3227b
Better usemtl handling
2017-12-28 16:17:24 -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
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
Sean Lilley
4b85d87655
Switched texture loading order so diffuse is always first
2017-11-07 09:20:42 -05:00
Sean Lilley
37cf7858cc
Node 8 upgrade
2017-11-06 09:46:45 -05: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
Sean Lilley
3c5f055182
Constant lighting added back to materialsCommon
2017-09-21 10:40:44 -04:00
Sean Lilley
e36668ab14
Treat alpha of 0 as 1
2017-09-19 11:59:51 -04:00
Sean Lilley
b2e4fb6deb
Add doc
2017-08-11 12:01:23 -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
Rachel Hwang
3293621155
correct winding order check bug
2017-08-08 11:59:02 -04:00
Sean Lilley
cda657e9a6
Fixed interleaving and added comment
2017-07-28 18:00:39 -04:00
Sean Lilley
487eca91f8
Move incompatible argument checking to bin file
2017-07-28 17:34:56 -04:00
Sean Lilley
3da691df62
Cleanup overriding images
2017-07-28 17:01:45 -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
2a44e0d1a8
Misc fixes
2017-07-25 12:32:24 -04:00
Sean Lilley
b8c5ebc8aa
Fix texture index when texture is shared by multiple material values
2017-07-25 11:41:39 -04:00
Sean Lilley
3b4e30d5e3
Supply images on the command line
2017-07-24 21:26:56 -04:00
Sean Lilley
9da383e434
Style edits
2017-07-24 16:42:03 -04:00
Sean Lilley
b52f63543e
Small fixes
2017-07-24 09:36:45 -04:00
Sean Lilley
aaf44e75dc
Fix incompatible byte strides
2017-07-19 17:56:24 -04:00
Sean Lilley
ab6786e463
Remove dependence on gltf-pipeline and added gltfToGlb function
2017-07-19 13:23:06 -04:00
Sean Lilley
608234dcc4
Rounded out materialCommon, pbrMetallicRoughness, and pbrSpecularGlosiness tests
2017-07-17 17:45:58 -04:00
Sean Lilley
df20748d60
Merge branch 'master' into gltf-2.0
2017-07-17 14:38:20 -04:00
Matthew Amato
912ab5edff
Remove dependency on event-stream
...
Node has built in functions for reading lines from a file, so there's
no need to depend on `event-stream` just for it.
2017-06-28 13:15:56 -04:00
Rachel Hwang
f526e9b0d8
refactor regexes and correct line buffering bug
2017-06-28 10:05:25 -04:00
Ottavio Hartman
644c281e9c
Switch from gulp-eslint to the ESLint CLI. Switch to eslint-config-cesium 2.0.
2017-06-27 13:20:48 -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
Sean Lilley
d728340ad4
Keep diffuse intact so that shader generation for generateNormals works correctly
2017-06-22 21:18:12 -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
d1ac5816d4
make mip-mapping on by default
2017-06-14 19:27:14 -04:00
Rachel Hwang
50d26f4fd7
loads concave faces with more than 3 vertices
2017-06-14 17:08:55 -04:00
Rachel Hwang
133e428cb4
get n-many vertices for a face
2017-06-13 20:48:09 -04:00
Matthew Amato
f141c2d9c9
Update npm dependencies
...
A few npm dependencies were major versions behind, so this updates `yargs`,
`fs-extra`, and `jasmin-spec-reporter` to their latest versions.
The major change here is `fs-extra`, which now has promise implementations
of all functions by default, this means there's no reason to manually
`Promisify` a function any more, the result is less code overall.
There is one important edge case, `fs-extra` uses built-in native Node
promises, which do not have a `finally` function. If you start a promise
change with an `fs-extra` function, you need to wrap it in `Promise.resolve`
in order to make use of finally at the end (assuming you are using finally
at all, if not you don't need to worry about it. The upside is that your
code will always error if you forget to do this.
2017-05-19 11:37:33 -04:00
Sean Lilley
86c604826c
Treat alpha as 1.0 - Tr
2017-05-18 09:32:06 -04:00
Sean Lilley
c2af8f5098
Tests
2017-05-10 13:10:59 -04:00
Sean Lilley
44e9d5fa3b
Add back KHR_materials_common
2017-05-04 15:39:01 -04:00
Sean Lilley
dc4ba7fc6a
Merge branch 'master' into gltf-2.0
2017-05-04 14:34:33 -04:00
Sean Lilley
c9ad66fcdb
Add metallicRoughness and specularGlosiness output
2017-05-04 14:25:08 -04:00
Sean Lilley
81201dcd03
Return Promise.reject instead of throwing error
2017-04-27 13:35:47 -04:00
Ed Mackey
f9c0e130aa
Merge pull request #62 from AnalyticalGraphicsInc/single-bin
...
Don't save out two bins
2017-04-25 16:27:31 -04:00
Sean Lilley
403e4cf68e
Spec improvements
2017-04-25 13:02:14 -04:00
likangning93
930b14a350
Merge pull request #68 from AnalyticalGraphicsInc/up-axis
...
Options to convert up axis
2017-04-25 10:15:34 -04:00
Sean Lilley
20bbd17cd9
Fix ambient of 1,1,1
2017-04-23 13:34:09 -04:00
Sean Lilley
ec7acba6a9
Fix doc
2017-04-20 15:09:03 -04:00
Sean Lilley
93dac5ebdc
Convert up axis
2017-04-20 14:43:59 -04:00
Sean Lilley
d6d0d392c6
Remove occurences of khr_materials_common for code (not tests yet)
2017-04-20 10:23:00 -04:00
Sean Lilley
d7a354b313
Use temp directory
2017-04-20 10:07:01 -04:00
Sean Lilley
ce5221c80a
2.0
2017-04-19 17:53:10 -04:00
Sean Lilley
a6ff230fc3
Don't save out two bins
2017-04-14 12:00:43 -04:00
Sean Lilley
37febbcd93
Renaming files
2017-04-12 16:55:03 -04:00
Sean Lilley
cc8fee19c4
Many updates
2017-04-11 17:38:03 -04:00
Sean Lilley
28d081e0ae
Remove TODO comment, moved to isse
2017-04-05 13:17:31 -04:00
Sean Lilley
965402c535
Handle file path errors and better promise handling
2017-04-05 10:44:28 -04:00
Sean Lilley
72c20eb6ee
Fix output file name
2017-04-05 09:13:28 -04:00
Sean Lilley
bedbb6ef96
Fix tests and jshint
2017-04-04 17:57:01 -04:00
Sean Lilley
02c3aa18db
Support KHR_materials_common output
2017-04-04 17:55:00 -04:00
Sean Lilley
c7b4fc3cb1
Custom logger
2017-04-04 17:33:25 -04:00
Sean Lilley
3c958e1d86
Add secure checking of paths
2017-04-04 16:45:21 -04:00
Sean Lilley
04ad694599
Trigger coverall
2017-04-04 11:32:18 -04:00
Sean Lilley
e3941daf8c
Fix
2017-03-21 14:51:48 -04:00
Sean Lilley
83e7723b1c
Transparency and other updates
2017-03-21 14:43:09 -04:00
Sean Lilley
e48320572b
Fix base path since separate resources are saved in the output folder
2017-03-21 11:29:02 -04:00
Sean Lilley
05b1e3adbd
Added flag checkTextureAlpha
2017-03-17 16:13:00 -04:00
Sean Lilley
0bf726cea7
Better handling of encoding base64 uris
2017-03-17 15:44:01 -04:00
Sean Lilley
dea55fec0f
Updates
2017-03-17 11:40:54 -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
41956dd70d
Output separate resources even when --bypassPipeline is set
2017-03-14 16:42:42 -04:00
Sean Lilley
cf27c8b69d
Better buffer handling
2017-03-14 14:59:25 -04:00
Sean Lilley
998dcfe649
Fix saving .bin
2017-03-14 13:48:54 -04:00
Sean Lilley
d46d58fdc5
Set diffuse to black when constant lighting is used
2017-03-14 12:06:50 -04:00
Sean Lilley
b8b118bca0
Refactor and tests
2017-03-14 10:43:28 -04:00
Sean Lilley
767612643c
Fix wrong param name
2016-08-26 15:49:55 -04:00
Sean Lilley
c79684b10e
Added compress flag and updated version number
2016-08-25 13:48:34 -04:00
Sean Lilley
20deda83e3
Fix bug with no materials
2016-08-08 11:38:54 -04:00
Sean Lilley
2d6e0d16c9
Added --cesium option and bumped version number
2016-07-25 19:12:41 -07:00
