This commit is contained in:
James B. Pollack 2016-02-22 14:25:13 -08:00
parent 03d64d163e
commit c102abd11f
2 changed files with 185 additions and 184 deletions

View file

@ -12,11 +12,11 @@
var ball, ballSpawningAnchor, ballDetector, tiltMaze;
var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/MAZE6.fbx";
var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/MAZE_COLLISION_HULL8.obj";
var MAZE_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze.fbx";
var MAZE_COLLISION_HULL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/tiltMaze/newmaze_hull.obj";
var MAZE_SCRIPT = Script.resolvePath('maze.js?' + Math.random());
var SCALE = 1;
var SCALE = 0.5;
var MAZE_DIMENSIONS = Vec3.multiply(SCALE, {
x: 1,
@ -24,23 +24,23 @@
z: 1
});
var BALL_DIMENSIONS = {
var BALL_DIMENSIONS = Vec3.multiply(SCALE, {
x: 0.05,
y: 0.05,
z: 0.05
}
})
var BALL_SPAWNER_DIMENSIONS = {
var BALL_SPAWNER_DIMENSIONS = Vec3.multiply(SCALE, {
x: 0.05,
y: 0.05,
z: 0.05
}
})
var BALL_DETECTOR_DIMENSIONS = {
var BALL_DETECTOR_DIMENSIONS = Vec3.multiply(SCALE, {
x: 0.1,
y: 0.1,
z: 0.1
}
})
var BALL_COLOR = {
red: 255,
@ -62,9 +62,9 @@
var CLEANUP = true;
var BALL_FORWARD_OFFSET = -0.2;
var BALL_RIGHT_OFFSET = -0.4;
var BALL_VERTICAL_OFFSET = 0.02;
var BALL_FORWARD_OFFSET = -0.2 * SCALE;
var BALL_RIGHT_OFFSET = -0.4 * SCALE;
var BALL_VERTICAL_OFFSET = 0.02 * SCALE;
var BALL_FRICTION = 0.7;
@ -84,9 +84,9 @@
var MAZE_DAMPING = 0.6;
var MAZE_ANGULAR_DAMPING = 0.6;
var DETECTOR_VERTICAL_OFFSET = 0.0;
var DETECTOR_FORWARD_OFFSET= 0.4;
var DETECTOR_RIGHT_OFFSET = 0.4;
var DETECTOR_VERTICAL_OFFSET = 0.0 * SCALE;
var DETECTOR_FORWARD_OFFSET = 0.4 * SCALE;
var DETECTOR_RIGHT_OFFSET = 0.4 * SCALE;
var getBallStartLocation = function() {
var mazeProps = Entities.getEntityProperties(tiltMaze);
@ -183,7 +183,7 @@
restitution: MAZE_RESTITUTION,
damping: MAZE_DAMPING,
angularDamping: MAZE_ANGULAR_DAMPING,
rotation: Quat.fromPitchYawRollDegrees(0, 0, 180),
// rotation: Quat.fromPitchYawRollDegrees(0, 0, 180),
dynamic: true,
density: MAZE_DENSITY,
script: MAZE_SCRIPT

View file

@ -16,13 +16,14 @@
Script.include('../../../../libraries/utils.js');
var SCALE= 0.5
var VICTORY_SOUND;
var BALL_DISTANCE_THRESHOLD = 1;
var BALL_DISTANCE_THRESHOLD = 1*SCALE;
var BALL_DETECTOR_THRESHOLD = 0.2;
var BALL_FORWARD_OFFSET = -0.2;
var BALL_RIGHT_OFFSET = -0.4;
var BALL_VERTICAL_OFFSET = 0.02;
var BALL_DETECTOR_THRESHOLD = 0.2*SCALE;
var BALL_FORWARD_OFFSET = -0.2*SCALE;
var BALL_RIGHT_OFFSET = -0.4*SCALE;
var BALL_VERTICAL_OFFSET = 0.02*SCALE;
var BALL_FRICTION = 0.7;
@ -36,11 +37,11 @@
z: 0
};
var BALL_DIMENSIONS = {
var BALL_DIMENSIONS = Vec3.multiply(SCALE,{
x: 0.05,
y: 0.05,
z: 0.05
}
})
var BALL_COLOR = {
red: 255,