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

Update line3d in editModels to use start instead of position

Browse source
This commit is contained in:
Ryan Huffman 2014-12-18 16:41:41 -08:00
parent 2e95618bed
commit 1776b2dee2
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
examples/editModels.js
View file

@ -1884,7 +1884,7 @@ function controller(wichSide) {
this.jointsIntersectingFromStart = []; this.jointsIntersectingFromStart = [];
this.laser = Overlays.addOverlay("line3d", { this.laser = Overlays.addOverlay("line3d", {
position: { x: 0, y: 0, z: 0 }, start: { x: 0, y: 0, z: 0 },
end: { x: 0, y: 0, z: 0 }, end: { x: 0, y: 0, z: 0 },
color: LASER_COLOR, color: LASER_COLOR,
alpha: 1, alpha: 1,
@ -1904,7 +1904,7 @@ function controller(wichSide) {
anchor: "MyAvatar" anchor: "MyAvatar"
}); });
this.leftRight = Overlays.addOverlay("line3d", { this.leftRight = Overlays.addOverlay("line3d", {
position: { x: 0, y: 0, z: 0 }, start: { x: 0, y: 0, z: 0 },
end: { x: 0, y: 0, z: 0 }, end: { x: 0, y: 0, z: 0 },
color: { red: 0, green: 0, blue: 255 }, color: { red: 0, green: 0, blue: 255 },
alpha: 1, alpha: 1,
@ -1913,7 +1913,7 @@ function controller(wichSide) {
anchor: "MyAvatar" anchor: "MyAvatar"
}); });
this.topDown = Overlays.addOverlay("line3d", { this.topDown = Overlays.addOverlay("line3d", {
position: { x: 0, y: 0, z: 0 }, start: { x: 0, y: 0, z: 0 },
end: { x: 0, y: 0, z: 0 }, end: { x: 0, y: 0, z: 0 },
color: { red: 0, green: 0, blue: 255 }, color: { red: 0, green: 0, blue: 255 },
alpha: 1, alpha: 1,
@ -2066,7 +2066,7 @@ function controller(wichSide) {
var endPosition = Vec3.sum(startPosition, direction); var endPosition = Vec3.sum(startPosition, direction);
Overlays.editOverlay(this.laser, { Overlays.editOverlay(this.laser, {
position: startPosition, start: startPosition,
end: endPosition end: endPosition
}); });
@ -2075,10 +2075,11 @@ function controller(wichSide) {
position: endPosition position: endPosition
}); });
Overlays.editOverlay(this.leftRight, { Overlays.editOverlay(this.leftRight, {
position: Vec3.sum(endPosition, Vec3.multiply(this.right, 2 * this.guideScale)), start: Vec3.sum(endPosition, Vec3.multiply(this.right, 2 * this.guideScale)),
end: Vec3.sum(endPosition, Vec3.multiply(this.right, -2 * this.guideScale)) end: Vec3.sum(endPosition, Vec3.multiply(this.right, -2 * this.guideScale))
}); });
Overlays.editOverlay(this.topDown, { position: Vec3.sum(endPosition, Vec3.multiply(this.up, 2 * this.guideScale)), Overlays.editOverlay(this.topDown, {
start: Vec3.sum(endPosition, Vec3.multiply(this.up, 2 * this.guideScale)),
end: Vec3.sum(endPosition, Vec3.multiply(this.up, -2 * this.guideScale)) end: Vec3.sum(endPosition, Vec3.multiply(this.up, -2 * this.guideScale))
}); });
this.showLaser(!this.grabbing || mode == 0); this.showLaser(!this.grabbing || mode == 0);