From 182e05e1251c49b8cdf6266042cff02735525a21 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Wed, 30 Mar 2016 15:38:21 -0700 Subject: [PATCH] adding collision hulls to can and bowl --- .../DomainContent/Home/growingPlant/wrapper.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js index e535b9b839..ca42d21b98 100644 --- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js +++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js @@ -21,6 +21,7 @@ Plant = function(spawnPosition, spawnRotation) { print("EBL ORIENTATION " + JSON.stringify(orientation)); var bowlPosition = spawnPosition; var BOWL_MODEL_URL = "atp:/growingPlant/Flowers-Bowl.fbx"; + var BOWL_COLLISION_HULL_URL = "atp:/growingPlant/bowl.obj"; var bowlDimensions = { x: 0.518, y: 0.1938, @@ -30,6 +31,8 @@ Plant = function(spawnPosition, spawnRotation) { type: "Model", modelURL: BOWL_MODEL_URL, dimensions: bowlDimensions, + shapeType: 'compound', + compundShapeURL: BOWL_COLLISION_HULL_URL, name: "plant bowl", position: bowlPosition, userData: JSON.stringify({ @@ -69,12 +72,13 @@ 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', + shapeType: 'compound', + compundShapeURL: WATER_CAN_COLLIISION_HULL_URL, name: "hifi-water-can", modelURL: WATER_CAN_MODEL_URL, script: WATER_CAN_SCRIPT_URL,