michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement simple collision detection in the 3D demo

This commit is contained in:
Patrick Walton 2017-09-14 18:48:55 -07:00
parent b48b256ab3
commit a5d0df6a96
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo/client/src/3d-demo.ts
View File

@ -207,7 +207,9 @@ class ThreeDView extends PathfinderDemoView {
this.appController = appController;
this.camera = new PerspectiveCamera(this.canvas);
this.camera = new PerspectiveCamera(this.canvas, {
innerCollisionExtent: MONUMENT_SCALE[0],
});
this.camera.onChange = () => this.setDirty();
this.cubeVertexPositionBuffer = unwrapNull(this.gl.createBuffer());

50
demo/client/src/camera.ts
View File

@ -37,6 +37,19 @@ const PERSPECTIVE_INITIAL_TRANSLATION: glmatrix.vec3 =
glmatrix.vec3.clone([1750.0, 700.0, -1750.0]);
const PERSPECTIVE_INITIAL_ROTATION: glmatrix.vec2 = glmatrix.vec2.clone([Math.PI * 0.25, 0.0]);
const PERSPECTIVE_OUTER_COLLISION_EXTENT: number = 3000.0;
const PERSPECTIVE_HITBOX_RADIUS: number = 1.0;
export interface OrthographicCameraOptions {
minScale?: number;
maxScale?: number;
scaleBounds?: boolean;
}
export interface PerspectiveCameraOptions {
innerCollisionExtent?: number;
}
interface PerspectiveMovementVectors {
[keyCode: number]: glmatrix.vec3;
}
@ -215,9 +228,13 @@ export class OrthographicCamera extends Camera {
}
export class PerspectiveCamera extends Camera {
constructor(canvas: HTMLCanvasElement) {
constructor(canvas: HTMLCanvasElement, options?: PerspectiveCameraOptions) {
super(canvas);
if (options == null)
options = {};
this.innerCollisionExtent = options.innerCollisionExtent || 0.0;
this.translation = glmatrix.vec3.clone(PERSPECTIVE_INITIAL_TRANSLATION);
this.rotation = glmatrix.vec2.clone(PERSPECTIVE_INITIAL_ROTATION);
this.movementDelta = glmatrix.vec3.create();
@ -292,7 +309,30 @@ export class PerspectiveCamera extends Camera {
const delta = glmatrix.vec3.clone(this.movementDelta);
glmatrix.vec3.transformMat4(delta, delta, invRotationMatrix);
glmatrix.vec3.add(this.translation, this.translation, delta);
const trialTranslation = glmatrix.vec3.create();
glmatrix.vec3.add(trialTranslation, this.translation, delta);
// TODO(pcwalton): Sliding…
const absoluteTrialTranslationX = Math.abs(trialTranslation[0]);
const absoluteTrialTranslationZ = Math.abs(trialTranslation[2]);
if (absoluteTrialTranslationX < this.innerCollisionExtent + PERSPECTIVE_HITBOX_RADIUS &&
absoluteTrialTranslationZ < this.innerCollisionExtent + PERSPECTIVE_HITBOX_RADIUS) {
return;
}
if (absoluteTrialTranslationX > PERSPECTIVE_OUTER_COLLISION_EXTENT -
PERSPECTIVE_HITBOX_RADIUS) {
trialTranslation[0] = Math.sign(trialTranslation[0]) *
(PERSPECTIVE_OUTER_COLLISION_EXTENT - PERSPECTIVE_HITBOX_RADIUS);
}
if (absoluteTrialTranslationZ > PERSPECTIVE_OUTER_COLLISION_EXTENT -
PERSPECTIVE_HITBOX_RADIUS) {
trialTranslation[2] = Math.sign(trialTranslation[2]) *
(PERSPECTIVE_OUTER_COLLISION_EXTENT - PERSPECTIVE_HITBOX_RADIUS);
}
this.translation = trialTranslation;
if (this.onChange != null)
this.onChange();
@ -322,10 +362,6 @@ export class PerspectiveCamera extends Camera {
private movementDelta: glmatrix.vec3;
private movementInterval: number | null;
}
export interface OrthographicCameraOptions {
minScale?: number;
maxScale?: number;
scaleBounds?: boolean;
private readonly innerCollisionExtent: number;
}