elation-engine 0.9.113 → 0.9.114

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elation-engine",
   "description": "WebGL/WebVR engine written in Javascript",
-  "version": "0.9.113",
+  "version": "0.9.114",
   "main": "",
   "author": "James Baicoianu",
   "license": "MIT",

package/scripts/assets.js

@@ -1,4 +1,4 @@
-elation.require(['utils.workerpool', 'engine.external.three.three', 'engine.external.libgif', 'engine.external.textdecoder-polyfill', 'engine.external.three.three-loaders', 'engine.external.three.three-vrm'], function() {
+elation.require(['utils.workerpool', 'engine.external.three.three', 'engine.external.libgif', 'engine.external.textdecoder-polyfill', 'engine.external.three.three-loaders', 'engine.external.three.three-vrm', 'engine.external.three.three-icosa'], function() {
 
   THREE.Cache.enabled = true;
 
@@ -86,6 +86,10 @@ elation.require(['utils.workerpool', 'engine.external.three.three', 'engine.exte
       basisloader.detectSupport(renderer);
       this.basisloader = basisloader;
 
+      this.ktx2loader = new THREE.KTX2Loader();
+      this.ktx2loader.setTranscoderPath(libpath);
+      this.ktx2loader.detectSupport(renderer);
+
       let pmremGenerator = new THREE.PMREMGenerator( renderer );
       pmremGenerator.compileEquirectangularShader();
       this.pmremGenerator = pmremGenerator;
@@ -594,6 +598,14 @@ if (!ENV_IS_BROWSER) return;
                 blob.arrayBuffer()
                   .then(buffer => loader._createTexture(buffer))
                   .then(texture => this.handleLoadBasis(texture))
+              } else if (imagetype == 'hdr') {
+                let loader = new THREE.RGBELoader();
+                loader.load(fullurl, texture => {
+                  this._texture = texture;
+                  this.loaded = true;
+                  this.uploaded = false;
+                  this.sendLoadEvents();
+                });
               } else if (imagetype == 'exr') {
                 // TODO - this should probably done off-thread if possible, it currently locks rendering for a noticable amount of time
                 let loader = new THREE.EXRLoader();
@@ -1431,11 +1443,20 @@ if (!ENV_IS_BROWSER) return;
       return isGLB;
     },
     loadglTF: function(jobdata) {
-      let proxypath = this.getProxiedURL(jobdata.src);
+      let dirpathparts = jobdata.src.split('/');
+      dirpathparts[dirpathparts.length-1] = '';
+      let proxypath = this.getProxiedURL(dirpathparts.join('/'));
       var loader = new THREE.GLTFLoader();
       if (elation.engine.assets.dracopath) {
         loader.setDRACOLoader(new THREE.DRACOLoader().setDecoderPath(elation.engine.assets.dracopath));
       }
+      if (elation.engine.assets.ktx2loader) {
+        loader.setKTX2Loader(elation.engine.assets.ktx2loader);
+      }
+      if (elation.engine.assets.icosapath) {
+        loader.register(parser => new THREE.GLTFGoogleTiltBrushMaterialExtension(parser, elation.engine.assets.icosapath));
+      }
+      loader.setMeshoptDecoder(MeshoptDecoder);
       this._model = new THREE.Group();
       this._model.userData.loaded = false;
       loader.parse(jobdata.srcdata, proxypath, elation.bind(this, function(modeldata) {
@@ -1560,6 +1581,7 @@ if (!ENV_IS_BROWSER) return;
               if (tex) { // && tex.image instanceof HTMLImageElement) {
                 var img = tex.image;
                 var src = img.originalSrc || img.src;
+                if (!src) return;
                 if (!textures[src]) {
                   //elation.engine.assets.loadJSON([{"assettype": "image", name: src, "src": src}], this.baseurl); 
                   //tex = elation.engine.assets.find('image', src);

package/scripts/assetworker.js

@@ -448,6 +448,23 @@ elation.require([
       return new Promise(function(resolve, reject) { 
         var loader = new THREE.FBXLoader();
         var modeldata = loader.parse(data);
+        let mapnames = ['map', 'normalMap', 'aoMap', 'bumpMap', 'alphaMap', 'emissiveMap', 'envMap', 'lightMap', 'specularMap'];
+        let baseurl = job.data.src.substr( 0, job.data.src.lastIndexOf( "/" ) + 1 );
+        modeldata.traverse(n => {
+          if (n.material) {
+            mapnames.forEach(m => {
+              if (n.material[m]) {
+                let map = n.material[m];
+                if (map.image && map.image.src.indexOf(':') == -1) {
+                  map.image.src = baseurl + map.image.src;
+                }
+              }
+            });
+          } else if (n instanceof THREE.Bone) {
+            let name = n.name.replace('mixamorig', '');
+            n.name = name[0].toLowerCase() + name.substring(1);
+          }
+        });
         resolve(modeldata.toJSON());
       });
     }