From 4c86b1ce03abf3dd92e4c887455f872a3f39ede4 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 28 Sep 2015 18:47:32 -0700 Subject: [PATCH] ballin --- examples/toys/basketball/createHoop.js | 59 ++++++++++++++------------ 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/examples/toys/basketball/createHoop.js b/examples/toys/basketball/createHoop.js index 778c73915c..bd3fc32411 100644 --- a/examples/toys/basketball/createHoop.js +++ b/examples/toys/basketball/createHoop.js @@ -15,40 +15,40 @@ Script.include("../../utilities.js"); Script.include("../../libraries/utils.js"); -var groundURL = "https://hifi-public.s3.amazonaws.com/eric/models/woodFloor.fbx"; +var courtURL = "https://hifi-public.s3.amazonaws.com/eric/models/woodFloor.fbx"; var basketballURL = "https://hifi-public.s3.amazonaws.com/models/content/basketball2.fbx"; -var hoopURL = "http://hifi-public.s3.amazonaws.com/models/basketball/new_hoop_2.fbx"; -var hoopCollisionHullURL = "http://hifi-public.s3.amazonaws.com/models/basketball/new_basketball_hoop_collision_hull.obj"; var ballCollisionSound = "https://hifi-public.s3.amazonaws.com/sounds/basketball/basketball.wav"; - -var basePosition = { - x: 0, - y: 0, - z: 0 -}; - -var hoopStartPosition = { - x: 0, - y: 3.25, - z: 0 -}; - - -var ground = Entities.addEntity({ - type: "Model", - modelURL: groundURL, - dimensions: { - x: 100, - y: 2, - z: 100 - }, - position: basePosition, - shapeType: 'box' -}); +var hoopURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop.fbx"; +var hoopCollisionHullURL = "http://hifi-public.s3.amazonaws.com/models/basketball_hoop/basketball_hoop_collision_hull.obj"; var BALL_DIAMETER = 0.30; var DISTANCE_IN_FRONT_OF_ME = 1.0; +var hoopStartPosition = + Vec3.sum(MyAvatar.position, + Vec3.multiplyQbyV(MyAvatar.orientation, { + x: 0, + y: 0.0, + z: -DISTANCE_IN_FRONT_OF_ME * 2 + })); + +// courtStartPosition.y = hoopStartPosition.y - 2 + + +// var court = Entities.addEntity({ +// type: "Model", +// modelURL: courtURL, +// dimensions: { +// x: 28.65, +// y: 0.02, +// z: 15.24 +// }, +// position: courtStartPosition, +// shapeType: 'box' +// }); + + + var ballPosition = Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, @@ -56,6 +56,8 @@ var ballPosition = Vec3.sum(MyAvatar.position, z: -DISTANCE_IN_FRONT_OF_ME })); + + var ballRotation = Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(0, -90, 0)); @@ -92,6 +94,7 @@ var hoop = Entities.addEntity({ y: -9.8, z: 0 }, + // rotation: Quat.fromPitchYawRollDegrees(0, -90, 0)), dimensions: { x: 1.89, y: 3.99,