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

@ -10,85 +10,85 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var ball, ballSpawningAnchor, ballDetector, tiltMaze;
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_SCRIPT = Script.resolvePath('maze.js?' + Math.random());
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,{
var MAZE_DIMENSIONS = Vec3.multiply(SCALE, {
x: 1,
y: 0.3,
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 = {
var BALL_COLOR = {
red: 255,
green: 0,
blue: 0
}
}
var DEBUG_COLOR = {
var DEBUG_COLOR = {
red: 0,
green: 255,
blue: 0
}
}
var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
x: 0,
y: 0.5,
z: 0
}), Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation())));
}), Vec3.multiply(1.5, Quat.getFront(Camera.getOrientation())));
var CLEANUP = true;
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;
var BALL_RESTITUTION = 0.1;
var BALL_DAMPING = 0.6;
var BALL_ANGULAR_DAMPING = 0.2;
var BALL_DENSITY = 1000;
var BALL_GRAVITY = {
var BALL_FRICTION = 0.7;
var BALL_RESTITUTION = 0.1;
var BALL_DAMPING = 0.6;
var BALL_ANGULAR_DAMPING = 0.2;
var BALL_DENSITY = 1000;
var BALL_GRAVITY = {
x: 0,
y: -9.8,
z: 0
};
};
var MAZE_DENSITY = 1000;
var MAZE_RESTITUTION = 0.1;
var MAZE_DAMPING = 0.6;
var MAZE_ANGULAR_DAMPING = 0.6;
var MAZE_DENSITY = 1000;
var MAZE_RESTITUTION = 0.1;
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 getBallStartLocation = function() {
var mazeProps = Entities.getEntityProperties(tiltMaze);
var right = Quat.getRight(mazeProps.rotation);
var front = Quat.getFront(mazeProps.rotation);
@ -103,9 +103,9 @@
var location = Vec3.sum(mazeProps.position, finalOffset);
print('BALL START LOCATOIN:: ' + JSON.stringify(location))
return location;
}
}
var createBall = function(position) {
var createBall = function(position) {
print('making ball')
var properties = {
@ -129,9 +129,9 @@
};
};
var createBallSpawningAnchor = function() {
var createBallSpawningAnchor = function() {
var properties = {
name: 'Hifi Tilt Maze Ball Detector',
@ -145,17 +145,17 @@
};
ballSpawningAnchor = Entities.addEntity(properties);
}
}
var createBallDetector = function() {
var createBallDetector = function() {
var mazeProps = Entities.getEntityProperties(tiltMaze);
var right = Quat.getRight(mazeProps.rotation);
var forward = Quat.getFront(mazeProps.rotation);
var up = Quat.getUp(mazeProps.rotation);
var position = Vec3.sum(mazeProps.position,Vec3.multiply(up,DETECTOR_VERTICAL_OFFSET));
position = Vec3.sum(position,Vec3.multiply(right,DETECTOR_RIGHT_OFFSET));
position = Vec3.sum(position,Vec3.multiply(forward,DETECTOR_FORWARD_OFFSET));
var position = Vec3.sum(mazeProps.position, Vec3.multiply(up, DETECTOR_VERTICAL_OFFSET));
position = Vec3.sum(position, Vec3.multiply(right, DETECTOR_RIGHT_OFFSET));
position = Vec3.sum(position, Vec3.multiply(forward, DETECTOR_FORWARD_OFFSET));
var properties = {
name: 'Hifi Tilt Maze Ball Detector',
parentID: tiltMaze,
@ -170,9 +170,9 @@
ballDetector = Entities.addEntity(properties);
};
};
var createTiltMaze = function(position) {
var createTiltMaze = function(position) {
var properties = {
name: 'Hifi Tilt Maze',
type: 'Model',
@ -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
@ -191,9 +191,9 @@
tiltMaze = Entities.addEntity(properties)
}
}
var createAll = function() {
var createAll = function() {
createTiltMaze(center);
createBallSpawningAnchor();
createBallDetector(center);
@ -203,18 +203,18 @@
tiltMaze: {
firstBall: ball,
ballSpawner: ballSpawningAnchor,
detector:ballDetector
detector: ballDetector
}
})
})
}
}
createAll();
createAll();
if (CLEANUP === true) {
if (CLEANUP === true) {
Script.scriptEnding.connect(function() {
Entities.deleteEntity(tiltMaze);
Entities.deleteEntity(ball);
Entities.deleteEntity(ballSpawningAnchor);
})
};
};

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;
@ -30,17 +31,17 @@
var BALL_DAMPING = 0.6;
var BALL_ANGULAR_DAMPING = 0.2;
var BALL_DENSITY = 1000;
var BALL_GRAVITY = {
var BALL_GRAVITY ={
x: 0,
y: -9.8,
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,