repo: janusweb
action: commit
revision: 
path_from: 
revision_from: d3235bb78ca6658974459e52232898324ffcc48d:
path_to: 
revision_to: 

commit d3235bb78ca6658974459e52232898324ffcc48d
Author: James Baicoianu 
Date:   Sat Oct 21 03:49:46 2017 -0700

    Added player.collision_radius parameter

diff --git a/scripts/janusplayer.js b/scripts/janusplayer.js

--- a/scripts/janusplayer.js
+++ b/scripts/janusplayer.js
@@ -13,7 +13,8 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         janus: {type: 'object' },
         room: {type: 'object' },
         cursor_visible: {type: 'boolean', default: true, set: this.toggleCursorVisibility},
-        usevoip: {type: 'boolean', default: false }
+        usevoip: {type: 'boolean', default: false },
+        collision_radius: {type: 'float', set: this.updateCollider}
       });

       var controllerconfig = this.getSetting('controls.settings');
@@ -437,6 +438,8 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         hand1_p4:      ['property', 'hands.right.p4'],
         url:           ['property', 'parent.currentroom.url'],

+        collision_radius: ['property', 'collision_radius'],
+
         localToWorld:  ['function', 'localToWorld'],
         worldToLocal:  ['function', 'worldToLocal'],
         appendChild:   ['function', 'appendChild'],
@@ -605,6 +608,14 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         }
       }
     }
+    this.updateCollider = function() {
+      if (this.objects['dynamics']) {
+        this.setCollider('sphere', {
+          radius: this.collision_radius,
+          offset: V(0, this.collision_radius / 2, 0)
+        });
+      }
+    }
     this.raycast = (function() {
       var _pos = new THREE.Vector3(),
           _dir = new THREE.Vector3(0,0,-1);

-----END OF PAGE-----