Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 16:38:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

werk

Browse source
This commit is contained in:
James B. Pollack 2016-02-18 11:09:47 -08:00
parent ab17a95d71
commit f2dcbec0e6
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
unpublishedScripts/DomainContent/Home/tiltMaze/createTiltMaze.js
View file

@ -3,6 +3,8 @@
var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/MAZE4.fbx"; 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_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 MAZE_SCRIPT = Script.resolvePath('maze.js?' + Math.random());
var BALL_DETECTOR_SCRIPT = Script.resolvePath('ballDetector.js?' + Math.random())
var SCALE = 1; var SCALE = 1;
@ -154,7 +156,8 @@
position: position, position: position,
collisionless: true, collisionless: true,
dynamic: false, dynamic: false,
visible: false, visible: true,
script: BALL_DETECTOR_SCRIPT
}; };
ballDetector = Entities.addEntity(properties); ballDetector = Entities.addEntity(properties);
@ -191,8 +194,7 @@
userData: JSON.stringify({ userData: JSON.stringify({
tiltMaze: { tiltMaze: {
firstBall: ball, firstBall: ball,
ballSpawner: ballSpawningAnchor, ballSpawner: ballSpawningAnchor
detector:ballDetector
} }
}) })
}) })
@ -205,6 +207,5 @@
Entities.deleteEntity(tiltMaze); Entities.deleteEntity(tiltMaze);
Entities.deleteEntity(ball); Entities.deleteEntity(ball);
Entities.deleteEntity(ballSpawningAnchor); Entities.deleteEntity(ballSpawningAnchor);
Entities.deleteEntity(ballDetector);
}) })
}; };

4
unpublishedScripts/DomainContent/Home/tiltMaze/maze.js
View file

@ -69,7 +69,7 @@
}, },
continueNearGrab: function() { continueNearGrab: function() {
print('near grab') print('near grab')
// this.testWinDistance(); this.testWinDistance();
this.testBallDistance(); this.testBallDistance();
}, },
continueDistantGrab: function() { continueDistantGrab: function() {
@ -148,6 +148,8 @@
return; return;
} }
print('DATA IS:'+JSON.stringify(data))
var ballPosition; var ballPosition;
if (this.ball === null) { if (this.ball === null) {
this.ball = data.tiltMaze.firstBall; this.ball = data.tiltMaze.firstBall;