Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to the cool looking model instead

Browse source
This commit is contained in:
David Kelly 2016-09-16 10:56:59 -07:00
parent 1acfe017e1
commit 2ddd46f30b
1 changed files with 18 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
scripts/system/controllers/handControllerGrab.js
View file

@ -205,6 +205,8 @@ var CONTROLLER_STATE_MACHINE = {};
var mostRecentSearchingHand = RIGHT_HAND; var mostRecentSearchingHand = RIGHT_HAND;
var DEFAULT_SPHERE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/alan/dev/equip-Fresnel-3.fbx";
CONTROLLER_STATE_MACHINE[STATE_OFF] = { CONTROLLER_STATE_MACHINE[STATE_OFF] = {
name: "off", name: "off",
enterMethod: "offEnter", enterMethod: "offEnter",
@ -605,10 +607,9 @@ EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
var diameter = hotspot.radius * 2; var diameter = hotspot.radius * 2;
if (hotspot.modelURL) { // override default sphere with a user specified model, if it exists.
// override default sphere with a user specified model
overlayInfoSet.overlays.push(Overlays.addOverlay("model", { overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
url: hotspot.modelURL, url: hotspot.modelURL ? hotspot.modelURL : DEFAULT_SPHERE_MODEL_URL,
position: hotspot.worldPosition, position: hotspot.worldPosition,
rotation: { rotation: {
x: 0, x: 0,
@ -621,28 +622,6 @@ EquipHotspotBuddy.prototype.updateHotspot = function(hotspot, timestamp) {
ignoreRayIntersection: true ignoreRayIntersection: true
})); }));
overlayInfoSet.type = "model"; overlayInfoSet.type = "model";
} else {
// default sphere overlay
overlayInfoSet.overlays.push(Overlays.addOverlay("sphere", {
position: hotspot.worldPosition,
rotation: {
x: 0,
y: 0,
z: 0,
w: 1
},
dimensions: diameter * EQUIP_SPHERE_SCALE_FACTOR,
color: EQUIP_SPHERE_COLOR,
alpha: EQUIP_SPHERE_ALPHA,
emissive: true,
solid: true,
visible: true,
ignoreRayIntersection: true,
drawInFront: false
}));
overlayInfoSet.type = "sphere";
}
this.map[hotspot.key] = overlayInfoSet; this.map[hotspot.key] = overlayInfoSet;
} else { } else {
overlayInfoSet.timestamp = timestamp; overlayInfoSet.timestamp = timestamp;