janusweb 1.5.39 → 1.5.42

package/media/assets/webui/apps/editor/editor.js

@@ -115,7 +115,8 @@ elation.elements.define('janus.ui.editor.panel', class extends elation.elements.
       'manipulate_out':   [ 'keyboard_e',  (ev) => this.editObjectManipulateOut(ev) ],
     });
     janus.engine.systems.controls.addContext('roomedit_paste', {
-      'paste':     [ 'keyboard_ctrl_v', (ev) => { if (ev.value == 1) this.editObjectPaste(ev); } ],
+      'add':     [ 'keyboard_ctrl_a', (ev) => { if (ev.value == 1) this.showCreateDialog(ev); } ],
+      'paste':     [ 'keyboard_ctrl_v', (ev) => { if (ev.value == 1) this.editObjectPaste(ev);} ],
     });
     janus.engine.systems.controls.activateContext('roomedit_paste');
 
@@ -134,6 +135,7 @@ elation.elements.define('janus.ui.editor.panel', class extends elation.elements.
     room.addEventListener('wheel', (ev) => this.editObjectMousewheel(ev));
     window.addEventListener('keydown', (ev) => this.editObjectKeydown(ev));
     window.addEventListener('keyup', (ev) => this.editObjectKeyup(ev));
+
   }
   initRoomEvents(room) {
     if (!this.initialized.has(room)) {
@@ -149,6 +151,33 @@ elation.elements.define('janus.ui.editor.panel', class extends elation.elements.
       room.addEventListener('thing_remove', (ev) => this.handleThingRemove(ev));
       this.initialized.add(room);
     }
+
+    if (!this.outliner_selected) {
+      this.outliner_selected = room.createObject('outliner', {
+        col: 'lime',
+        opacity: .4,
+        outline: 3,
+      });
+      this.outliner_hover = room.createObject('outliner', {
+        col: 'gray',
+        opacity: .4,
+        outline: 1,
+      });
+setTimeout(() => {
+      this.outliner_selected.col = 'lime';
+      this.outliner_hover.col = 'gray';
+}, 0);
+      this.outliner_hover.update = function() {
+        let rc = player.raycast();
+        if (rc.length > 0 && rc[0].object !== room) {
+          this.select(rc[0].object);
+        } else {
+          this.deselect();
+        }
+      }
+    } else if (this.outliner_selected.room !== room) {
+      room.appendChild(this.outliner_selected);
+    }
   }
 
   getManipulator() {
@@ -329,6 +358,7 @@ console.log('set translation snap', ev.data, ev);
     return locked;
   }
   editObject(object, isnew) {
+    if (this.roomedit.object) this.editObjectStop()
     this.roomedit.object = object;
     this.roomedit.parentObject = null;
     this.roomedit.objectBoundingBox = false;
@@ -346,11 +376,13 @@ console.log('set translation snap', ev.data, ev);
     object.addEventListener('load', (ev) => {
       this.roomedit.objectBoundingBox = object.getBoundingBox(true);
       this.editObjectUpdate();
-      this.editObjectShowWireframe();
+      //this.editObjectShowWireframe();
+      this.editObjectShowOutline();
       console.log('update bbox', this.roomedit.objectBoundingBox);
     });
 
-    object.pickable = false;
+    //object.pickable = false;
+    //console.log('set object unpickable', object);
 
     room.addEventListener('mousemove', (ev) => this.editObjectMousemove(ev));
     elation.events.add(this, 'mousedown', this.editObjectClick);
@@ -374,7 +406,8 @@ console.log('set translation snap', ev.data, ev);
     // activate context
     janus.engine.systems.controls.activateContext('roomedit', this);
 
-    this.editObjectShowWireframe();
+    //this.editObjectShowWireframe();
+    this.editObjectShowOutline();
     this.editObjectShowInfo(object);
     let manipulator = this.getManipulator();
     manipulator.attach(object.objects['3d']);
@@ -393,6 +426,18 @@ console.log('set translation snap', ev.data, ev);
     inventorypanel.refresh();
   }
 
+  editObjectShowOutline() {
+    if (this.roomedit.object === room) {
+      this.outliner_selected.deselect();
+    } else {
+      this.outliner_selected.select(this.roomedit.object);
+    }
+  }
+  editObjectRemoveOutline() {
+    if (this.outliner_selected) {
+      this.outliner_selected.deselect();
+    }
+  }
   editObjectShowWireframe() {
     if (this.roomedit.wireframe) {
       this.editObjectRemoveWireframe();
@@ -518,7 +563,7 @@ console.log('set translation snap', ev.data, ev);
           // restore collider
           this.roomedit.object.collision_id = this.roomedit.collision_id;
           this.roomedit.collision_id = false;
-        } else {
+        } else if (false) {
           this.roomedit.object.collision_id = 'cube';
           this.roomedit.object.collision_trigger = true;
           this.roomedit.object.collision_scale = this.roomedit.objectBoundingBox.max.clone().sub(this.roomedit.objectBoundingBox.min);
@@ -534,11 +579,13 @@ console.log('set translation snap', ev.data, ev);
         this.roomedit.object.dispatchEvent({type: 'edit', bubbles: true});
       }
     }
-    this.roomedit.object.pickable = true;
+    //this.roomedit.object.pickable = true;
+    this.roomedit.object.sync = true;
     this.roomedit.object = false;
     this.roomedit.raycast = false;
     this.roomedit.parentObject = null;
-    this.editObjectRemoveWireframe();
+    //this.editObjectRemoveWireframe();
+    this.editObjectRemoveOutline();
     this.editObjectRemoveParentWireframe();
     let manipulator = this.getManipulator();
     manipulator.detach();
@@ -573,7 +620,22 @@ console.log('set translation snap', ev.data, ev);
     if (this.roomedit.object) {
       var obj = this.roomedit.object;
       if (this.roomedit.moving && this.roomedit.raycast && ev.element.getProxyObject() !== obj) {
-        this.roomedit.objectPosition = ev.data.point;
+        let raycast = player.raycast(V(0, 0, -1));
+        if (raycast) {
+          let hit;
+          for (let i = 0; i < raycast.length; i++) {
+            if (raycast[i].object !== obj) {
+              hit = raycast[i];
+              break;
+            }
+          }
+    
+          if (hit) {
+            this.roomedit.objectPosition = hit.point;
+          }
+        } else {
+          this.roomedit.objectPosition = ev.data.point;
+        }
         let manipulator = this.getManipulator();
         manipulator.enabled = false;
         this.editObjectUpdate();
@@ -1042,6 +1104,7 @@ console.log('change color', obj.col, vec);
     if (obj) {
       this.roomedit.pastebuffer = obj;
 
+/*
       let data = new DataTransfer();
       data.items.add('text/plain', 'blublub');
       //data.items.add('x-janus/x-' + obj.tag, 'cool huh');
@@ -1050,6 +1113,7 @@ console.log('change color', obj.col, vec);
       }, (e) => {
         console.log('FAILED!', e);
       });
+*/
     }
   }
   editObjectCut(ev) {
@@ -1159,6 +1223,9 @@ console.log('[editor] scene added a thing', ev);
               let parts = newobjargs[j].split('=');
               objargs[parts[0]] = decodeURIComponent(parts[1]);
             }
+            if (objargs.id) {
+              objargs.collision_id = objargs.id;
+            }
             newobject = room.createObject(objtype, objargs);
             objects.push(newobject);
             if (objects[0]) {
@@ -1361,6 +1428,9 @@ console.log('pastey!', ev.clipboardData.items[0], ev);
     this.loadObjectFromURIList(url);
     ev.preventDefault();
   }
+  showCreateDialog(ev) {
+    console.log('create thing?');
+  }
 });
 
 elation.elements.define('janus.ui.editor.objectinfo', class extends elation.elements.base {

package/media/assets/webui/apps/inventory/inventory.css

@@ -54,8 +54,9 @@ ui-grid.models>* a {
   display: flex;
   align-items: center;
   justify-content: center;
-  text-align: Center;
+  text-align: center;
   text-decoration: none;
+  color: white;
 }
 ui-grid.models>* p {
   display: none;

package/media/assets/webui/apps/locomotion/teleporter.js

@@ -113,11 +113,18 @@ janus.registerElement('locomotion_teleporter', {
         onchange: ev => this.handleTeleportChange(ev),
         onactivate: ev => this.handleTeleportTurn(ev),
       },
-      'teleport_y': {
+      'teleport_y_right': {
         defaultbindings: 'gamepad_any_axis_1,gamepad_any_axis_3',
-        onchange: ev => this.handleTeleportChange(ev),
-        onactivate: ev => this.handleTeleportStart(ev),
+        onchange: ev => this.handleTeleportChange(ev, 'right'),
+        onactivate: ev => this.handleTeleportStart(ev, 'right'),
+      },
+/*
+      'teleport_y_left': {
+        defaultbindings: 'gamepad_6_axis_1,gamepad_6_axis_3',
+        onchange: ev => this.handleTeleportChange(ev, 'left'),
+        onactivate: ev => this.handleTeleportStart(ev, 'left'),
       },
+*/
       'teleport_trigger': {
         defaultbindings: 'gamepad_any_button_0',
         onactivate: ev => this.handleTeleportTrigger(ev),
@@ -147,6 +154,7 @@ janus.registerElement('locomotion_teleporter', {
       } else {
         startpoint = player.head.localToWorld(V(0,0,0));
         v0 = player.head.localToWorld(V(0,0,-speed)).sub(startpoint);
+        return; // Head-locked teleporter is awkward, do we really still support this?
       }
       let i = 0,
           p0 = startpoint.clone(),
@@ -210,7 +218,7 @@ janus.registerElement('locomotion_teleporter', {
     //if (!room.teleport) return;
     if (this.teleportactive) {
       let controls = this.activecontrols;
-      let xy = new THREE.Vector2(controls.teleport_x, controls.teleport_y),
+      let xy = new THREE.Vector2(controls.teleport_x, controls['teleport_y_' + this.teleporthand]),
           len = xy.length();
 
       if (len > .8) {
@@ -228,7 +236,7 @@ janus.registerElement('locomotion_teleporter', {
     if (!room.teleport) return;
     if (!this.teleportactive && Math.abs(ev.value) > .8) {
       this.teleportactive = true;
-      this.teleporthand = 'right';
+      this.teleporthand = hand || 'right';
       this.enableCursor();
       this.updateTeleportAngle();
     }
@@ -260,15 +268,17 @@ janus.registerElement('locomotion_teleporter', {
   },
   updateTeleportAngle() {
     let controls = this.activecontrols;
-    let controllerangle = Math.atan2(controls.teleport_x, controls.teleport_y);
+    let controllerangle = Math.atan2(controls.teleport_x, controls['teleport_y_' + this.teleporthand]);
     let playerangle = Math.atan2(this.pos.x, this.pos.z);
     this.teleportangle = (controllerangle + playerangle) + Math.PI;
   },
   handleMouseDown(ev) {
     if (!room.teleport) return;
     if (ev.button == 0 && (player.enabled || janus.hmd)) {
-      this.longpresstimer = setTimeout(() => { console.log('timer fired'); this.enableCursor(); }, this.longpresstime);
-      this.mousediff = [0,0];
+      if (!this.longpresstimer) {
+        //this.longpresstimer = setTimeout(() => { console.log('timer fired'); this.enableCursor(); }, this.longpresstime);
+        this.mousediff = [0,0];
+      }
       //this.active = true;
     }
   },

package/media/assets/webui/apps/virtualgamepad/virtualgamepad.js

@@ -96,7 +96,7 @@ this.debug.style.zIndex = '1000';
       this.style.top = (this.position[1] * 100) + '%';
     }
 
-    let janus = elation.component.fetch(this.queryParentSelector('[data-elation-component="janusweb.client"]'))
+    let janus = this.queryParentSelector('janusweb-client');
     if (janus) {
       janus.engine.systems.controls.addVirtualGamepad(this);
       this.hide();

package/media/assets/webui/apps/xrmenu/xrmenu.js

@@ -28,33 +28,38 @@ janus.registerElement('xrmenu', {
           pos: V(.08, 0, 0),
           label: 'Home',
           image_id: 'xrmenu-button-home',
-          onactivate: (ev) => janus.navigateHome(),
+          //onactivate: (ev) => janus.navigateHome(),
         }),
         back: this.createObject('xrmenu-button', {
           pos: V(.20, 0, 0),
           label: 'Back',
           image_id: 'xrmenu-button-back',
-          onactivate: (ev) => janus.navigateBack(),
+          //onactivate: (ev) => janus.navigateBack(),
         }),
         reset: this.createObject('xrmenu-button', {
           pos: V(.32, 0, 0),
           label: 'Reset',
           image_id: 'xrmenu-button-reset',
-          onactivate: (ev) => player.reset_position(),
+          //onactivate: (ev) => player.reset_position(),
         }),
         reload: this.createObject('xrmenu-button', {
           pos: V(.44, 0, 0),
           label: 'Reload',
           image_id: 'xrmenu-button-reload',
-          onactivate: (ev) => location.reload(),
+          //onactivate: (ev) => location.reload(),
         }),
         exitvr: this.createObject('xrmenu-button', {
           pos: V(.56, 0, 0),
           label: 'Exit VR',
           //image_id: 'xrmenu-button-exitvr',
-          onactivate: (ev) => this.engine.client.stopXR(),
+          //onactivate: (ev) => this.engine.client.stopXR(),
         }),
       };
+      this.buttons.home.addEventListener('activate', ev => janus.navigateHome());
+      this.buttons.back.addEventListener('activate', ev => janus.navigateBack());
+      this.buttons.reset.addEventListener('activate', ev => player.reset_position());
+      this.buttons.reload.addEventListener('activate', ev => location.reload());
+      this.buttons.exitvr.addEventListener('activate', ev => this.engine.client.stopXR());
       this.reflow();
     });
   },