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

180 Commits

Author SHA1 Message Date
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 8d491afc70 bin script tweaks 2017-07-24 21:32:51 -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 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
Sean Lilley 8701c87767 Bumped to 1.2.0 2017-07-11 11:59:38 -04:00
Matthew Amato 88d1396370 Merge pull request #95 from AnalyticalGraphicsInc/fragile-tests 
Rework fragile tests
 2017-07-11 11:39:07 -04:00
Sean Lilley 3df055c42a Rework fragile tests 2017-07-11 11:33:18 -04:00
Patrick Cozzi b1cc54bcdc Merge pull request #92 from AnalyticalGraphicsInc/event-stream 
Remove dependency on event-stream
 2017-06-28 14:00:31 -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
Patrick Cozzi 54cbb22339 Merge pull request #91 from AnalyticalGraphicsInc/ignore-cleanup 
Clean up .gitignore and .npmignore
 2017-06-28 08:38:17 -04:00
Matthew Amato 24513be7b8 Clean up .gitignore and .npmignore 
There were some outdated and missing entries.
 2017-06-28 08:34:42 -04:00
Matthew Amato b9e3d9719b Merge pull request #90 from omh1280/eslint2 
Switch from gulp-eslint to the ESLint CLI
 2017-06-28 08:24: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
Matthew Amato 813290af6c Merge pull request #89 from AnalyticalGraphicsInc/keep-diffuse 
Keep diffuse intact so that shader generation for generateNormals works
 2017-06-23 10:34:53 -04:00
Matthew Amato d2eee3e4c5 Update CHANGES.md 2017-06-23 10:34:21 -04:00
Matthew Amato 604e273d23 Merge pull request #87 from omh1280/coverage 
Replace Istanbul with nyc
 2017-06-23 10:29:56 -04:00
Sean Lilley d728340ad4 Keep diffuse intact so that shader generation for generateNormals works correctly 2017-06-22 21:18:12 -04:00
Ottavio Hartman 7946fecbeb Replace Istanbul with NYC 2017-06-20 13:24:03 -04:00
Sean Lilley 185061c4b1 Merge pull request #86 from AnalyticalGraphicsInc/lilleyse-patch-1 
Fix CHANGES.md
 2017-06-14 20:01:14 -04:00
Sean Lilley dbe455fe14 Fix CHANGES.md 2017-06-14 20:00:48 -04:00
Sean Lilley 5aa9aa9abf Merge pull request #83 from rahwang/default-mip-mapping 
make mip-mapping on by default
 2017-06-14 19:42:04 -04:00
Rachel Hwang d1ac5816d4 make mip-mapping on by default 2017-06-14 19:27:14 -04:00
Patrick Cozzi d2e5df2d77 Fix typo 2017-06-14 08:22:41 -04:00
Patrick Cozzi b9084bb54f Merge pull request #84 from AnalyticalGraphicsInc/pjcozzi-patch-1 
Update LICENSE.md so GitHub reports Apache 2.0 license
 2017-06-14 07:38:44 -04:00
Patrick Cozzi 23d243cda9 Update LICENSE.md so GitHub reports Apache 2.0 license 2017-06-14 07:38:15 -04:00
Matthew Amato c82c3ec36e Merge pull request #82 from omh1280/eslint_node 
Replace JSHint with ESLint shareable config
 2017-06-12 16:05:56 -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
Patrick Cozzi b8ecde6e13 Merge pull request #78 from AnalyticalGraphicsInc/update-npm 
Update npm dependencies
 2017-05-20 15:20:08 -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
Ed Mackey 1b9f54ef22 Merge pull request #77 from AnalyticalGraphicsInc/tr 
Treat alpha as 1.0 - Tr
 2017-05-19 11:19:43 -04:00
Sean Lilley f62e2bd6cf Fix test 2017-05-18 09:37:45 -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
Ed Mackey cab8911223 Merge pull request #72 from AnalyticalGraphicsInc/error-reporting 
Return Promise.reject instead of throwing error
 2017-04-27 15:06:41 -04:00
Sean Lilley 81201dcd03 Return Promise.reject instead of throwing error 2017-04-27 13:35:47 -04:00
Sean Lilley 9213047cbb Fix CHANGES.md 2017-04-25 16:45:03 -04:00
Sean Lilley 74f95cd616 Bump to 1.1.0 2017-04-25 16:39:19 -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
Rob Taglang 2327a882ce Merge pull request #70 from AnalyticalGraphicsInc/fix-ambient 
Fix ambient of 1,1,1
 2017-04-23 13:42:55 -04:00