From 63c02712c151bec3f9178b03a9825b57346150dd Mon Sep 17 00:00:00 2001 From: James Pollack Date: Tue, 29 Sep 2015 10:52:54 -0700 Subject: [PATCH] add shape types --- examples/toys/masterResetEntity.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/toys/masterResetEntity.js b/examples/toys/masterResetEntity.js index 28183d5477..bb9ee0eeaf 100644 --- a/examples/toys/masterResetEntity.js +++ b/examples/toys/masterResetEntity.js @@ -293,8 +293,9 @@ function createGates() { var rotation1 = Quat.fromPitchYawRollDegrees(0, 36, 0); var gate1 = Entities.addEntity({ name: 'Back Door Gate', - type:'Model', - modelURL:MODEL_URL, + type: 'Model', + shapeType: 'box', + modelURL: MODEL_URL, position: { x: 546.52, y: 494.76, @@ -330,8 +331,9 @@ function createGates() { var rotation2 = Quat.fromPitchYawRollDegrees(0, -16, 0); var gate2 = Entities.addEntity({ name: 'Front Door Fence', - type:'Model', - modelURL:MODEL_URL, + type: 'Model', + modelURL: MODEL_URL, + shapeType: 'box', position: { x: 531.15, y: 495.11,