Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 18:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into temp1

Browse source
This commit is contained in:
Sam Gateau 2015-01-14 16:46:18 -08:00
commit 2c8aa91e64
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/controllers/hydra/gun.js
View file

@ -14,7 +14,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
Script.include("libraries/globals.js"); Script.include("../../libraries/globals.js");
function getRandomFloat(min, max) { function getRandomFloat(min, max) {
return Math.random() * (max - min) + min; return Math.random() * (max - min) + min;
@ -254,8 +254,8 @@ function takeFiringPose() {
} }
} }
MyAvatar.attach(gunModel, "RightHand", {x:0.02, y: 0.11, z: 0.04}, Quat.fromPitchYawRollDegrees(-0, -160, -79), 0.20); //MyAvatar.attach(gunModel, "RightHand", {x:0.02, y: 0.11, z: 0.04}, Quat.fromPitchYawRollDegrees(-0, -160, -79), 0.20);
//MyAvatar.attach(gunModel, "LeftHand", {x: -0.02, y: -.14, z: 0.07}, Quat.fromPitchYawRollDegrees(-70, -151, 72), 0.20); MyAvatar.attach(gunModel, "LeftHand", {x:-0.02, y: 0.11, z: 0.04}, Quat.fromPitchYawRollDegrees(0, 0, 79), 0.20);
// Give a bit of time to load before playing sound // Give a bit of time to load before playing sound
Script.setTimeout(playLoadSound, 2000); Script.setTimeout(playLoadSound, 2000);

25
examples/libraries/entitySelectionTool.js
View file

@ -242,6 +242,9 @@ SelectionDisplay = (function () {
var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18; var ROTATION_DISPLAY_SIZE_Y_MULTIPLIER = 0.18;
var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.17; var ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER = 0.17;
var ROTATE_ARROW_WEST_NORTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-north.png";
var ROTATE_ARROW_WEST_SOUTH_URL = HIFI_PUBLIC_BUCKET + "images/rotate-arrow-west-south.png";
var showExtendedStretchHandles = false; var showExtendedStretchHandles = false;
var spaceMode = SPACE_LOCAL; var spaceMode = SPACE_LOCAL;
@ -590,7 +593,7 @@ SelectionDisplay = (function () {
}); });
var yawHandle = Overlays.addOverlay("billboard", { var yawHandle = Overlays.addOverlay("billboard", {
url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png", url: ROTATE_ARROW_WEST_NORTH_URL,
position: { x:0, y: 0, z: 0}, position: { x:0, y: 0, z: 0},
color: rotateHandleColor, color: rotateHandleColor,
alpha: rotateHandleAlpha, alpha: rotateHandleAlpha,
@ -603,7 +606,7 @@ SelectionDisplay = (function () {
var pitchHandle = Overlays.addOverlay("billboard", { var pitchHandle = Overlays.addOverlay("billboard", {
url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png", url: ROTATE_ARROW_WEST_NORTH_URL,
position: { x:0, y: 0, z: 0}, position: { x:0, y: 0, z: 0},
color: rotateHandleColor, color: rotateHandleColor,
alpha: rotateHandleAlpha, alpha: rotateHandleAlpha,
@ -616,7 +619,7 @@ SelectionDisplay = (function () {
var rollHandle = Overlays.addOverlay("billboard", { var rollHandle = Overlays.addOverlay("billboard", {
url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png", url: ROTATE_ARROW_WEST_NORTH_URL,
position: { x:0, y: 0, z: 0}, position: { x:0, y: 0, z: 0},
color: rotateHandleColor, color: rotateHandleColor,
alpha: rotateHandleAlpha, alpha: rotateHandleAlpha,
@ -835,8 +838,8 @@ SelectionDisplay = (function () {
rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: far }; rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: far };
Overlays.editOverlay(pitchHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-south.png" }); Overlays.editOverlay(pitchHandle, { url: ROTATE_ARROW_WEST_SOUTH_URL });
Overlays.editOverlay(rollHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-south.png" }); Overlays.editOverlay(rollHandle, { url: ROTATE_ARROW_WEST_SOUTH_URL });
} else { } else {
@ -867,8 +870,8 @@ SelectionDisplay = (function () {
pitchCenter = { x: right, y: boundsCenter.y, z: boundsCenter.z }; pitchCenter = { x: right, y: boundsCenter.y, z: boundsCenter.z };
rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: near}; rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: near};
Overlays.editOverlay(pitchHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png" }); Overlays.editOverlay(pitchHandle, { url: ROTATE_ARROW_WEST_NORTH_URL });
Overlays.editOverlay(rollHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png" }); Overlays.editOverlay(rollHandle, { url: ROTATE_ARROW_WEST_NORTH_URL });
} }
} else { } else {
@ -899,8 +902,8 @@ SelectionDisplay = (function () {
pitchCenter = { x: left, y: boundsCenter.y, z: boundsCenter.z }; pitchCenter = { x: left, y: boundsCenter.y, z: boundsCenter.z };
rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: far}; rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: far};
Overlays.editOverlay(pitchHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png" }); Overlays.editOverlay(pitchHandle, { url: ROTATE_ARROW_WEST_NORTH_URL });
Overlays.editOverlay(rollHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png" }); Overlays.editOverlay(rollHandle, { url: ROTATE_ARROW_WEST_NORTH_URL });
} else { } else {
@ -928,8 +931,8 @@ SelectionDisplay = (function () {
rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: near }; rollCenter = { x: boundsCenter.x, y: boundsCenter.y, z: near };
pitchCenter = { x: left, y: boundsCenter.y, z: boundsCenter.z}; pitchCenter = { x: left, y: boundsCenter.y, z: boundsCenter.z};
Overlays.editOverlay(pitchHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png" }); Overlays.editOverlay(pitchHandle, { url: ROTATE_ARROW_WEST_NORTH_URL });
Overlays.editOverlay(rollHandle, { url: "https://public.highfidelity.io/images/rotate-arrow-west-north.png" }); Overlays.editOverlay(rollHandle, { url: ROTATE_ARROW_WEST_NORTH_URL });
} }
} }