elation-engine 0.9.121 → 0.9.123

package/package.json

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

package/scripts/assets.js

@@ -80,11 +80,14 @@ elation.require(['utils.workerpool', 'engine.external.three.three', 'engine.exte
       }
     },
     initTextureLoaders: function(rendersystem, libpath) {
+      this.rendersystem = rendersystem;
       let renderer = rendersystem.renderer;
+/*
       let basisloader = new THREE.BasisTextureLoader();
       basisloader.setTranscoderPath(libpath);
       basisloader.detectSupport(renderer);
       this.basisloader = basisloader;
+*/
 
       this.ktx2loader = new THREE.KTX2Loader();
       this.ktx2loader.setTranscoderPath(libpath);
@@ -94,7 +97,6 @@ elation.require(['utils.workerpool', 'engine.external.three.three', 'engine.exte
       pmremGenerator.compileEquirectangularShader();
       this.pmremGenerator = pmremGenerator;
 
-      this.rendersystem = rendersystem;
     },
     loadAssetPack: function(url, baseurl) {
       this.assetroot = new elation.engine.assets.pack({name: url, src: url, baseurl: baseurl});
@@ -1528,6 +1530,9 @@ console.log('set up hls', hlsConfig);
             if (n.geometry && !n.geometry.attributes.normal) {
               n.geometry.computeVertexNormals();
             }
+            if (n.name.match(/^mixamorig:/)) {
+              n.name = n.name.replace('mixamorig:', '');
+            }
           });
 
           if (modeldata.userData && modeldata.userData.gltfExtensions && modeldata.userData.gltfExtensions.VRM) {

package/scripts/external/three/three-objects.js

@@ -739,6 +739,13 @@ console.log('skelly data', boneDatas);
 
                 //console.log('found a part to clone!', oldname, parts[0], src, dst, track.name);
                 found = true;
+              } else if (parts[0].indexOf(':') > -1) {
+                let parts2 = parts[0].split(':');
+                if (parts2[1] == src.name || parts[1] == src.uuid) {
+                  parts[0] = dst.name || dst.uuid;
+                  track.name = parts.join('.');
+                  found = true;
+                }
               }
             });
             if (!found) {

package/scripts/external/three/three.js

@@ -45194,7 +45194,7 @@
 	}
 
 	// Characters [].:/ are reserved for track binding syntax.
-	const _RESERVED_CHARS_RE = '\\[\\]\\.:\\/';
+	const _RESERVED_CHARS_RE = '\\[\\]\\.\\/';
 	const _reservedRe = new RegExp( '[' + _RESERVED_CHARS_RE + ']', 'g' );
 
 	// Attempts to allow node names from any language. ES5's `\w` regexp matches

package/scripts/systems/controls.js

@@ -810,6 +810,7 @@ elation.require(['ui.window', 'ui.panel', 'ui.toggle', 'ui.slider', 'ui.label',
         this.state[bindid] = 0;
         this.changes.push(bindid);
       }, 10);
