From c74b71aa3728502af358cb44e3f342bc86387373 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 30 Mar 2016 16:10:31 -0700 Subject: [PATCH] updated growing plant --- unpublishedScripts/DomainContent/Home/createTidyGuy.js | 2 +- unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/unpublishedScripts/DomainContent/Home/createTidyGuy.js b/unpublishedScripts/DomainContent/Home/createTidyGuy.js index c54e0ef7b2..968dd85f25 100644 --- a/unpublishedScripts/DomainContent/Home/createTidyGuy.js +++ b/unpublishedScripts/DomainContent/Home/createTidyGuy.js @@ -32,5 +32,5 @@ function createTidyGuy() { var tidyGuy = createTidyGuy(); Script.scriptEnding.connect(function() { - Entities.deleteEntity(tidyGuy); + // Entities.deleteEntity(tidyGuy); }) \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index ca42d21b98..8adc05b35c 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -12,6 +12,7 @@ var PLANT_SCRIPT_URL = Script.resolvePath("atp:/growingPlant/growingPlantEntityScript.js"); var WATER_CAN_SCRIPT_URL = Script.resolvePath("atp:/growingPlant/waterCanEntityScript.js"); Plant = function(spawnPosition, spawnRotation) { + print("EBL PLANT CONSTRUCTOR!") var orientation; if (spawnRotation !== undefined) { orientation = Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z); @@ -31,6 +32,7 @@ Plant = function(spawnPosition, spawnRotation) { type: "Model", modelURL: BOWL_MODEL_URL, dimensions: bowlDimensions, + dynamic: true, shapeType: 'compound', compundShapeURL: BOWL_COLLISION_HULL_URL, name: "plant bowl", @@ -43,6 +45,7 @@ Plant = function(spawnPosition, spawnRotation) { }); + var PLANT_MODEL_URL = "atp:/growingPlant/Flowers-Rock.fbx"; var plantDimensions = {