janusweb 1.5.52 → 1.5.53

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "janusweb",
   "description": "Web client for JanusVR worlds",
-  "version": "1.5.52",
+  "version": "1.5.53",
   "main": "scripts/janusweb.js",
   "author": "James Baicoianu",
   "license": "MIT",

package/scripts/object.js

@@ -648,7 +648,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         let shader = this.getAsset('shader', this.shader_id);
         if (shader) {
           shadermaterial = shader.getInstance();
-          shadermaterial.uniforms = this.room.parseShaderUniforms(shader.uniforms);
+          elation.utils.merge(this.room.parseShaderUniforms(shader.uniforms), shadermaterial.uniforms);
           shadermaterial.side = this.sidemap[this.properties.cull_face];
           shadermaterial.shadowSide = shadowside
           shadermaterial.receiveShadow = this.shadow && this.shadow_receive;

package/scripts/portal.js

@@ -38,6 +38,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.lastactivatetime = 0;
     }
     this.createObject3D = function() {
+      this.created = true;
       this.objects['3d'] = new THREE.Object3D();
       this.updateGeometry();
       return this.objects['3d'];
@@ -99,13 +100,15 @@ elation.require(['janusweb.janusbase'], function() {
       }
     }
     this.createMaterial = function() {
+      if (this.portalmaterial) return this.portalmaterial;
       var matargs = {
         color: 0xdddddd,
         side: THREE.DoubleSide,
       };
       var mat;
+      let shader = false;
       if (this.shader_id) {
-        let shader = this.getAsset('shader', this.shader_id);
+        shader = this.getAsset('shader', this.shader_id);
         //console.log('shader', this.shader_id, shader);
         if (shader) {
           let shadermaterial = shader.getInstance();
@@ -123,8 +126,12 @@ elation.require(['janusweb.janusbase'], function() {
         var asset = this.getAsset('image', this.thumb_id);
         if (asset) var thumb = asset.getInstance();
         if (thumb) {
-          mat.map = thumb;
-          mat.map.encoding = THREE.sRGBEncoding;
+          thumb.encoding = THREE.sRGBEncoding;
+          if (shader) {
+            mat.uniforms.iChannel0.value = thumb;
+          } else {
+            mat.map = thumb;
+          }
           if (asset.loaded) {
             if (asset.hasalpha) {
               mat.transparent = true;
@@ -149,6 +156,8 @@ elation.require(['janusweb.janusbase'], function() {
       mat.polygonOffsetFactor = -1;
       mat.polygonOffsetUnits = -4;
 
+      this.portalmaterial = mat;
+
       return mat;
     }
     this.adjustAspectRatio = function(image) {
@@ -505,6 +514,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.janus.network.unsubscribe(this.portalroom);
     }
     this.updateGeometry = function() {
+      if (!this.created) return;
       var thickness = 0.05 * this.size.z;
       var offset = ((thickness / 2) / this.properties.scale.z) * 2;
       var box;