elation-engine 0.9.117 → 0.9.118

package/package.json

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

package/scripts/external/three/three.js

@@ -15405,6 +15405,7 @@
 	const _flatCamera = /*@__PURE__*/ new OrthographicCamera();
 	const _clearColor = /*@__PURE__*/ new Color();
 	let _oldTarget = null;
+	let _oldXrEnabled = false;
 
 	// Golden Ratio
 	const PHI = ( 1 + Math.sqrt( 5 ) ) / 2;
@@ -15470,6 +15471,9 @@
 		fromScene( scene, sigma = 0, near = 0.1, far = 100 ) {
 
 			_oldTarget = this._renderer.getRenderTarget();
+			_oldXrEnabled = this._renderer.xr.enabled;
+
+			this._renderer.xr.enabled = false;
 
 			this._setSize( 256 );
 
@@ -15583,6 +15587,8 @@
 		_cleanup( outputTarget ) {
 
 			this._renderer.setRenderTarget( _oldTarget );
+			this._renderer.xr.enabled = _oldXrEnabled;
+
 			outputTarget.scissorTest = false;
 			_setViewport( outputTarget, 0, 0, outputTarget.width, outputTarget.height );
 
@@ -15601,6 +15607,9 @@
 			}
 
 			_oldTarget = this._renderer.getRenderTarget();
+			_oldXrEnabled = this._renderer.xr.enabled;
+
+			this._renderer.xr.enabled = false;
 
 			const cubeUVRenderTarget = renderTarget || this._allocateTargets();
 			this._textureToCubeUV( texture, cubeUVRenderTarget );

package/scripts/math.js

@@ -58,3 +58,9 @@ EulerDegrees.prototype.clone = function () {
 EulerDegrees.prototype.toArray = function() {
   return [this.x, this.y, this.z, this.radians.order];
 };
+EulerDegrees.prototype.equals = function(other) {
+  return ( this.epsilonEquals(other.x, this.x) ) && ( this.epsilonEquals(other.y, this.y) ) && ( this.epsilonEquals(other.z, this.z) ) && ( other.order == this.order );
+};
+EulerDegrees.prototype.epsilonEquals = function(v1, v2, epsilon=1e-5) {
+  return Math.abs(v1 - v2) < epsilon;
+};

package/scripts/systems/render.js

@@ -99,7 +99,7 @@ elation.require([
       this.renderer.toneMappingWhitePoint = 1;
 */
 
-      this.renderer.debug.checkShaderErrors = true;
+      this.renderer.debug.checkShaderErrors = false;
 
       this.lastframetime = 0;
 
@@ -337,6 +337,7 @@ elation.require([
         this.canvas.style.height = '100%';
       }
       elation.events.add(window, "resize", this);
+      elation.events.add(window, "orientationchange", ev => this.resize(true));
       elation.events.add(document.body, "mouseenter,mouseleave", this);
       elation.events.add(this.canvas, "mouseover,mousedown,mousemove,mouseup,click", this);
       elation.events.add(this.canvas, "mousewheel,touchstart,touchmove,touchend", this);
@@ -416,13 +417,15 @@ elation.require([
       this.rendertarget.depthTexture.type = THREE.UnsignedInt248Type;
       this.rendertarget.depthTexture.format = THREE.DepthStencilFormat;
       //this.composer = this.createRenderPath(['clear', /*'portals', 'masktest',*/ this.rendermode, 'fxaa'/*, 'msaa'*/, 'bloom', 'maskclear', 'recording'], this.rendertarget);
-      this.composer = this.createRenderPath(['clear', this.rendermode,/* 'tonemapping',*/ 'unrealbloom', 'fxaa', 'gamma'], this.rendertarget);
-      //this.composer = this.createRenderPath(['clear', this.rendermode, 'fxaa'/*, 'msaa'*/, 'bloom', 'maskclear'], this.rendertarget);
-      //this.effects['msaa'].enabled = false;
-      //this.composer = this.createRenderPath([this.rendermode, 'ssao', 'recording']);
-      if (this.showstats) {
-        // FIXME - not smart!
-        elation.events.add(this.composer.passes[3], 'render', elation.bind(this, this.updateRenderStats));
+      if (this.enablepostprocessing) {
+        this.composer = this.createRenderPath(['clear', this.rendermode,/* 'tonemapping',*/ 'unrealbloom', 'fxaa', 'gamma'], this.rendertarget);
+        //this.composer = this.createRenderPath(['clear', this.rendermode, 'fxaa'/*, 'msaa'*/, 'bloom', 'maskclear'], this.rendertarget);
+        //this.effects['msaa'].enabled = false;
+        //this.composer = this.createRenderPath([this.rendermode, 'ssao', 'recording']);
+        if (this.showstats) {
+          // FIXME - not smart!
+          elation.events.add(this.composer.passes[3], 'render', elation.bind(this, this.updateRenderStats));
+        }
       }
 
       this.getsize();
@@ -695,7 +698,7 @@ console.log('toggle render mode: ' + this.rendermode + ' => ' + mode, passidx, l
       await this.rendersystem.renderer.xr.setSession(session);
       this.rendersystem.renderer.xr.enabled = true;
 
-      this.rendersystem.renderer.outputEncoding = THREE.sRGBEncoding;
+      this.rendersystem.renderer.outputEncoding = THREE.LinearEncoding;
       this.xrlayer = this.getXRBaseLayer(session);
       if (false && !this.xrscene) {
         // Set up a scene with an ortho camera to clone our XR framebuffer to, for display on the main screen
@@ -831,7 +834,6 @@ console.log('toggle render mode: ' + this.rendermode + ' => ' + mode, passidx, l
         //this.scene.overrideMaterial = null;
         //this.rendersystem.renderer.render(this.scene, this.actualcamera);
 
-        this.effects[this.rendermode].camera = this.actualcamera;
 
         let colliderscene = this.engine.systems.world.scene['colliders'],
             worldscene = this.engine.systems.world.scene['world-3d'];
@@ -843,6 +845,7 @@ console.log('toggle render mode: ' + this.rendermode + ' => ' + mode, passidx, l
           worldscene.remove(colliderscene);
         }
         if (this.enablepostprocessing) {
+          this.effects[this.rendermode].camera = this.actualcamera;
           this.composer.render(delta);
         } else {
           if (this.xrsession) {
@@ -1113,6 +1116,8 @@ console.log('toggle render mode: ' + this.rendermode + ' => ' + mode, passidx, l
         this.size = [s.w, s.h];
         this.setrendersize(this.size[0], this.size[1]);
       }
+      this.actualcamera.zoom = (Math.abs(window.orientation) == 90 ? 2 : 1);
+      this.actualcamera.updateProjectionMatrix();
       this.rendersystem.setdirty();
 
       return this.size;

package/scripts/systems/sound.js

@@ -78,6 +78,9 @@ elation.require([ ], function() {
         elation.events.fire({type: 'mute', element: this});
       }
     }
+    this.unmute = function() {
+      this.mute(false);
+    }
     this.toggleMute = function() {
       this.mute(this.enabled);
     }

package/scripts/things/generic.js

@@ -1475,10 +1475,18 @@ elation.component.add("engine.things.generic", function() {
     elation.events.fire({type: 'thing_change_queued', element: this});
   }
   this.applyChanges = function() {
-    var s = this.scale;
-    if (s && this.objects['3d']) {
-      this.objects['3d'].visible = this.visible && !(s.x == 0 || s.y == 0 || s.z == 0);
+
+    const s = this.scale, o = this.objects['3d'], ov = o.visible, v = this.visible;
+    if (s && o) {
+      //this.objects['3d'].visible = this.visible && !(s.x == 0 || s.y == 0 || s.z == 0);
+      let scaleMult = s.x * s.y * s.z;
+      if (ov && (!this.visible || scaleMult == 0)) {
+        o.visible = false;
+      } else if (!ov && (this.visible && scaleMult != 0)) {
+        o.visible = true;
+      }
     }
+
     if (this.colliders) {
       this.colliders.position.copy(this.properties.position);
       this.colliders.quaternion.copy(this.properties.orientation);