Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 15:39:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update javascript to use relative-to-entity line-point ends

Browse source
This commit is contained in:
Seth Alves 2015-07-13 11:42:29 -07:00
parent a24fd13665
commit d44bb1a0d8
1 changed files with 41 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/pointer.js
View file

@ -70,34 +70,23 @@ function createOrUpdateLine(event) {
var props = Entities.getEntityProperties(intersection.entityID); var props = Entities.getEntityProperties(intersection.entityID);
if (intersection.intersects && userCanPoint) { if (intersection.intersects && userCanPoint) {
var points = [nearLinePoint(intersection.intersection), intersection.intersection] var points = [Vec3.subtract(nearLinePoint(intersection.intersection), MyAvatar.position),
Vec3.subtract(intersection.intersection, MyAvatar.position)];
if (lineIsRezzed) { if (lineIsRezzed) {
Entities.editEntity(lineEntityID, { Entities.editEntity(lineEntityID, {
position: nearLinePoint(intersection.intersection),
linePoints: points, linePoints: points,
dimensions: { position: MyAvatar.position,
x: 1,
y: 1,
z: 1
},
lifetime: 15 + props.lifespan // renew lifetime lifetime: 15 + props.lifespan // renew lifetime
}); });
// Entities.setAllPoints(lineEntityID, points);
} else { } else {
lineIsRezzed = true; lineIsRezzed = true;
lineEntityID = Entities.addEntity({ lineEntityID = Entities.addEntity({
type: "Line", type: "Line",
position: nearLinePoint(intersection.intersection), position: MyAvatar.position,
linePoints: points, linePoints: points,
dimensions: { dimensions: { x: 100, y: 100, z: 100 },
x: 1, color: { red: 255, green: 255, blue: 255 },
y: 1,
z: 1
},
color: {
red: 255,
green: 255,
blue: 255
},
lifetime: 15 // if someone crashes while pointing, don't leave the line there forever. lifetime: 15 // if someone crashes while pointing, don't leave the line there forever.
}); });
} }
@ -112,21 +101,17 @@ function mousePressEvent(event) {
return; return;
} }
createOrUpdateLine(event);
var clickedOverlay = Overlays.getOverlayAtPoint({ var clickedOverlay = Overlays.getOverlayAtPoint({
x: event.x, x: event.x,
y: event.y y: event.y
}); });
if (clickedOverlay == pointerButton) { if (clickedOverlay == pointerButton) {
userCanPoint = !userCanPoint; userCanPoint = !userCanPoint;
if (userCanPoint === true) { if (userCanPoint === true) {
Overlays.editOverlay(pointerButton, { Overlays.editOverlay(pointerButton, { color: buttonOnColor });
color: buttonOnColor
});
} else { } else {
Overlays.editOverlay(pointerButton, { Overlays.editOverlay(pointerButton, { color: buttonOffColor });
color: buttonOffColor
});
} }
} }
} }