From b8cdd5c62650d08a212d8cae30ef1139fa7d6d47 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 1 Apr 2016 15:05:22 -0700 Subject: [PATCH 1/6] updates --- .../DomainContent/Home/tiltMaze/wrapper.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js index 95a673a256..04964002ed 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/wrapper.js @@ -139,7 +139,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var createBall = function(position) { var properties = { - name: 'Hifi Tilt Maze Ball', + name: 'home_sphere_tiltMazeBall', type: 'Sphere', position: getBallStartLocation(), dynamic: true, @@ -169,7 +169,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var createBallSpawningAnchor = function() { var properties = { - name: 'Hifi Tilt Maze Ball Detector', + name: 'home_box_tiltMazeBallSpawningAnchor', parentID: tiltMaze, type: 'Box', color: DEBUG_COLOR, @@ -191,7 +191,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var createBallDetector = function() { var properties = { - name: 'Hifi Tilt Maze Ball Detector', + name: 'home_box_tiltMazeBallDetector', parentID: tiltMaze, type: 'Box', color: DEBUG_COLOR, @@ -215,7 +215,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var createTiltMaze = function(position) { var properties = { - name: 'Hifi Tilt Maze', + name: 'home_model_tiltMaze', type: 'Model', modelURL: MAZE_MODEL_URL, gravity: MAZE_GRAVITY, @@ -254,7 +254,7 @@ TiltMaze = function(spawnPosition, spawnRotation) { var position = getBallFinishLocation(); var lightProperties = { parentID: tiltMaze, - name: 'Hifi Tilt Maze End Light', + name: 'home_light_tiltMazeEndLight', type: "Light", isSpotlight: true, dimensions: END_LIGHT_DIMENSIONS, From 68642099b71e7902d2c0023a3be0082a8c1e5d0c Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 1 Apr 2016 15:12:57 -0700 Subject: [PATCH 2/6] changed name of whiteboard stuff --- .../Home/whiteboard/eraserEntityScript.js | 2 +- .../Home/whiteboard/markerEntityScript.js | 12 ++---------- .../DomainContent/Home/whiteboard/wrapper.js | 9 +++++---- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js b/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js index 9489d160d4..1164d2d67d 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/eraserEntityScript.js @@ -22,7 +22,7 @@ _this = this; _this.ERASER_TRIGGER_THRESHOLD = 0.2; - _this.STROKE_NAME = "hifi-marker-stroke"; + _this.STROKE_NAME = "home_polyline_markerStroke"; _this.ERASER_TO_STROKE_SEARCH_RADIUS = 0.7; _this.ERASER_RESET_WAIT_TIME = 3000; }; diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js b/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js index dd86b2a7d3..01245f0696 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/markerEntityScript.js @@ -36,8 +36,8 @@ _this.MAX_DISTANCE_BETWEEN_POINTS = 0.1; _this.strokes = []; _this.PAINTING_TRIGGER_THRESHOLD = 0.2; - _this.STROKE_NAME = "hifi-marker-stroke"; - _this.WHITEBOARD_SURFACE_NAME = "hifi-whiteboardDrawingSurface"; + _this.STROKE_NAME = "home_polyline_markerStroke"; + _this.WHITEBOARD_SURFACE_NAME = "home_box_whiteboardDrawingSurface" _this.MARKER_RESET_WAIT_TIME = 3000; }; @@ -48,25 +48,17 @@ _this.whiteboards = []; _this.equipped = true; _this.hand = params[0] == "left" ? 0 : 1; - print('before thing', id) - print('GET user data?' + typeof getEntityUserData) _this.markerColor = getEntityUserData(_this.entityID).markerColor; - print('after thing') // search for whiteboards var markerPosition = Entities.getEntityProperties(_this.entityID, "position").position; var entities = Entities.findEntities(markerPosition, 10); - print('LOOKING FOR BOARDS') entities.forEach(function(entity) { var entityName = Entities.getEntityProperties(entity, "name").name; - print('NAME ' + entityName) if (entityName === _this.WHITEBOARD_SURFACE_NAME) { - print('FOUND A WHITEBOARD!!') _this.whiteboards.push(entity); } }); - - print("intersectable entities " + JSON.stringify(_this.whiteboards)) }, releaseEquip: function() { diff --git a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js index c6f259e718..68b8864854 100644 --- a/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/whiteboard/wrapper.js @@ -29,7 +29,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { var WHITEBOARD_COLLISION_HULL_URL = "atp:/whiteboard/whiteboardCollisionHull.obj"; var whiteboard = Entities.addEntity({ type: "Model", - name: "whiteboard", + name: "home_model_whiteboard", modelURL: WHITEBOARD_MODEL_URL, position: whiteboardPosition, rotation: whiteboardRotation, @@ -57,9 +57,10 @@ Whiteboard = function(spawnPosition, spawnRotation) { whiteboardSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-0.02, Quat.getRight(whiteboardRotation))); var moveForwardDistance = 0.02; whiteboardFrontSurfacePosition = Vec3.sum(whiteboardSurfacePosition, Vec3.multiply(-moveForwardDistance, Quat.getFront(whiteboardRotation))); + var WHITEBOARD_SURFACE_NAME = "home_box_whiteboardDrawingSurface"; var whiteboardSurfaceSettings = { type: "Box", - name: "hifi-whiteboardDrawingSurface", + name: WHITEBOARD_SURFACE_NAME, dimensions: { x: 1.82, y: 1.8, @@ -99,6 +100,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { var eraser = Entities.addEntity({ type: "Model", + name: "home_model_whiteboardEraser", modelURL: ERASER_MODEL_URL, position: eraserPosition, script: ERASER_SCRIPT_URL, @@ -191,7 +193,7 @@ Whiteboard = function(spawnPosition, spawnRotation) { modelURL: modelURL, rotation: markerRotation, shapeType: "box", - name: "marker", + name: "home_model_marker", dynamic: true, gravity: { x: 0, @@ -209,7 +211,6 @@ Whiteboard = function(spawnPosition, spawnRotation) { y: 0.027, z: 0.164 }, - name: "marker", script: MARKER_SCRIPT_URL, userData: JSON.stringify({ 'hifiHomeKey': { From 4a0b502f15e5ce8d2e2161d632d6d2ea710e377e Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 1 Apr 2016 15:53:55 -0700 Subject: [PATCH 3/6] changed angular damping to default for water can --- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 2 +- .../DomainContent/Home/kineticObjects/lowerBookShelf.json | 1 + .../DomainContent/Home/kineticObjects/postersCell.json | 4 ++-- .../DomainContent/Home/kineticObjects/postersPlaya.json | 4 ++-- .../DomainContent/Home/kineticObjects/trashcan.json | 2 +- .../DomainContent/Home/kineticObjects/upperBookShelf.json | 1 + 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index cf041eafba..6d894ff941 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -94,7 +94,6 @@ Plant = function(spawnPosition, spawnRotation) { compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL, position: waterCanPosition, collisionSoundURL: "atp:/growingPlant/watering_can_drop.L.wav", - angularDamping: 1, dynamic: true, gravity: { x: 0.0, @@ -155,6 +154,7 @@ Plant = function(spawnPosition, spawnRotation) { green: 10, blue: 200 }, + collisionless: true, position: waterSpoutPosition, rotation: waterSpoutRotation, parentID: waterCan, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json index eb603dde7b..b86085c461 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json @@ -1,6 +1,7 @@ { "Entities": [{ "created": "2016-03-07T21:07:29Z", + "name": "home_model_lowerBookShelf", "dimensions": { "x": 2.0069153308868408, "y": 0.0160951167345047, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json b/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json index 25aa606a50..a6e5a13a9d 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json @@ -12,7 +12,7 @@ "z": 0.14119282364845276 }, "id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}", - "name": "Poster-Nail", + "name": "home_model_posterNail", "position" : { "x": -0.05, "y": 0.4, @@ -44,7 +44,7 @@ "dynamic": 0, "id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}", "modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx", - "name": "hifi-home-poster-cell", + "name": "home_model_posterCell", "queryAACube": { "scale": 1.4568163156509399, "x": 1103.1385498046875, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json b/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json index 37a2b90e8f..ce2b619752 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json @@ -9,7 +9,7 @@ "z": 0.92656642198562622 }, "dynamic": 0, - "name": "hifi-home-poster-playa", + "name": "home_model_posterPlaya", "id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}", "modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx", "queryAACube": { @@ -41,7 +41,7 @@ "z": 0.14119282364845276 }, "id": "{7f060027-2927-4513-bd92-13a98e6fc06c}", - "name": "Poster-Nail", + "name": "home_model_posterNail", "position": { "x": -0.07, "y": 0.5, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json index 3dea13a6d2..6cb640e949 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json @@ -3,7 +3,7 @@ "collisionsWillMove": 1, "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj", "created": "2016-03-15T23:06:41Z", - "name": "hifi-home-model-trashcan", + "name": "home_model_Trashcan", "dimensions": { "x": 0.4264354407787323, "y": 0.50489801168441772, diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json index 344a57e581..0913ea8e73 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json @@ -1,6 +1,7 @@ { "Entities": [{ "created": "2016-03-15T21:26:11Z", + "name": "home_model_upperBookShelf", "dimensions": { "x": 2.0069153308868408, "y": 0.0160951167345047, From 9bdfd53ae7f181bd25abb092a4939d2621a9ab04 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 1 Apr 2016 16:12:05 -0700 Subject: [PATCH 4/6] made water can a box shape --- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 6d894ff941..31dd103455 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -80,8 +80,7 @@ Plant = function(spawnPosition, spawnRotation) { var waterCanRotation = orientation; var waterCan = Entities.addEntity({ type: "Model", - shapeType: 'compound', - compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL, + shapeType: 'box', name: "home_model_waterCan", modelURL: WATER_CAN_MODEL_URL, script: WATER_CAN_SCRIPT_URL, From f60210e49bb13bd1b8eab3fe32844d654bcc33e9 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 1 Apr 2016 16:14:03 -0700 Subject: [PATCH 5/6] added collision hull to cuckoo clock --- unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js index 5b59a854bd..eb9f6644b5 100644 --- a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js @@ -11,6 +11,7 @@ var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js" ) var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx"; +var CLOCK_BODY_COLLISION_HULL_URL = "atp:/cuckooClock/cuckooCollider.obj"; var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx"; var CLOCK_HOUR_HAND_URL = "atp:/cuckooClock/cuckooClock2_HOUR_HAND.fbx"; var CLOCK_MINUTE_HAND_URL = "atp:/cuckooClock/cuckooClock2_MINUTE_HAND.fbx"; @@ -24,6 +25,8 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { clockBody = Entities.addEntity({ type: "Model", modelURL: CLOCK_BODY_URL, + shapeType: "compound", + compoundShapeURL: CLOCK_BODY_COLLISION_HULL_URL, name: "hifi-home-model-clockbody", animation: { url: CLOCK_BODY_URL, From a74f6223bb916ff55f590cdfce828dc5363447d6 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Fri, 1 Apr 2016 16:30:17 -0700 Subject: [PATCH 6/6] jumk name update --- .../DomainContent/Home/cuckooClock/wrapper.js | 10 +++++----- .../DomainContent/Home/kineticObjects/junk.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js index eb9f6644b5..f38c5e4ba8 100644 --- a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js @@ -27,7 +27,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { modelURL: CLOCK_BODY_URL, shapeType: "compound", compoundShapeURL: CLOCK_BODY_COLLISION_HULL_URL, - name: "hifi-home-model-clockbody", + name: "home_model_clockBody", animation: { url: CLOCK_BODY_URL, running: false, @@ -62,7 +62,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { type: "Model", parentID: clockBody, rotation: clockRotation, - name: "hifi-home-model-clockface", + name: "home_model_clockFace", modelURL: CLOCK_FACE_URL, position: clockFacePosition, dimensions: { @@ -106,7 +106,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { clockHourHand = Entities.addEntity({ type: "Model", - name: "hifi-home-model-clockHourHand", + name: "home_model_clockHourHand", parentID: clockFace, modelURL: CLOCK_HOUR_HAND_URL, position: hourHandPosition, @@ -148,7 +148,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { type: "Model", parentID: clockBody, modelURL: CLOCK_SECOND_HAND_URL, - name: "hifi-home-model-clockSecondHand", + name: "home_model_clockSecondHand", position: hourHandPosition, dimensions: { x: 0.0043, @@ -194,7 +194,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { clockMinuteHand = Entities.addEntity({ type: "Model", modelURL: CLOCK_HOUR_HAND_URL, - name: "hifi-home-model-clockMinuteHand", + name: 'home_model_clockMinuteHand', parentID: clockFace, position: hourHandPosition, registrationPoint: { diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json b/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json index 25af5ea8f3..e4850511c8 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/junk.json @@ -16,7 +16,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "id": "{e9edc4d0-ecef-42de-88de-a652087f8a18}", "modelURL": "atp:/tutorialContent/Junk-Album-3.fbx", - "name": "Junk-Album-3.fbx", + "name": "home_model_junkAlbum3.fbx", "queryAACube": { "scale": 0.44973927736282349, "x": -0.22486963868141174, @@ -49,7 +49,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "id": "{cc75df45-0caf-41ff-8c05-29c771cc63d9}", "modelURL": "atp:/tutorialContent/Hideous-Knick-Knack1.fbx", - "name": "Junk-Doll", + "name": "home_model_junkDoll", "position": { "x": 0.3363037109375, "y": 0.1844482421875, @@ -87,7 +87,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "id": "{903543d7-4531-4532-997a-8176be9fc660}", "modelURL": "atp:/tutorialContent/Junk-Album-1.fbx", - "name": "Junk-Album-1.fbx", + "name": "home_model_junkAlbum1", "position": { "x": 0.10009765625, "y": 0.087310791015625, @@ -125,7 +125,7 @@ "id": "{d99aeed0-9d38-4b82-8ae0-630cdfcd32cb}", "marketplaceID": "268b7d13-d3f6-4e03-a252-3e5bde1d145e", "modelURL": "https://s3.amazonaws.com/hifi-public/marketplace/hificontent/ozan/Lamp.fbx", - "name": "Junk - lamp", + "name": "home_model_Junk - lamp", "position": { "x": 0.61279296875, "y": 0.2528076171875, @@ -161,7 +161,7 @@ "userData": "{\"hifiHomeKey\":{\"reset\":true}}", "id": "{51a01cc1-15cf-4265-9d33-261c96e0e1ed}", "modelURL": "atp:/models/Junk-Crate.fbx", - "name": "home_model_junk_holder", + "name": "home_model_junkHolder", "position": { "x": 0.369384765625, "y": 0.0540771484375,