Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 16:44:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Went back to transparent spheres for equip points

Browse source
This commit is contained in:
Anthony J. Thibault 2016-07-08 17:05:23 -07:00
parent c8d0decab7
commit bec71e4af4
1 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -939,25 +939,21 @@ function MyController(hand) {
overlays: []
};
overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
url: "http://hifi-content.s3.amazonaws.com/alan/dev/Equip-Spark.fbx",
var EQUIP_SPHERE_COLOR = { red: 179, green: 120, blue: 211 };
var EQUIP_SPHERE_ALPHA = 0.3;
overlayInfoSet.overlays.push(Overlays.addOverlay("sphere", {
position: hotspot.worldPosition,
rotation: {x: 0, y: 0, z: 0, w: 1},
dimensions: hotspot.radius * 2 * SPARK_MODEL_SCALE_FACTOR,
ignoreRayIntersection: true
size: hotspot.radius * 2,
color: EQUIP_SPHERE_COLOR,
alpha: EQUIP_SPHERE_ALPHA,
solid: true,
visible: true,
ignoreRayIntersection: true,
drawInFront: false
}));
// TODO: use shader to achive fresnel effect.
overlayInfoSet.overlays.push(Overlays.addOverlay("model", {
url: "http://hifi-content.s3.amazonaws.com/alan/dev/equip-Fresnel-3.fbx",
position: hotspot.worldPosition,
rotation: {x: 0, y: 0, z: 0, w: 1},
dimensions: hotspot.radius * 2,
ignoreRayIntersection: true
}));
// TODO: add light
return overlayInfoSet;
};
@ -976,18 +972,12 @@ function MyController(hand) {
var entityXform = new Xform(props.rotation, props.position);
var position = entityXform.xformPoint(overlayInfoSet.localPosition);
// spark
Overlays.editOverlay(overlayInfoSet.overlays[0], {
position: position,
rotation: props.rotation,
dimensions: radius * 2 * SPARK_MODEL_SCALE_FACTOR
});
// fresnel sphere
Overlays.editOverlay(overlayInfoSet.overlays[1], {
position: position,
rotation: props.rotation,
dimensions: radius * 2
overlayInfoSet.overlays.forEach(function (overlay) {
Overlays.editOverlay(overlay, {
position: position,
rotation: props.rotation,
dimensions: radius * 2
});
});
};