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

111 Commits

Author SHA1 Message Date
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