From 4961b38aefa27a3b9db825253781972e033c247c Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 7 Apr 2016 16:18:27 -0700 Subject: [PATCH] end of day --- .../Home/kineticObjects/blueChair.json | 72 +++++++++---------- .../Home/kineticObjects/junk.json | 1 + .../DomainContent/Home/musicBox/lid.js | 12 ++-- .../DomainContent/Home/musicBox/wrapper.js | 14 ++-- .../DomainContent/Home/pingPongGun/wrapper.js | 2 +- .../DomainContent/Home/reset.js | 2 +- .../DomainContent/Home/whiteboard/wrapper.js | 2 +- 7 files changed, 51 insertions(+), 54 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json b/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json index 54148f7f83..2556cd6223 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/blueChair.json @@ -1,39 +1,37 @@ { - "Entities": [ - { - "collisionsWillMove": 1, - "compoundShapeURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue_hull.obj", - "created": "2016-03-29T17:37:52Z", - "dimensions": { - "x": 0.99695134162902832, - "y": 1.23363196849823, - "z": 1.0726165771484375 - }, - "dynamic": 1, - "gravity": { - "x": 0, - "y": -10, - "z": 0 - }, - "id": "{51a44c3a-ec4a-4c79-8034-aeb5c45660b5}", - "modelURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue.fbx", - "name": "home_model_comfyChair", - "queryAACube": { - "scale": 1.9147497415542603, - "x": -0.95737487077713013, - "y": -0.95737487077713013, - "z": -0.95737487077713013 - }, - "rotation": { - "w": 0.46746015548706055, - "x": -0.0017547607421875, - "y": 0.88400089740753174, - "z": 0.0024261474609375 - }, - "shapeType": "compound", - "type": "Model", - "userData": "{\"hifiHomeKey\":{\"reset\":true}}" - } - ], + "Entities": [{ + "collisionsWillMove": 1, + "compoundShapeURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue_hull.obj", + "created": "2016-03-29T17:37:52Z", + "dimensions": { + "x": 1.1764, + "y": 1.4557, + "z": 1.2657 + }, + "dynamic": 1, + "gravity": { + "x": 0, + "y": -10, + "z": 0 + }, + "id": "{51a44c3a-ec4a-4c79-8034-aeb5c45660b5}", + "modelURL": "atp:/kineticObjects/blueChair/Comfy_Chair_Blue.fbx", + "name": "home_model_comfyChair", + "queryAACube": { + "scale": 1.9147497415542603, + "x": -0.95737487077713013, + "y": -0.95737487077713013, + "z": -0.95737487077713013 + }, + "rotation": { + "w": 0.46746015548706055, + "x": -0.0017547607421875, + "y": 0.88400089740753174, + "z": 0.0024261474609375 + }, + "shapeType": "compound", + "type": "Model", + "userData": "{\"hifiHomeKey\":{\"reset\":true}}" + }], "Version": 57 -} +} \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json b/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json index e4850511c8..5346df4527 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json @@ -158,6 +158,7 @@ "y": -10, "z": 0 }, + "dynamic": 1, "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "id": "{51a01cc1-15cf-4265-9d33-261c96e0e1ed}", "modelURL": "atp:/models/Junk-Crate.fbx", diff --git a/unpublishedScripts/DomainContent/Home/musicBox/lid.js b/unpublishedScripts/DomainContent/Home/musicBox/lid.js index c674187266..0c85b6af3d 100644 --- a/unpublishedScripts/DomainContent/Home/musicBox/lid.js +++ b/unpublishedScripts/DomainContent/Home/musicBox/lid.js @@ -12,11 +12,9 @@ return this; } - var MUSIC_URL = Script.resolvePath('http://hifi-content.s3.amazonaws.com/DomainContent/Home/musicBox/music_converted.wav'); - // var SHUT_SOUND_URL = Script.resolvePath('http://hifi-content.s3.amazonaws.com/DomainContent/Home/Sounds/book_fall.L.wav'); - // var OPEN_SOUND_URL = Script.resolvePath('http://public.highfidelity.io/sounds/Switches%20and%20sliders/lamp_switch_2.wav'); - var SHUT_SOUND_URL = Script.resolvePath('atp:/openSound.wav'); - var OPEN_SOUND_URL = Script.resolvePath('atp:/closeSound.wav'); + var MUSIC_URL = Script.resolvePath('atp:/musicBox/music.wav'); + var OPENSHUT_SOUND_URL = Script.resolvePath('atp:/openCloseSound.wav'); + Lid.prototype = { disabledHand: 'none', @@ -26,8 +24,8 @@ preload: function(entityID) { this.entityID = entityID; this.music = SoundCache.getSound(MUSIC_URL); - this.shutSound = SoundCache.getSound(SHUT_SOUND_URL); - this.openSound = SoundCache.getSound(OPEN_SOUND_URL); + this.shutSound = SoundCache.getSound(OPENSHUT_SOUND_URL); + this.openSound = SoundCache.getSound(OPENSHUT_SOUND_URL); print('OPEN SOUND?? ' + this.openSound) this.musicIsPlaying = false; diff --git a/unpublishedScripts/DomainContent/Home/musicBox/wrapper.js b/unpublishedScripts/DomainContent/Home/musicBox/wrapper.js index 176b0632f1..3dbe39a93a 100644 --- a/unpublishedScripts/DomainContent/Home/musicBox/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/musicBox/wrapper.js @@ -58,9 +58,9 @@ HomeMusicBox = function(spawnPosition, spawnRotation) { z: 0.5 } - var LID_SCRIPT_URL = Script.resolvePath('lid.js?' + Math.random()); + var LID_SCRIPT_URL = Script.resolvePath('atp:/musicBox/lid.js'); - var BASE_SCRIPT_URL = Script.resolvePath('baseBox.js?' + Math.random()); + var BASE_SCRIPT_URL = Script.resolvePath('atp:/musicBox/baseBox.js'); var base, lid, hat, key; function createLid(baseID) { @@ -75,7 +75,7 @@ HomeMusicBox = function(spawnPosition, spawnRotation) { var lidProperties = { name: 'home_music_box_lid', type: 'Model', - modelURL: 'atp:/MB_Lid.fbx', + modelURL: 'atp:/musicBox/MB_Lid.fbx', dimensions: LID_DIMENSIONS, position: startPosition, parentID: baseID, @@ -106,7 +106,7 @@ HomeMusicBox = function(spawnPosition, spawnRotation) { var LATERAL_OFFSET = 0.0; var properties = { - modelURL: "atp:/MB_Hat.fbx", + modelURL: "atp:/musicBox/MB_Hat.fbx", name: 'home_music_box_hat', type: 'Model', position: getOffsetFromCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET), @@ -138,7 +138,7 @@ HomeMusicBox = function(spawnPosition, spawnRotation) { var LATERAL_OFFSET = 0.0; var properties = { - modelURL: "atp:/MB_Key.fbx", + modelURL: "atp:/musicBox/MB_Key.fbx", name: 'home_music_box_key', type: 'Model', parentID: baseID, @@ -167,13 +167,13 @@ HomeMusicBox = function(spawnPosition, spawnRotation) { function createBaseBox() { var properties = { - modelURL: "atp:/MB_Box.fbx", + modelURL: "atp:/musicBox/MB_Box.fbx", name: 'home_music_box_base', type: 'Model', position: BASE_POSITION, dynamic: true, shapeType: 'compound', - compoundShapeURL: 'atp:/boxHull3.obj', + compoundShapeURL: 'atp:/musicBox/boxHull3.obj', dimensions: { x: 0.1661, y: 0.0928, diff --git a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js index af481db678..3808fdcf16 100644 --- a/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js @@ -10,7 +10,7 @@ // Script.include("../utils.js"); -var scriptURL = 'atp:/pingPongGun/pingPingGun.js'; +var scriptURL = 'atp:/pingPongGun/pingPongGun.js'; var MODEL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.fbx'; var COLLISION_HULL_URL = 'atp:/pingPongGun/Pingpong-Gun-New.obj'; diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index 3f77b90cf9..27608443da 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -242,7 +242,7 @@ var blueChair = new BlueChair({ x: 1100.4821, - y: 459.8161, + y: 459.9147, z: -75.9071 }); diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js index 5fbac2259c..67712c840d 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js @@ -26,7 +26,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { var whiteboardPosition = spawnPosition; var whiteboardRotation = orientation; - var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-4.fbx"; + var WHITEBOARD_MODEL_URL = "atp:/whiteboard/Whiteboard-6.fbx"; var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj"; var whiteboard = Entities.addEntity({