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

396 Commits

Author SHA1 Message Date
Janusz Bossy b056b84ec6 Fixes errors when `materialOverrides` is not passed to `loadMtl` 2020-07-07 15:58:29 +02:00
Janusz Bossy 4251c8491c Changes `var` to `const` 2020-07-07 15:53:23 +02:00
Janusz Bossy 573cdc244f Adds texture overrides for independent materials 
Allows passing a `materialOverrides` option to the `loadMtl` function.
When generating a new material parsed from the `.mtl` file the overrides
that are specific to this material are applied first before the global
material overrides already existing in the code. This allows the users
to specify different set of materials to override for a model. Following
is an example value for the `materialOverrides` key:

```
{
  "material1Name": {
    "alphaTexture": "path_to_the_texture_file",
    "ambientTexture": "path_to_the_texture_file",
    "diffuseTexture": "path_to_the_texture_file",
    "emissiveTexture": "path_to_the_texture_file",
    "normalTexture": "path_to_the_texture_file",
    "specularTexture": "path_to_the_texture_file",
    "specularShininessTexture": "path_to_the_texture_file",
  }
}
```

It's possible to define more than one material override. If the `.mtl`
file has materials that were not provided in the `materialOverrides`
option they are loaded from the `.mtl` file without any overrides.
 2020-07-07 15:45:28 +02:00
Sean Lilley 53beb9852f
Merge pull request #237 from CesiumGS/update-packages 
Update packages
 2020-04-02 11:48:16 -04:00
Sean Lilley b6c5bc9fe5 Update packages 2020-04-02 11:46:37 -04:00
Sean Lilley fb641e8c16 Remove greenkeeper badge 2020-03-19 14:27:54 -04:00
Sean Lilley c5aaa64d09 3.1.0 release 2020-03-13 11:15:40 -04:00
Sean Lilley 7088eb50ad Remove .idea 2020-02-18 17:31:38 -05:00
Sean Lilley a481795f9e Change other url 2020-02-18 17:30:30 -05:00
Sean Lilley 8b21415b4d Change cesium js url 2020-02-18 17:22:09 -05:00
Shehzan Mohammed 7f8da36f2e
Merge pull request #231 from CesiumGS/cesiumgs 
Change links from AnalyticalGraphicsInc to CesiumGS
 2020-02-18 16:38:57 -05:00
Sean Lilley 5ed44f281d Switch to CesiumJS github org 2020-02-18 10:06:04 -05:00
Sean Lilley 7c32f87413
Merge pull request #230 from AnalyticalGraphicsInc/update-version 
Update Travis Node version to 10
 2020-02-04 10:23:09 -05:00
Sean Lilley 70cb473bdb Merge branch 'master' into update-version 2020-02-04 10:14:03 -05:00
Sean Lilley fb103f467c Update Travis node version 2020-02-04 10:11:42 -05:00
Sean Lilley 7d43c32422
Merge pull request #224 from AnalyticalGraphicsInc/greenkeeper/yargs-15.0.1 
Update yargs to the latest version 🚀
 2019-12-22 21:10:59 -05:00
Sean Lilley 4bce77935d
Merge pull request #228 from AnalyticalGraphicsInc/greenkeeper/nyc-15.0.0 
Update nyc to the latest version 🚀
 2019-12-22 21:10:44 -05:00
greenkeeper[bot] 806fe9d71e
chore(package): update nyc to version 15.0.0 2019-12-23 01:20:02 +00:00
greenkeeper[bot] 1173323d18
fix(package): update yargs to version 15.0.1 2019-11-16 22:57:23 +00:00
Omar Shehata 4df7c2a28d
Merge pull request #219 from AnalyticalGraphicsInc/absolute-paths 
Handle mtl and texture absolute paths
 2019-10-29 14:17:29 -04:00
Sean Lilley dd163b77bd
Merge branch 'master' into absolute-paths 2019-10-29 13:59:34 -04:00
Sean Lilley 341797b635
Merge pull request #217 from AnalyticalGraphicsInc/fix-texture-sharing 
Always decode specular texture
 2019-10-29 13:56:37 -04:00
