mascully/improcket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix angle resolution

Browse source
This commit is contained in:
asraelite 2018-03-06 15:17:44 +00:00
parent 5b861cc341
commit 0101ef8d55
5 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
js/graphics/index.mjs
View file

@ -6,6 +6,8 @@ import {render as renderBackground} from './background.mjs';
import * as world from '../world/index.mjs';
import * as consts from '../consts.mjs';
const TAU = consts.TAU;
export let canvas, context, tempCanvas, tempContext;
export let perspective;
export let trace = false;
@ -30,6 +32,10 @@ export function render() {
context.fillStyle = '#000';
context.fillRect(0, 0, canvas.width, canvas.height);
context.beginPath();
context.rect(0, 0, canvas.width, canvas.height);
context.clip();
context.save();
perspective.tick();
perspective.transformRotate();
@ -118,7 +124,7 @@ class Perspective {
}
get currentRotation() {
return this.interpolate(this.targetRotation, this.oldTarget);
return this.interpolateAngles(this.targetRotation, this.oldTarget);
}
get currentZoom() {
@ -131,15 +137,11 @@ class Perspective {
}
interpolateAngles(cur, old, x = this.transition) {
let a = cur % (Math.PI * 2);
let b = old % (Math.PI * 2);
return old + this.angleDifference(old, cur) * (1 - x);
}
let sum = a + b;
if (sum > (Math.PI * 2) && sum < (Math.PI * 3))
sum %= Math.PI;
return sum / 2;
angleDifference(a, b) {
return Math.atan2(Math.sin(b - a), Math.cos(b - a));
}
tick() {
@ -195,7 +197,7 @@ class Perspective {
normalize() {
this.targetZoom = Math.max(consts.MIN_ZOOM,
Math.min(consts.MAX_ZOOM, this.targetZoom));
this.targetRotation %= (Math.PI * 2);
this.targetRotation %= TAU;
}
transformRotate() {
@ -218,4 +220,8 @@ class Perspective {
context.translate(tx + bw / 2, ty + bh / 2);
context.scale(this.zoom, this.zoom);
}
normalizeAngle(a = this.r) {
return ((a % TAU) + TAU) % TAU;
}
}