+      ev.preventDefault();
     }
     this.keydown = function(ev) {
       // Send key events for both keyboard_<key> and keyboard_<modname>_<key>

package/scripts/systems/physics.js

@@ -21,13 +21,13 @@ elation.require(["physics.cyclone"], function() {
     this.engine_start = function(ev) {
       //console.log("PHYSICS: starting");
       this.system.start({subprocessor: 'cpu', processorargs: { path: 'https://baicoianu.com/~bai/janusweb/build/1.5.32/media/lib/physx/'}});
-      this.lasttime = new Date().getTime();
+      this.lasttime = performance.now();
       if (this.interval) {
         clearInterval(this.interval);
       }
       if (this.async) {
         this.interval = setInterval(elation.bind(this, function() {
-          var now = new Date().getTime();
+          var now = performance.now();
             //this.system.step(this.timescale * (now - this.lasttime) / 1000);
             //if (this.stats) this.stats.update();
           this.step((now - this.lasttime) / 1000);

package/scripts/systems/render.js

@@ -178,10 +178,13 @@ elation.require([
         renderer.getViewport(oldviewport);
         renderer.setViewport(viewport);
         renderer.setRenderTarget(rendertarget);
+        let isXR = renderer.xr.enabled;
+        renderer.xr.enabled = false;
         renderer.render(scene, camera);
         renderer.readRenderTargetPixels(rendertarget, 0, 0, size, size, pixeldata);
         renderer.setRenderTarget(oldrendertarget);
         renderer.setViewport(oldviewport);
+        renderer.xr.enabled = isXR;
 
         texture.encoding = oldencoding;
 
@@ -1476,7 +1479,10 @@ console.log('toggle render mode: ' + this.rendermode + ' => ' + mode, passidx, l
           img = resized.toDataURL('image/jpeg');
         } else if (format == 'png') {
           img = resized.toDataURL('image/png');
-        };
+        } else if (format == 'rgba') {
+          let pixels = ctx.getImageData(0, 0, canvas.width, canvas.height);
+          img = pixels.data;
+        }
         if (img) {
           resolve(img);
         } else {

package/scripts/things/generic.js

@@ -1529,7 +1529,9 @@ elation.component.add("engine.things.generic", function() {
     }
     return orient;
   }
-  this.worldToLocalOrientation = function(orient) {
+  this.worldToLocalOrientation = (function() {
+    const worldorient = new THREE.Quaternion();
+    return function(orient) {
     if (!orient) orient = new THREE.Quaternion();
 /*
     var n = this.parent;
@@ -1541,10 +1543,21 @@ elation.component.add("engine.things.generic", function() {
     return orient.multiply(worldorient);
 */
     // FIXME - this is cheating!
-    var tmpquat = new THREE.Quaternion();
-    return orient.multiply(tmpquat.copy(this.objects.dynamics.orientationWorld).inverse());
-    
-  }
+    //var tmpquat = new THREE.Quaternion();
+    //return orient.multiply(tmpquat.copy(this.objects.dynamics.orientationWorld).invert());
+        if (!orient) orient = new THREE.Quaternion();
+
+        var n = this.parent;
+        worldorient.copy(this.orientation);
+
+        while (n && n.orientation) {
+            worldorient.premultiply(n.orientation);
+            n = n.parent;
+        }
+
+        return orient.multiply(worldorient.invert());
+    }
+  })();
   this.getWorldPosition = function(target) {
     if (!target) target = new THREE.Vector3();
     if (this.objects['3d'].matrixWorldNeedsUpdate) {

package/scripts/things/player.js

@@ -77,6 +77,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
       this.viewmatrix = new THREE.Matrix4();
 
       this.gravityVector = new THREE.Vector3();
+      this.lastjumptime = 0;
 
       elation.events.add(this.engine, 'engine_frame', elation.bind(this, this.engine_frame));
       elation.events.add(this.engine, 'engine_frame', elation.bind(this, this.handleTargeting));
@@ -206,7 +207,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
       //          The hardcoded offset is also specific to my own personal set-up, and helps to keep leap motion and tracked controllers in sync
       this.tracker = this.head.spawn('objecttracker', null, {player: this, position: [0, -.05, -.185]});
       this.camera = this.head.spawn('camera', this.name + '_camera', { position: [0,0,0], mass: 0.1, player_id: this.properties.player_id } );
-      this.camera.objects['3d'].add(this.ears);
+      this.head.objects['3d'].add(this.ears);
 
       //var camhelper = new THREE.CameraHelper(this.camera.camera);
       //this.engine.systems.world.scene['world-3d'].add(camhelper);
@@ -222,7 +223,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
         'position': [0,1.45,0]
       });
       this.head = this.neck.spawn('generic', this.properties.player_id + '_head', {
-        'position': [0,.3,0],
+        'position': [0,.2,0],
         'mass': 1
       });
 
@@ -332,7 +333,7 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
               this.frictionForce.update(this.properties.movefriction);
               if (this.controlstate['jump']) {
                 this.jumpForce.update(new THREE.Vector3(0, this.jumpstrength, 0));
-                console.log('jump up!', this.jumpForce.force.toArray());
+                //console.log('jump up!', this.jumpForce.force.toArray());
                 setTimeout(elation.bind(this, function() {
                   this.jumpForce.update(new THREE.Vector3(0, 0, 0));
                 }), this.jumptime);
@@ -640,7 +641,13 @@ elation.require(['engine.things.generic', 'engine.things.camera', 'engine.things
     }
     this.handleJump = function(ev) {
       var keydown = ev.value;
-      if (!keydown) {
+      if (keydown) {
+        if (ev.timeStamp - this.lastjumptime < 250) {
+          console.log('toggle flying');
+          this.toggle_flying();
+        }
+        this.lastjumptime = ev.timeStamp;
+      } else {
         this.jumpForce.update(new THREE.Vector3(0, 0, 0));
       }
     }