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

82 Commits

Author SHA1 Message Date
Sean Lilley 075beb60d4 var to let/const 2019-02-05 22:03:42 -05:00
Sean Lilley 50f4192afd Removed matchers 2019-02-05 20:59:00 -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 5d522daaa8
Merge branch 'master' into material-duplication 2018-11-01 18:43:11 -04:00
Sean Lilley a55ea69661 Cleanup test 2018-10-29 23:58:55 -04:00
Sean Lilley 1bca54c376 Added test 2018-10-29 18:19:55 -04:00
Sean Lilley 82ad86370b Change test 2018-10-17 21:52:14 -04:00
Sean Lilley 1426d0e43d Update triangulation algorithm 2018-10-11 16:58:54 -04:00
Sean Lilley a87087b0dd Reset vertex count properly 2018-10-10 18:37:52 -04:00
Sean Lilley 30bf9095fa Discard faces that don't have the same attributes 2018-08-30 23:37:03 -04:00
Omar Shehata a8dc3ccc23 Fixed linting 2018-08-30 16:02:54 -04:00
Omar Shehata 5ae3175907 Updated tests 2018-08-30 15:55:40 -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
Sean Lilley af2e6aa43e
Merge branch 'master' into missing-usemtl 2018-03-21 10:21: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 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 60c99a3f63 Added test 2017-12-29 11:59:15 -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 57a95a6623 Try to load files in root directory when secure is true 2017-11-29 14:21:59 -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
Tim Knip fab88cfdfa remove texture options from texture name 2017-10-10 13:23:09 +02:00
Sean Lilley 3c5f055182 Constant lighting added back to materialsCommon 2017-09-21 10:40:44 -04:00
Sean Lilley 3015383fa3 Added test and updated CHANGES.md 2017-09-19 13:10:32 -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
Sean Lilley 3da691df62 Cleanup overriding images 2017-07-28 17:01:45 -04:00
Sean Lilley e54f3af37f Async image reading/writing and other cleanup 2017-07-27 11:28:14 -04:00
Sean Lilley 125edddef9 Fix eslint error 2017-07-25 13:04:38 -04:00
Sean Lilley 2a44e0d1a8 Misc fixes 2017-07-25 12:32:24 -04:00
Sean Lilley 3b4e30d5e3 Supply images on the command line 2017-07-24 21:26:56 -04:00
Sean Lilley b52f63543e Small fixes 2017-07-24 09:36:45 -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
Sean Lilley 3df055c42a Rework fragile tests 2017-07-11 11:33:18 -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 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
Ottavio Hartman f2c3e05d8f Enable no-unused-vars and fix eslint errors 2017-06-12 15:10:35 -04:00
Ottavio Hartman c8adca3324 Replace JSHint with ESLint shareable config 2017-06-12 11:42:37 -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 f62e2bd6cf Fix test 2017-05-18 09:37:45 -04:00