Sean Lilley b14a883f95
Merge branch 'master' into fix-texture-sharing 2019-10-29 13:51:19 -04:00
Sean Lilley dcaba3453a
Merge pull request #218 from AnalyticalGraphicsInc/missing-attributes 
Fix parsing faces that reference non-existing attributes
 2019-10-29 13:44:25 -04:00
Sean Lilley ff26d5d0ae eslint fixes 2019-10-27 15:28:30 -04:00
Sean Lilley e7bd6d6461 Check for incomplete attributes 2019-10-27 15:00:35 -04:00
Sean Lilley 2a7f0e5c7b PR feedback 2019-10-27 13:30:51 -04:00
Sean Lilley d6df0ebf9d PR feedback 2019-10-27 13:28:52 -04:00
Sean Lilley 242455840a
Merge pull request #216 from AnalyticalGraphicsInc/greenkeeper/eslint-config-cesium-8.0.0 
Update eslint-config-cesium to the latest version 🚀
 2019-10-26 21:02:52 -04:00
Sean Lilley 31cc131909
Merge pull request #215 from AnalyticalGraphicsInc/greenkeeper/open-7.0.0 
Update open to the latest version 🚀
 2019-10-26 21:02:39 -04:00
Sean Lilley 5f012d4f5a Update CHANGES 2019-10-26 20:59:03 -04:00
Sean Lilley 07182a6d8e Update CHANGES 2019-10-26 20:57:03 -04:00
Sean Lilley c43fa01a12
Merge branch 'master' into fix-texture-sharing 2019-10-26 20:52:22 -04:00
Sean Lilley 27e190ceba Update CHANGES 2019-10-26 20:51:50 -04:00
Sean Lilley f399e82b9d Handle absolute paths properly 2019-10-26 20:42:12 -04:00
Sean Lilley 52ce2938f5 Merge branch 'master' into missing-attributes 2019-10-26 20:17:31 -04:00
Sean Lilley f502b805b8 Handle face signature containing attributes that are missing 2019-10-26 20:15:10 -04:00
Sean Lilley d912e28571 Fix for when specular and diffuse reference the same texture 2019-10-26 20:07:29 -04:00
greenkeeper[bot] e3c8704895
chore(package): update eslint-config-cesium to version 8.0.0 2019-10-23 17:21:24 +00:00
greenkeeper[bot] db2a642680
chore(package): update open to version 7.0.0 2019-10-15 18:44:23 +00:00
Sean Lilley b7cbda42d8
Merge pull request #214 from AnalyticalGraphicsInc/greenkeeper/yargs-14.2.0 
update yargs to version 14.2.0
 2019-10-06 21:29:10 -04:00
greenkeeper[bot] db90fff50c
chore(package): update yargs to version 14.2.0 2019-10-07 01:08:02 +00:00
Sean Lilley 705901023b Update CHANGES.md 2019-08-26 18:18:44 -04:00
Sean Lilley f0160376a3
Merge pull request #211 from FreakTheMighty/feature/up-axis 
Restore `inputUpAxis` and `outputUpAxis` axis
 2019-08-26 09:24:32 -04:00
Sean Lilley fd6e98688d Fix default value in doc 2019-08-26 07:56:03 -04:00
Jesse Vander Does a1b1860da2 Fixed code styling 2019-08-20 10:32:32 -07:00
Jesse Vander Does 876cbefe74 Restored lost code and fixed tests 2019-08-19 16:33:12 -07:00
Sean Lilley 78ca573d99
Merge pull request #210 from AnalyticalGraphicsInc/greenkeeper/yargs-14.0.0 
Update yargs to the latest version 🚀
 2019-08-19 19:23:00 -04:00
greenkeeper[bot] 5c179693a3
fix(package): update yargs to version 14.0.0 2019-08-19 23:18:03 +00:00
Sean Lilley 3cf338107d Added up axis options back 2019-08-19 11:01:36 -07:00