elation-engine 0.9.122 → 0.9.124

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elation-engine",
   "description": "WebGL/WebVR engine written in Javascript",
-  "version": "0.9.122",
+  "version": "0.9.124",
   "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});
@@ -2183,6 +2185,7 @@ console.log('set up hls', hlsConfig);
 
     _construct: function(args) {
       elation.class.call(this, args);
+      this.instances = [];
       if (this.shadertype == 'shadertoy') {
         this.uniforms = [
           { name: 'iResolution', value: new THREE.Vector3(512, 512, 0, 0) },
@@ -2218,6 +2221,14 @@ console.log('set up hls', hlsConfig);
             this._material.uniforms.iTimeDelta.value = this.uniformsMap.iTimeDelta.value;
             this._material.uniforms.iFrame.value = this.uniformsMap.iFrame.value;
             this._material.uniforms.iDate.value = this.uniformsMap.iDate.value;
+
+            this.instances.forEach(mat => {
+              mat.uniforms.iTime.value = this.uniformsMap.iTime.value;
+              mat.uniforms.iTimeDelta.value = this.uniformsMap.iTimeDelta.value;
+              mat.uniforms.iFrame.value = this.uniformsMap.iFrame.value;
+              mat.uniforms.iDate.value = this.uniformsMap.iDate.value;
+            });
+
             lasttime = now;
           }
         }, 16);
@@ -2249,6 +2260,8 @@ console.log('set up hls', hlsConfig);
               this._material.fragmentShader = `
                 #include <common>
                 #include <uv_pars_fragment>
+                #include <color_pars_fragment>
+                #include <map_pars_fragment>
 
                 uniform vec3      iResolution;           // viewport resolution (in pixels)
                 uniform float     iTime;                 // shader playback time (in seconds)
@@ -2264,10 +2277,15 @@ console.log('set up hls', hlsConfig);
                 uniform vec4      iDate;                 // (year, month, day, time in seconds)
                 uniform float     iSampleRate;           // sound sample rate (i.e., 44100)
 
+                uniform vec3 diffuse;
+                uniform float opacity;
+
                 ${shadercode}
 
                 void main() {
+                  vec4 diffuseColor = vec4(diffuse, opacity);
                   #include <map_fragment>
+                  #include <color_fragment>
 
                   mainImage(gl_FragColor, vUv * iResolution.xy);
                 }
@@ -2275,6 +2293,12 @@ console.log('set up hls', hlsConfig);
             }
             this._material.defines['USE_UV'] = 1;
             this._material.needsUpdate = true;
+            this.instances.forEach(mat => {
+              mat.vertexShader = this._material.vertexShader;
+              mat.fragmentShader = this._material.fragmentShader;
+              mat.defines = this._material.defines;
+              mat.needsUpdate = true;
+            });
           });
         } else {
           this._material.fragmentShader = THREE.ShaderLib.basic.fragmentShader;
@@ -2292,6 +2316,12 @@ console.log('set up hls', hlsConfig);
       if (this.uniforms) {
         this._material.uniforms = this.uniformsMap;
       }
+      this.instances.forEach(mat => {
+        mat.vertexShader = this._material.vertexShader;
+        mat.fragmentShader = this._material.fragmentShader;
+        mat.defines = this._material.defines;
+        mat.needsUpdate = true;
+      });
       this.complete();
     },
     complete: function(data) {
@@ -2315,7 +2345,9 @@ console.log('set up hls', hlsConfig);
       if (!this._material) {
         this.load();
       }
-      return this._material;
+      let mat = this._material.clone();
+      this.instances.push(mat);
+      return mat;
     }
   }, elation.engine.assets.base);
 });

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);
@@ -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));
       }
     }