From a36cc7862f5ad05e2583f04e3ff368e2fd92b08a Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 21 Mar 2016 17:06:08 -0700 Subject: [PATCH 1/5] rotation can --- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 1 + unpublishedScripts/DomainContent/Home/reset.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 8debb73d6b..3df54f3b50 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -92,6 +92,7 @@ Plant = function(spawnPosition, spawnRotation) { y: -2.0, z: 0 }, + velocity: {x: -0, y: -0.2, z: 0}, rotation: waterCanRotation, userData: JSON.stringify({ 'hifiHomeKey': { diff --git a/unpublishedScripts/DomainContent/Home/reset.js b/unpublishedScripts/DomainContent/Home/reset.js index a7234edb58..b85d33cd26 100644 --- a/unpublishedScripts/DomainContent/Home/reset.js +++ b/unpublishedScripts/DomainContent/Home/reset.js @@ -148,6 +148,10 @@ x: 1099.8785, y: 460.3115, z: -84.7736 + }, { + x: 0, + y: 0, + z: 0 }); var pingPongGun = new _PingPongGun({ From e1d585c8487b8b9f6d683dc9731a8972b7cc7c99 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 21 Mar 2016 17:33:21 -0700 Subject: [PATCH 2/5] updated water can model --- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 3df54f3b50..85eaa6bcab 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -69,7 +69,7 @@ Plant = function(spawnPosition, spawnRotation) { }); - var WATER_CAN_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/waterCan.fbx?v1" + Math.random(); + var WATER_CAN_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/waterCan.fbx?v2"; var waterCanPosition = Vec3.sum(plantPosition, Vec3.multiply(0.6, Quat.getRight(orientation))); var waterCanRotation = orientation; From ddc35e7040d9ea9e01a3c64139e115aee2d20236 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Tue, 22 Mar 2016 09:49:46 -0700 Subject: [PATCH 3/5] updated query string --- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 85eaa6bcab..38f26c9edc 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -69,7 +69,7 @@ Plant = function(spawnPosition, spawnRotation) { }); - var WATER_CAN_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/waterCan.fbx?v2"; + var WATER_CAN_MODEL_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/waterCan.fbx"; var waterCanPosition = Vec3.sum(plantPosition, Vec3.multiply(0.6, Quat.getRight(orientation))); var waterCanRotation = orientation; From 4cac7cf91225fe0796e958ec0f318845fcfe170d Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Tue, 22 Mar 2016 12:15:44 -0700 Subject: [PATCH 4/5] updated second hand to a model with wood texture --- .../DomainContent/Home/cuckooClock/wrapper.js | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js index 317d059df6..01f26cc613 100644 --- a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js @@ -14,6 +14,7 @@ var CLOCK_BODY_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/cu var CLOCK_FACE_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cuckooClock2_FACE.fbx"; var CLOCK_HOUR_HAND_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cuckooClock2_HOUR_HAND.fbx"; var CLOCK_MINUTE_HAND_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/cuckooClock2_MINUTE_HAND.fbx"; +var CLOCK_SECOND_HAND_URL = "https://s3-us-west-1.amazonaws.com/hifi-content/eric/models/secondHand.fbx"; MyCuckooClock = function(spawnPosition, spawnRotation) { var clockBody, clockFace, clockMinuteHand, clockHourHand, clockSecondHand; @@ -23,7 +24,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { clockBody = Entities.addEntity({ type: "Model", modelURL: CLOCK_BODY_URL, - name: "home_model_clockbody", + name: "hifi-home_model_clockbody", animation: { url: CLOCK_BODY_URL, running: false, @@ -55,7 +56,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { clockFace = Entities.addEntity({ type: "Model", parentID: clockBody, - name: "home_model_clockface", + name: "hifi-home_model_clockface", modelURL: CLOCK_FACE_URL, position: clockFacePosition, dimensions: { @@ -91,7 +92,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { var ANGULAR_ROLL_SPEED_HOUR_RADIANS = 0.000029098833; clockHourHand = Entities.addEntity({ type: "Model", - name: "home_model_clockHourHand", + name: "hifi-home_model_clockHourHand", parentID: clockFace, modelURL: CLOCK_HOUR_HAND_URL, position: Vec3.sum(clockFacePosition, clockHandOffset), @@ -126,16 +127,16 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { secondRollDegrees = -seconds * DEGREES_FOR_SECOND; var ANGULAR_ROLL_SPEED_SECOND_RADIANS = 0.10472 clockSecondHand = Entities.addEntity({ - type: "Box", + type: "Model", parentID: clockBody, - // modelURL: CLOCK_SECOND_HAND_URL, - name: "home_model_clockSecondHand", + modelURL: CLOCK_SECOND_HAND_URL, + name: "hifi-home_model_clockSecondHand", position: Vec3.sum(clockFacePosition, clockHandOffset), - dimensions: { - x: 0.00263, - y: 0.0982, - z: 0.0024 - }, + // dimensions: { + // x: 0.00263, + // y: 0.0982, + // z: 0.0024 + // }, color: { red: 200, green: 10, @@ -146,7 +147,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { y: 0.05, z: 0.5 }, - rotation: Quat.fromPitchYawRollDegrees(0, 0, secondRollDegrees), + // rotation: Quat.fromPitchYawRollDegrees(0, 0, secondRollDegrees), angularDamping: 0, angularVelocity: { x: 0, @@ -169,7 +170,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) { clockMinuteHand = Entities.addEntity({ type: "Model", modelURL: CLOCK_MINUTE_HAND_URL, - name: "home_model_clockMinuteHand", + name: "hifi-home_model_clockMinuteHand", parentID: clockFace, position: Vec3.sum(clockFacePosition, clockHandOffset), registrationPoint: { From 7c9673559248b2a3778b6b8daf0c3174f29a6f23 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Tue, 22 Mar 2016 13:21:42 -0700 Subject: [PATCH 5/5] added name to trashcan --- .../DomainContent/Home/kineticObjects/trashcan.json | 1 + 1 file changed, 1 insertion(+) diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json index 7b8cf22c5b..59daa7c648 100644 --- a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json +++ b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json @@ -4,6 +4,7 @@ "collisionsWillMove": 1, "compoundShapeURL": "http://hifi-content.s3.amazonaws.com/alan/dev/Trash-Can-4.obj", "created": "2016-03-15T23:06:41Z", + "name": "hifi-home-model-trashcan", "dimensions": { "x": 0.4264354407787323, "y": 0.50489801168441772,