From f2dcbec0e6b1d46c1640c1ba0cf59f2a5185c17b Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Thu, 18 Feb 2016 11:09:47 -0800 Subject: [PATCH] werk --- .../DomainContent/Home/tiltMaze/createTiltMaze.js | 9 +++++---- unpublishedScripts/DomainContent/Home/tiltMaze/maze.js | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/createTiltMaze.js b/unpublishedScripts/DomainContent/Home/tiltMaze/createTiltMaze.js index a4c6cbc1e3..e7266cdce1 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/createTiltMaze.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/createTiltMaze.js @@ -3,6 +3,8 @@ var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/MAZE4.fbx"; var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/MAZE_COLLISION_HULL8.obj"; var MAZE_SCRIPT = Script.resolvePath('maze.js?' + Math.random()); + var BALL_DETECTOR_SCRIPT = Script.resolvePath('ballDetector.js?' + Math.random()) + var SCALE = 1; @@ -154,7 +156,8 @@ position: position, collisionless: true, dynamic: false, - visible: false, + visible: true, + script: BALL_DETECTOR_SCRIPT }; ballDetector = Entities.addEntity(properties); @@ -191,8 +194,7 @@ userData: JSON.stringify({ tiltMaze: { firstBall: ball, - ballSpawner: ballSpawningAnchor, - detector:ballDetector + ballSpawner: ballSpawningAnchor } }) }) @@ -205,6 +207,5 @@ Entities.deleteEntity(tiltMaze); Entities.deleteEntity(ball); Entities.deleteEntity(ballSpawningAnchor); - Entities.deleteEntity(ballDetector); }) }; \ No newline at end of file diff --git a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js index 440919adcb..ed6746032f 100644 --- a/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js +++ b/unpublishedScripts/DomainContent/Home/tiltMaze/maze.js @@ -69,7 +69,7 @@ }, continueNearGrab: function() { print('near grab') - // this.testWinDistance(); + this.testWinDistance(); this.testBallDistance(); }, continueDistantGrab: function() { @@ -148,6 +148,8 @@ return; } + print('DATA IS:'+JSON.stringify(data)) + var ballPosition; if (this.ball === null) { this.ball = data.tiltMaze.firstBall;