mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 11:45:36 +02:00
werk
This commit is contained in:
parent
ab17a95d71
commit
f2dcbec0e6
2 changed files with 8 additions and 5 deletions
|
@ -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);
|
||||
})
|
||||
};
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue