From 411541b8847053de355bdce7c7b905121e10f079 Mon Sep 17 00:00:00 2001
From: Chris Collins <chris@highfidelity.io>
Date: Tue, 27 Jan 2015 11:04:50 -0800
Subject: [PATCH 1/2] Tidy up some scripts.
Tidy up scripts. Make some changes to some script references and
reorganize.
---
.../RealSense}/realsenseHands.js | 0
examples/controllers/oculus/vrUI.js | 187 ++++++++++++++++++
examples/{ => example/games}/billiards.js | 0
examples/utilities/record/recorder.js | 2 +-
4 files changed, 188 insertions(+), 1 deletion(-)
rename examples/{ => controllers/RealSense}/realsenseHands.js (100%)
create mode 100644 examples/controllers/oculus/vrUI.js
rename examples/{ => example/games}/billiards.js (100%)
diff --git a/examples/realsenseHands.js b/examples/controllers/RealSense/realsenseHands.js
similarity index 100%
rename from examples/realsenseHands.js
rename to examples/controllers/RealSense/realsenseHands.js
diff --git a/examples/controllers/oculus/vrUI.js b/examples/controllers/oculus/vrUI.js
new file mode 100644
index 0000000000..9586445980
--- /dev/null
+++ b/examples/controllers/oculus/vrUI.js
@@ -0,0 +1,187 @@
+// VR menu prototype
+// David Rowe
+
+HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
+
+var vrChat = (function () {
+
+ var background,
+ CHAT_YAW = -40.0, // Degrees
+ CHAT_DISTANCE = 0.6,
+ CHAT_HEIGHT = 0.35;
+
+ function setUp() {
+ background = Overlays.addOverlay("rectangle3d", {
+ color: { red: 200, green: 200, blue: 200 },
+ alpha: 0.5,
+ solid: true,
+ visible: false,
+ dimensions: { width: 0.3, height: 0.5 },
+ ignoreRayIntersection: true,
+ isFacingAvatar: false
+ });
+ }
+
+ function show(on) {
+ Overlays.editOverlay(background, { visible: on });
+ }
+
+ function update() {
+ var CHAT_OFFSET = { x: 0.0, y: CHAT_HEIGHT, z: -CHAT_DISTANCE },
+ chatRotation,
+ chatOffset;
+
+ chatRotation = Quat.multiply(Quat.fromPitchYawRollDegrees(0.0, CHAT_YAW, 0.0), MyAvatar.orientation);
+ chatOffset = Vec3.multiplyQbyV(chatRotation, CHAT_OFFSET);
+ chatRotation = Quat.multiply(chatRotation, Quat.fromPitchYawRollDegrees(90.0, 0.0, 0.0));
+
+ Overlays.editOverlay(background, {
+ position: Vec3.sum(MyAvatar.position, chatOffset),
+ rotation: chatRotation
+ });
+ }
+
+ function tearDown() {
+ Overlays.deleteOverlay(background);
+ }
+
+ return {
+ setUp: setUp,
+ show: show,
+ update: update,
+ tearDown: tearDown
+ };
+
+}());
+
+
+var vrMenu = (function () {
+
+ var menuItems = [],
+ menuVisible = false,
+ MENU_HEIGHT = 0.7,
+ MENU_RADIUS = 0.6,
+ ITEM_SPACING = 12.0, // Degrees
+ IMAGE_WIDTH = 160,
+ IMAGE_HEIGHT = 100,
+ IMAGE_SCALE = 0.1,
+ NUMBER_OF_BUTTONS = 10;
+
+ function setVisible(visible) {
+ var i;
+
+ menuVisible = visible;
+
+ for (i = 0; i < menuItems.length; i += 1) {
+ Overlays.editOverlay(menuItems[i].overlay, { visible: menuVisible });
+ }
+ }
+
+ function keyPressEvent(event) {
+ if (event.text.toLowerCase() === "o") {
+ setVisible(!menuVisible);
+ }
+ }
+
+ function mousePressEvent(event) {
+ var pickRay,
+ intersection,
+ subImage = { x: 0, y: IMAGE_HEIGHT, width: IMAGE_WIDTH, height: IMAGE_HEIGHT },
+ i;
+
+ pickRay = Camera.computePickRay(event.x, event.y);
+ intersection = Overlays.findRayIntersection(pickRay);
+
+ if (intersection.intersects) {
+ for (i = 0; i < menuItems.length; i += 1) {
+ if (intersection.overlayID === menuItems[i].overlay) {
+ menuItems[i].on = !menuItems[i].on;
+ subImage.y = (menuItems[i].on ? 0 : 1) * IMAGE_HEIGHT;
+ Overlays.editOverlay(menuItems[i].overlay, { subImage: subImage });
+ if (menuItems[i].callback) {
+ menuItems[i].callback(menuItems[i].on);
+ }
+ }
+ }
+ }
+ }
+
+ function setUp() {
+ var overlay,
+ menuItem,
+ i;
+
+ for (i = 0; i < NUMBER_OF_BUTTONS; i += 1) {
+ overlay = Overlays.addOverlay("billboard", {
+ url: "http://ctrlaltstudio.com/hifi/menu-blank.svg",
+ subImage: { x: 0, y: IMAGE_HEIGHT, width: IMAGE_WIDTH, height: IMAGE_HEIGHT },
+ alpha: 1.0,
+ visible: false,
+ scale: IMAGE_SCALE,
+ isFacingAvatar: false
+ });
+
+ menuItem = {
+ overlay: overlay,
+ on: false,
+ callback: null
+ };
+
+ menuItems.push(menuItem);
+ }
+
+ Overlays.editOverlay(menuItems[NUMBER_OF_BUTTONS - 2].overlay, {
+ url: "http://ctrlaltstudio.com/hifi/menu-chat.svg"
+ });
+ menuItems[NUMBER_OF_BUTTONS - 2].callback = vrChat.show;
+
+ Controller.keyPressEvent.connect(keyPressEvent);
+ Controller.mousePressEvent.connect(mousePressEvent);
+ }
+
+ function update() {
+ var MENU_OFFSET = { x: 0.0, y: MENU_HEIGHT, z: -MENU_RADIUS }, // Offset from avatar position.
+ itemAngle,
+ itemRotation,
+ itemOffset,
+ i;
+
+ itemAngle = menuItems.length * ITEM_SPACING / 2.0;
+
+ for (i = 0; i < menuItems.length; i += 1) {
+
+ itemRotation = Quat.multiply(Quat.fromPitchYawRollDegrees(0.0, itemAngle, 0.0), MyAvatar.orientation);
+ itemOffset = Vec3.multiplyQbyV(itemRotation, MENU_OFFSET);
+
+ Overlays.editOverlay(menuItems[i].overlay, {
+ position: Vec3.sum(MyAvatar.position, itemOffset),
+ rotation: itemRotation
+ });
+
+ itemAngle -= ITEM_SPACING;
+ }
+ }
+
+ function tearDown() {
+ var i;
+
+ for (i = 0; i < menuItems.length; i += 1) {
+ Overlays.deleteOverlay(menuItems[i].overlay);
+ }
+ }
+
+ return {
+ setUp: setUp,
+ update: update,
+ tearDown: tearDown
+ };
+
+}());
+
+vrChat.setUp();
+Script.update.connect(vrChat.update);
+Script.scriptEnding.connect(vrChat.tearDown);
+
+vrMenu.setUp();
+Script.update.connect(vrMenu.update);
+Script.scriptEnding.connect(vrMenu.tearDown);
\ No newline at end of file
diff --git a/examples/billiards.js b/examples/example/games/billiards.js
similarity index 100%
rename from examples/billiards.js
rename to examples/example/games/billiards.js
diff --git a/examples/utilities/record/recorder.js b/examples/utilities/record/recorder.js
index f3f46adf1a..495a862db1 100644
--- a/examples/utilities/record/recorder.js
+++ b/examples/utilities/record/recorder.js
@@ -10,7 +10,7 @@
//
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-Script.include("libraries/toolBars.js");
+Script.include("../../libraries/toolBars.js");
var recordingFile = "recording.rec";
From 283a056a43963b2fd484c18a68c83be841b2f024 Mon Sep 17 00:00:00 2001
From: Chris Collins <chris@highfidelity.io>
Date: Tue, 27 Jan 2015 11:37:31 -0800
Subject: [PATCH 2/2] remove VRui
remove VRui
---
examples/controllers/oculus/vrUI.js | 187 ----------------------------
1 file changed, 187 deletions(-)
delete mode 100644 examples/controllers/oculus/vrUI.js
diff --git a/examples/controllers/oculus/vrUI.js b/examples/controllers/oculus/vrUI.js
deleted file mode 100644
index 9586445980..0000000000
--- a/examples/controllers/oculus/vrUI.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// VR menu prototype
-// David Rowe
-
-HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
-
-var vrChat = (function () {
-
- var background,
- CHAT_YAW = -40.0, // Degrees
- CHAT_DISTANCE = 0.6,
- CHAT_HEIGHT = 0.35;
-
- function setUp() {
- background = Overlays.addOverlay("rectangle3d", {
- color: { red: 200, green: 200, blue: 200 },
- alpha: 0.5,
- solid: true,
- visible: false,
- dimensions: { width: 0.3, height: 0.5 },
- ignoreRayIntersection: true,
- isFacingAvatar: false
- });
- }
-
- function show(on) {
- Overlays.editOverlay(background, { visible: on });
- }
-
- function update() {
- var CHAT_OFFSET = { x: 0.0, y: CHAT_HEIGHT, z: -CHAT_DISTANCE },
- chatRotation,
- chatOffset;
-
- chatRotation = Quat.multiply(Quat.fromPitchYawRollDegrees(0.0, CHAT_YAW, 0.0), MyAvatar.orientation);
- chatOffset = Vec3.multiplyQbyV(chatRotation, CHAT_OFFSET);
- chatRotation = Quat.multiply(chatRotation, Quat.fromPitchYawRollDegrees(90.0, 0.0, 0.0));
-
- Overlays.editOverlay(background, {
- position: Vec3.sum(MyAvatar.position, chatOffset),
- rotation: chatRotation
- });
- }
-
- function tearDown() {
- Overlays.deleteOverlay(background);
- }
-
- return {
- setUp: setUp,
- show: show,
- update: update,
- tearDown: tearDown
- };
-
-}());
-
-
-var vrMenu = (function () {
-
- var menuItems = [],
- menuVisible = false,
- MENU_HEIGHT = 0.7,
- MENU_RADIUS = 0.6,
- ITEM_SPACING = 12.0, // Degrees
- IMAGE_WIDTH = 160,
- IMAGE_HEIGHT = 100,
- IMAGE_SCALE = 0.1,
- NUMBER_OF_BUTTONS = 10;
-
- function setVisible(visible) {
- var i;
-
- menuVisible = visible;
-
- for (i = 0; i < menuItems.length; i += 1) {
- Overlays.editOverlay(menuItems[i].overlay, { visible: menuVisible });
- }
- }
-
- function keyPressEvent(event) {
- if (event.text.toLowerCase() === "o") {
- setVisible(!menuVisible);
- }
- }
-
- function mousePressEvent(event) {
- var pickRay,
- intersection,
- subImage = { x: 0, y: IMAGE_HEIGHT, width: IMAGE_WIDTH, height: IMAGE_HEIGHT },
- i;
-
- pickRay = Camera.computePickRay(event.x, event.y);
- intersection = Overlays.findRayIntersection(pickRay);
-
- if (intersection.intersects) {
- for (i = 0; i < menuItems.length; i += 1) {
- if (intersection.overlayID === menuItems[i].overlay) {
- menuItems[i].on = !menuItems[i].on;
- subImage.y = (menuItems[i].on ? 0 : 1) * IMAGE_HEIGHT;
- Overlays.editOverlay(menuItems[i].overlay, { subImage: subImage });
- if (menuItems[i].callback) {
- menuItems[i].callback(menuItems[i].on);
- }
- }
- }
- }
- }
-
- function setUp() {
- var overlay,
- menuItem,
- i;
-
- for (i = 0; i < NUMBER_OF_BUTTONS; i += 1) {
- overlay = Overlays.addOverlay("billboard", {
- url: "http://ctrlaltstudio.com/hifi/menu-blank.svg",
- subImage: { x: 0, y: IMAGE_HEIGHT, width: IMAGE_WIDTH, height: IMAGE_HEIGHT },
- alpha: 1.0,
- visible: false,
- scale: IMAGE_SCALE,
- isFacingAvatar: false
- });
-
- menuItem = {
- overlay: overlay,
- on: false,
- callback: null
- };
-
- menuItems.push(menuItem);
- }
-
- Overlays.editOverlay(menuItems[NUMBER_OF_BUTTONS - 2].overlay, {
- url: "http://ctrlaltstudio.com/hifi/menu-chat.svg"
- });
- menuItems[NUMBER_OF_BUTTONS - 2].callback = vrChat.show;
-
- Controller.keyPressEvent.connect(keyPressEvent);
- Controller.mousePressEvent.connect(mousePressEvent);
- }
-
- function update() {
- var MENU_OFFSET = { x: 0.0, y: MENU_HEIGHT, z: -MENU_RADIUS }, // Offset from avatar position.
- itemAngle,
- itemRotation,
- itemOffset,
- i;
-
- itemAngle = menuItems.length * ITEM_SPACING / 2.0;
-
- for (i = 0; i < menuItems.length; i += 1) {
-
- itemRotation = Quat.multiply(Quat.fromPitchYawRollDegrees(0.0, itemAngle, 0.0), MyAvatar.orientation);
- itemOffset = Vec3.multiplyQbyV(itemRotation, MENU_OFFSET);
-
- Overlays.editOverlay(menuItems[i].overlay, {
- position: Vec3.sum(MyAvatar.position, itemOffset),
- rotation: itemRotation
- });
-
- itemAngle -= ITEM_SPACING;
- }
- }
-
- function tearDown() {
- var i;
-
- for (i = 0; i < menuItems.length; i += 1) {
- Overlays.deleteOverlay(menuItems[i].overlay);
- }
- }
-
- return {
- setUp: setUp,
- update: update,
- tearDown: tearDown
- };
-
-}());
-
-vrChat.setUp();
-Script.update.connect(vrChat.update);
-Script.scriptEnding.connect(vrChat.tearDown);
-
-vrMenu.setUp();
-Script.update.connect(vrMenu.update);
-Script.scriptEnding.connect(vrMenu.tearDown);
\ No newline at end of file