djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • bbc88e7d50 Updated CHANGES.md Sean Lilley 2018-01-19 11:14:20 -0500
  • 902e877eca Ignore ambient texture if it is the same as the diffuse texture Sean Lilley 2018-01-19 11:02:14 -0500
  • 260b3e67e3
         Merge branch 'master' into alpha-texture #124 Sean Lilley 2018-01-19 10:44:37 -0500
  • c33694d85a
         Merge pull request #126 from AnalyticalGraphicsInc/fix-output-name Shehzan Mohammed 2018-01-12 07:15:14 -0800
  • 9861c357c0 Update CHANGES.md #126 Sean Lilley 2018-01-11 13:35:08 -0500
  • 906429d8f3 Update doc for -g Sean Lilley 2018-01-11 13:32:45 -0500
  • 15d078f764 Fix output name Sean Lilley 2018-01-11 13:26:12 -0500
  • 378479b8f1 Added alpha texture support Sean Lilley 2018-01-03 20:41:25 -0500
  • b017f67c7a
         Merge pull request #123 from AnalyticalGraphicsInc/usemtl-fix Shehzan Mohammed 2017-12-29 09:10:50 -0800
  • 60c99a3f63 Added test #123 Sean Lilley 2017-12-29 11:55:21 -0500
  • 32a85ec35b
         Merge pull request #122 from AnalyticalGraphicsInc/update-readme Shehzan Mohammed 2017-12-29 07:42:35 -0800
  • 400dc3227b Better usemtl handling Sean Lilley 2017-12-28 16:16:26 -0500
  • 1e0a8cd0cd Update readme with more info about mtl slots #122 Sean Lilley 2017-12-28 14:53:08 -0500
  • 1bebb590ef Updated to version 2.1.0 2.1.0 Sean Lilley 2017-12-28 14:34:30 -0500
  • 365efa10fd
         Merge pull request #117 from AnalyticalGraphicsInc/resources-in-root likangning93 2017-12-28 13:19:52 -0500
  • e2db0ac59d More accurate error messages #117 Sean Lilley 2017-12-21 22:19:52 -0500
  • 09271d284a
         Merge pull request #120 from AnalyticalGraphicsInc/loading-fix likangning93 2017-12-20 16:51:36 -0500
  • 2869560aab Don't add a face that contains only two vertices #120 Sean Lilley 2017-12-12 09:34:35 -0500
  • 57a95a6623 Try to load files in root directory when secure is true Sean Lilley 2017-11-29 14:21:59 -0500
  • e85d64f021
         Merge pull request #116 from AnalyticalGraphicsInc/mtllib-spaces likangning93 2017-11-29 13:54:37 -0500
  • 0eddab51f9 Change extension check #116 Sean Lilley 2017-11-29 13:49:30 -0500
  • 4b6421273b
         Merge pull request #115 from AnalyticalGraphicsInc/texture-load-order likangning93 2017-11-29 13:09:07 -0500
  • 2c21105d38 Attempt to load missing resources by looking in the same directory as the obj Sean Lilley 2017-11-17 15:07:52 -0500
  • 78a41c35a7 Load mtllib that has spaces in its path Sean Lilley 2017-11-17 11:53:04 -0500
  • 42c4b33521
         Merge pull request #114 from AnalyticalGraphicsInc/npmrc Ed Mackey 2017-11-07 11:52:52 -0500
  • 21c4b94d26 Prevent npm from creating package-lock.json #114 Sean Lilley 2017-11-07 09:33:11 -0500
  • 4b85d87655 Switched texture loading order so diffuse is always first #115 Sean Lilley 2017-11-07 09:20:42 -0500
  • 90b0f319c0
         Merge pull request #113 from AnalyticalGraphicsInc/node-8 likangning93 2017-11-06 15:25:22 -0500
  • 37cf7858cc Node 8 upgrade #113 Sean Lilley 2017-11-06 09:42:37 -0500
  • a3c2c38a99 Merge pull request #109 from timknip/master Sean Lilley 2017-10-12 09:09:14 -0400
  • bdebfeadee proper indent #109 Tim Knip 2017-10-10 15:06:45 +0200
  • fab88cfdfa remove texture options from texture name Tim Knip 2017-10-10 13:23:09 +0200
  • 3e41cdc7f6 Fix texture options ending up in texture filename #109 Tim Knip 2017-10-02 01:50:45 +0200
  • 3cff129933 fixing merge conflict #109 Tim Knip 2017-09-29 20:21:02 +0200
  • 3ec919e9c4 better regexp for #109 Tim Knip 2017-09-29 20:16:55 +0200
  • ac756bed05 fix texture paths and parse texture map options Tim Knip 2017-09-29 19:26:51 +0200
  • c18f8c49eb fix texture paths and parse texture map options Tim Knip 2017-09-29 19:26:51 +0200
  • 8f3f0d3862 Merge pull request #108 from AnalyticalGraphicsInc/constant-lighting Shehzan Mohammed 2017-09-21 10:53:44 -0400
  • 723a059e3e Update CHANGES.md #108 Sean Lilley 2017-09-21 10:45:56 -0400
  • 3c5f055182 Constant lighting added back to materialsCommon Sean Lilley 2017-09-21 10:37:50 -0400
  • 3934450b56 Merge pull request #107 from AnalyticalGraphicsInc/alpha-0 Shehzan Mohammed 2017-09-19 13:28:57 -0400
  • 3015383fa3 Added test and updated CHANGES.md #107 Sean Lilley 2017-09-19 13:09:58 -0400
  • e36668ab14 Treat alpha of 0 as 1 Sean Lilley 2017-09-19 11:59:51 -0400
  • 4f2e2add43 Merge pull request #104 from AnalyticalGraphicsInc/better-readme Patrick Cozzi 2017-09-01 14:17:04 -0400
  • 56388cb2ab Add sample code for saving gltf to readme #104 Sean Lilley 2017-09-01 12:28:29 -0400
  • e17db649a5 Add CODEOWNERS Patrick Cozzi 2017-08-19 17:38:57 -0400
  • a1f5550c59 Merge branch 'gltf-2.0' 2.0.0 Sean Lilley 2017-08-11 12:30:37 -0400
  • 0e11909860 Updated to version 1.3.0 1.3.0 Sean Lilley 2017-08-11 12:23:07 -0400
  • b2e4fb6deb Add doc #67 Sean Lilley 2017-08-11 12:01:23 -0400
  • 72baced2ed Merge branch 'master' into gltf-2.0 Sean Lilley 2017-08-10 09:52:19 -0400
  • b20df62524 Merge pull request #85 from rahwang/more-vertices-faces Sean Lilley 2017-08-09 17:54:19 -0400
  • 60a080be46 Reorganization of material loading and returning buffer rather than writing file Sean Lilley 2017-07-29 13:23:33 -0400
  • 3293621155 correct winding order check bug #85 Rachel Hwang 2017-08-08 11:59:02 -0400
  • cda657e9a6 Fixed interleaving and added comment Sean Lilley 2017-07-28 18:00:39 -0400
  • 487eca91f8 Move incompatible argument checking to bin file Sean Lilley 2017-07-28 17:34:56 -0400
  • 3da691df62 Cleanup overriding images Sean Lilley 2017-07-28 16:56:28 -0400
  • 563d5243a2 cleanup edits Rachel Hwang 2017-07-27 13:45:37 -0400
  • e54f3af37f Async image reading/writing and other cleanup Sean Lilley 2017-07-27 11:23:12 -0400
  • 125edddef9 Fix eslint error Sean Lilley 2017-07-25 13:04:38 -0400
  • d85e72b19c Updates to package.json, README, and CHANGES Sean Lilley 2017-07-25 13:03:56 -0400
  • 2a44e0d1a8 Misc fixes Sean Lilley 2017-07-25 12:32:24 -0400
  • b8c5ebc8aa Fix texture index when texture is shared by multiple material values Sean Lilley 2017-07-25 11:41:39 -0400
  • 8d491afc70 bin script tweaks Sean Lilley 2017-07-24 21:32:51 -0400
  • 3b4e30d5e3 Supply images on the command line Sean Lilley 2017-07-24 18:21:01 -0400
  • 9da383e434 Style edits Sean Lilley 2017-07-24 16:42:03 -0400
  • b52f63543e Small fixes Sean Lilley 2017-07-24 09:36:45 -0400
  • aaf44e75dc Fix incompatible byte strides Sean Lilley 2017-07-19 17:56:24 -0400
  • ab6786e463 Remove dependence on gltf-pipeline and added gltfToGlb function Sean Lilley 2017-07-19 13:23:06 -0400
  • 608234dcc4 Rounded out materialCommon, pbrMetallicRoughness, and pbrSpecularGlosiness tests Sean Lilley 2017-07-17 17:45:58 -0400
  • df20748d60 Merge branch 'master' into gltf-2.0 Sean Lilley 2017-07-17 14:38:20 -0400
  • 8701c87767 Bumped to 1.2.0 1.2.0 Sean Lilley 2017-07-11 11:42:35 -0400
  • 88d1396370 Merge pull request #95 from AnalyticalGraphicsInc/fragile-tests Matthew Amato 2017-07-11 11:39:07 -0400
  • 3df055c42a Rework fragile tests #95 Sean Lilley 2017-07-11 11:32:04 -0400
  • c27329de5c Merge d723bec8a4 into b1cc54bcdc #93 dalir 2017-07-07 16:45:49 +0000
  • d723bec8a4 Merge pull request #1 from Skycatch/feature/fork-update #93 dalir 2017-07-06 19:30:26 +0100
  • b1cc54bcdc Merge pull request #92 from AnalyticalGraphicsInc/event-stream Patrick Cozzi 2017-06-28 14:00:31 -0400
  • 912ab5edff Remove dependency on event-stream #92 Matthew Amato 2017-06-28 13:15:56 -0400
  • f526e9b0d8 refactor regexes and correct line buffering bug Rachel Hwang 2017-06-27 16:31:14 -0400
  • 54cbb22339 Merge pull request #91 from AnalyticalGraphicsInc/ignore-cleanup Patrick Cozzi 2017-06-28 08:38:17 -0400
  • 24513be7b8 Clean up .gitignore and .npmignore #91 Matthew Amato 2017-06-28 08:34:42 -0400
  • b9e3d9719b Merge pull request #90 from omh1280/eslint2 Matthew Amato 2017-06-28 08:24:25 -0400
  • 644c281e9c Switch from gulp-eslint to the ESLint CLI. Switch to eslint-config-cesium 2.0. #90 Ottavio Hartman 2017-06-23 13:42:34 -0400
  • 2706b95b5b correct cross product calculation Rachel Hwang 2017-06-26 12:47:08 -0400
  • a07ef6a3ab refactor line buffering Rachel Hwang 2017-06-26 12:23:34 -0400
  • 813290af6c Merge pull request #89 from AnalyticalGraphicsInc/keep-diffuse Matthew Amato 2017-06-23 10:34:53 -0400
  • d2eee3e4c5 Update CHANGES.md #89 Matthew Amato 2017-06-23 10:34:21 -0400
  • 604e273d23 Merge pull request #87 from omh1280/coverage Matthew Amato 2017-06-23 10:29:56 -0400
  • d728340ad4 Keep diffuse intact so that shader generation for generateNormals works correctly Sean Lilley 2017-06-22 20:56:32 -0400
  • 7946fecbeb Replace Istanbul with NYC #87 Ottavio Hartman 2017-06-20 13:24:03 -0400
  • 2105e7bf82 adding winding order sanitization when normals are provided Rachel Hwang 2017-06-16 13:51:29 -0400
  • 2396899f5d refactored face line parsing to support multiline faces Rachel Hwang 2017-06-15 17:57:05 -0400
  • 7e82e90b35 adding convexivity test and fan method for convex polygon triangulation Rachel Hwang 2017-06-15 11:11:27 -0400
  • 185061c4b1 Merge pull request #86 from AnalyticalGraphicsInc/lilleyse-patch-1 Sean Lilley 2017-06-14 20:01:14 -0400
  • dbe455fe14 Fix CHANGES.md #86 Sean Lilley 2017-06-14 20:00:48 -0400
  • 5aa9aa9abf Merge pull request #83 from rahwang/default-mip-mapping Sean Lilley 2017-06-14 19:42:04 -0400
  • d1ac5816d4 make mip-mapping on by default #83 Rachel Hwang 2017-06-13 14:22:54 -0400
  • 50d26f4fd7 loads concave faces with more than 3 vertices Rachel Hwang 2017-06-14 16:55:03 -0400
  • d2e5df2d77 Fix typo Patrick Cozzi 2017-06-14 08:22:41 -0400
  • b9084bb54f Merge pull request #84 from AnalyticalGraphicsInc/pjcozzi-patch-1 Patrick Cozzi 2017-06-14 07:38:44 -0400
  • 23d243cda9 Update LICENSE.md so GitHub reports Apache 2.0 license #84 Patrick Cozzi 2017-06-14 07:38:15 -0400