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

Merge pull request #5456 from SamGondelman/sam/input-plugins

Browse source 
Plugins branch - fixed comfort mode, other scripts
This commit is contained in:
Brad Davis 2015-07-29 12:15:42 -07:00
commit d16e00c17b
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/hmdControls.js
View file

@ -55,8 +55,8 @@ var warpLine = Overlays.addOverlay("line3d", {
var velocity = { x: 0, y: 0, z: 0 }; var velocity = { x: 0, y: 0, z: 0 };
var VERY_LONG_TIME = 1000000.0; var VERY_LONG_TIME = 1000000.0;
var active = Menu.isOptionChecked("Enable VR Mode"); var active = HMD.active;
var prevVRMode = Menu.isOptionChecked("Enable VR Mode"); var prevVRMode = HMD.active;
var hmdControls = (function () { var hmdControls = (function () {
@ -121,28 +121,28 @@ var hmdControls = (function () {
velocity = Vec3.sum(velocity, direction); velocity = Vec3.sum(velocity, direction);
break; break;
case findAction("YAW_LEFT"): case findAction("YAW_LEFT"):
if (yawTimer < 0.0 && Menu.isOptionChecked("Enable VR Mode")) { if (yawTimer < 0.0 && HMD.active) {
yawChange = yawChange + (shifted ? SHIFT_MAG * VR_YAW_INCREMENT : VR_YAW_INCREMENT); yawChange = yawChange + (shifted ? SHIFT_MAG * VR_YAW_INCREMENT : VR_YAW_INCREMENT);
yawTimer = CAMERA_UPDATE_TIME; yawTimer = CAMERA_UPDATE_TIME;
} else if (!Menu.isOptionChecked("Enable VR Mode")) { } else if (!HMD.active) {
yawChange = yawChange + (shifted ? SHIFT_MAG * YAW_INCREMENT : YAW_INCREMENT); yawChange = yawChange + (shifted ? SHIFT_MAG * YAW_INCREMENT : YAW_INCREMENT);
} }
break; break;
case findAction("YAW_RIGHT"): case findAction("YAW_RIGHT"):
if (yawTimer < 0.0 && Menu.isOptionChecked("Enable VR Mode")) { if (yawTimer < 0.0 && HMD.active) {
yawChange = yawChange - (shifted ? SHIFT_MAG * VR_YAW_INCREMENT : VR_YAW_INCREMENT); yawChange = yawChange - (shifted ? SHIFT_MAG * VR_YAW_INCREMENT : VR_YAW_INCREMENT);
yawTimer = CAMERA_UPDATE_TIME; yawTimer = CAMERA_UPDATE_TIME;
} else if (!Menu.isOptionChecked("Enable VR Mode")) { } else if (!HMD.active) {
yawChange = yawChange - (shifted ? SHIFT_MAG * YAW_INCREMENT : YAW_INCREMENT); yawChange = yawChange - (shifted ? SHIFT_MAG * YAW_INCREMENT : YAW_INCREMENT);
} }
break; break;
case findAction("PITCH_DOWN"): case findAction("PITCH_DOWN"):
if (!Menu.isOptionChecked("Enable VR Mode")) { if (!HMD.active) {
pitchChange = pitchChange - (shifted ? SHIFT_MAG * PITCH_INCREMENT : PITCH_INCREMENT); pitchChange = pitchChange - (shifted ? SHIFT_MAG * PITCH_INCREMENT : PITCH_INCREMENT);
} }
break; break;
case findAction("PITCH_UP"): case findAction("PITCH_UP"):
if (!Menu.isOptionChecked("Enable VR Mode")) { if (!HMD.active) {
pitchChange = pitchChange + (shifted ? SHIFT_MAG * PITCH_INCREMENT : PITCH_INCREMENT); pitchChange = pitchChange + (shifted ? SHIFT_MAG * PITCH_INCREMENT : PITCH_INCREMENT);
} }
break; break;
@ -175,9 +175,9 @@ var hmdControls = (function () {
} }
function update(dt) { function update(dt) {
if (prevVRMode != Menu.isOptionChecked("Enable VR Mode")) { if (prevVRMode != HMD.active) {
active = Menu.isOptionChecked("Enable VR Mode"); active = HMD.active;
prevVRMode = Menu.isOptionChecked("Enable VR Mode"); prevVRMode = HMD.active;
} }
if (yawTimer >= 0.0) { if (yawTimer >= 0.0) {

3
examples/notifications.js
View file

@ -130,7 +130,6 @@ var heights = [];
var myAlpha = []; var myAlpha = [];
var arrays = []; var arrays = [];
var isOnHMD = false, var isOnHMD = false,
ENABLE_VR_MODE = "Enable VR Mode",
NOTIFICATIONS_3D_DIRECTION = 0.0, // Degrees from avatar orientation. NOTIFICATIONS_3D_DIRECTION = 0.0, // Degrees from avatar orientation.
NOTIFICATIONS_3D_DISTANCE = 0.6, // Horizontal distance from avatar position. NOTIFICATIONS_3D_DISTANCE = 0.6, // Horizontal distance from avatar position.
NOTIFICATIONS_3D_ELEVATION = -0.8, // Height of top middle of top notification relative to avatar eyes. NOTIFICATIONS_3D_ELEVATION = -0.8, // Height of top middle of top notification relative to avatar eyes.
@ -414,7 +413,7 @@ function update() {
j, j,
k; k;
if (isOnHMD !== Menu.isOptionChecked(ENABLE_VR_MODE)) { if (isOnHMD !== HMD.active) {
while (arrays.length > 0) { while (arrays.length > 0) {
deleteNotification(0); deleteNotification(0);
} }

3
examples/progress.js
View file

@ -41,7 +41,6 @@
SCALE_2D = 0.35, // Scale the SVGs for 2D display. SCALE_2D = 0.35, // Scale the SVGs for 2D display.
background3D = {}, background3D = {},
bar3D = {}, bar3D = {},
ENABLE_VR_MODE_MENU_ITEM = "Enable VR Mode",
PROGRESS_3D_DIRECTION = 0.0, // Degrees from avatar orientation. PROGRESS_3D_DIRECTION = 0.0, // Degrees from avatar orientation.
PROGRESS_3D_DISTANCE = 0.602, // Horizontal distance from avatar position. PROGRESS_3D_DISTANCE = 0.602, // Horizontal distance from avatar position.
PROGRESS_3D_ELEVATION = -0.8, // Height of top middle of top notification relative to avatar eyes. PROGRESS_3D_ELEVATION = -0.8, // Height of top middle of top notification relative to avatar eyes.
@ -157,7 +156,7 @@
eyePosition, eyePosition,
avatarOrientation; avatarOrientation;
if (isOnHMD !== Menu.isOptionChecked(ENABLE_VR_MODE_MENU_ITEM)) { if (isOnHMD !== HMD.active) {
deleteOverlays(); deleteOverlays();
isOnHMD = !isOnHMD; isOnHMD = !isOnHMD;
createOverlays(); createOverlays();