From 024ce4954c71af0164a03c7998a706974f322b99 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Tue, 5 Apr 2016 10:33:54 -0700 Subject: [PATCH] wrappers --- unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js | 2 +- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js index f38c5e4ba8..6c6704514b 100644 --- a/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js @@ -11,7 +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_BODY_COLLISION_HULL_URL = "atp:/cuckooClock/clockHull.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"; diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index 5091dc7b16..d8da03c423 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -74,13 +74,11 @@ Plant = function(spawnPosition, spawnRotation) { }); var WATER_CAN_MODEL_URL = "atp:/growingPlant/waterCan.fbx"; - var WATER_CAN_COLLIISION_HULL_URL = "atp:/growingPlant/can.obj"; var waterCanPosition = Vec3.sum(plantPosition, Vec3.multiply(0.6, Quat.getRight(orientation))); var waterCanRotation = orientation; var waterCan = Entities.addEntity({ type: "Model", - shapeType: 'box', name: "home_model_waterCan", modelURL: WATER_CAN_MODEL_URL, script: WATER_CAN_SCRIPT_URL,