empathicqubit/aqualogue
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shrink dolphin's hitbox and misc cleanup

Browse source
This commit is contained in:
RedEnchilada 2016-05-07 23:24:30 -05:00
parent 74512e66a9
commit 2b0cafaf2f
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
level/Dolphin.js
View file

@ -11,9 +11,9 @@ Dolphin = function(level, axis, position, z) {
};
dolphin.bbox = {
x: 20,
y: 20,
z: 20,
x: 12,
y: 12,
z: 12,
tag: "player"
};
@ -41,19 +41,22 @@ Dolphin = function(level, axis, position, z) {
function doControls() {
var moveX, moveY;
var moveStr, turnStr;
moveStr = 0.2;
turnStr = 0.05;
moveX = Input.held("left") ? -1 : Input.held("right") ? 1 : 0;
moveY = Input.held("up") ? -1 : Input.held("down") ? 1 : 0;
dolphin.momentum.x += moveX*0.2;
dolphin.momentum.y += moveY*0.2;
dolphin.momentum.x += moveX*moveStr;
dolphin.momentum.y += moveY*moveStr;
dolphin.momentum.x *= 0.99;
dolphin.momentum.y *= 0.99;
var oldAngle = Math.atan2(dolphin.momentum.y, dolphin.momentum.x);
if (moveX || moveY) {
if (dolphin.momentum.x || dolphin.momentum.y) {
var oldAngle = Math.atan2(dolphin.momentum.y, dolphin.momentum.x);
var dist = Math.sqrt(
dolphin.momentum.x * dolphin.momentum.x +
dolphin.momentum.y * dolphin.momentum.y
@ -63,18 +66,21 @@ Dolphin = function(level, axis, position, z) {
dist -= 0.22;
}
var delta = Math.atan2(moveY, moveX);
delta = (delta - oldAngle + Math.PI * 3) % (2 * Math.PI) - Math.PI;
if (Math.abs(delta) < Math.PI * 4/5) {
oldAngle += delta > 0.05 ? 0.05 : delta < -0.05 ? -0.05 : delta;
if (moveX || moveY) {
dolphin.momentum.x = dist * Math.cos(oldAngle);
dolphin.momentum.y = dist * Math.sin(oldAngle);
var delta = Math.atan2(moveY, moveX);
delta = (delta - oldAngle + Math.PI * 3) % (2 * Math.PI) - Math.PI;
if (Math.abs(delta) < Math.PI * 4/5) {
oldAngle += delta > turnStr ? turnStr : delta < -turnStr ? -turnStr : delta;
}
}
dolphin.momentum.x = dist * Math.cos(oldAngle);
dolphin.momentum.y = dist * Math.sin(oldAngle);
dolphin.activeSprite.rotation = oldAngle;
}
dolphin.activeSprite.rotation = oldAngle;
}
function axisMove() {

2
level/Level.js
View file

@ -76,6 +76,7 @@ Level = function(levelName) {
// In the viewport.
sprite.visible = true;
sprite.alpha = Math.min(4 - (distance/256), 1);
distance *= Math.cos(angle);
@ -88,7 +89,6 @@ Level = function(levelName) {
// Set sprite position.
sprite.position.set(scrX, scrY);
sprite.scale.set(scrScale, scrScale);
sprite.alpha = Math.min(4 - (distance/256), 1);
// Use distance to sort.
sprite.ZINDEX = Math.round(distance/8);