diff --git a/demo/client/src/3d-demo.ts b/demo/client/src/3d-demo.ts index cc980d00..dc106e96 100644 --- a/demo/client/src/3d-demo.ts +++ b/demo/client/src/3d-demo.ts @@ -42,11 +42,13 @@ const SCALE: glmatrix.vec3 = glmatrix.vec3.fromValues(1.0 / 200.0, 1.0 / 200.0, const TEXT_TRANSLATION: number[] = [-(WIDTH + PADDING) * 0.5, 0.0, (WIDTH + PADDING) * 0.5]; +const TEXT_DECAL_OFFSET: number = 5.0; + const MONUMENT_TRANSLATION: glmatrix.vec3 = glmatrix.vec3.fromValues(0.0, -690.0, 0.0); const MONUMENT_SCALE: glmatrix.vec3 = - glmatrix.vec3.fromValues((WIDTH + PADDING) / 400.0 - 0.5, + glmatrix.vec3.fromValues((WIDTH + PADDING) / 400.0 - TEXT_DECAL_OFFSET, 700.0, - (WIDTH + PADDING) / 400.0 - 0.5); + (WIDTH + PADDING) / 400.0 - TEXT_DECAL_OFFSET); const TEXT_COLOR: Uint8Array = new Uint8Array([0xf2, 0xf8, 0xf8, 0xff]); const MONUMENT_COLOR: number[] = [0x70 / 0xff, 0x80 / 0xff, 0x80 / 0xff]; diff --git a/demo/client/src/camera.ts b/demo/client/src/camera.ts index fbf0bb81..cd12364b 100644 --- a/demo/client/src/camera.ts +++ b/demo/client/src/camera.ts @@ -30,7 +30,9 @@ const PERSPECTIVE_MOVEMENT_VECTORS: PerspectiveMovementVectors = _.fromPairs([ const PERSPECTIVE_MOVEMENT_INTERVAL_DELAY: number = 10; -const PERSPECTIVE_INITIAL_TRANSLATION: glmatrix.vec3 = glmatrix.vec3.fromValues(0.0, 0.0, -1000.0); +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]); interface PerspectiveMovementVectors { [keyCode: number]: glmatrix.vec3; @@ -176,7 +178,7 @@ export class PerspectiveCamera extends Camera { super(canvas); this.translation = glmatrix.vec3.clone(PERSPECTIVE_INITIAL_TRANSLATION); - this.rotation = glmatrix.vec2.create(); + this.rotation = glmatrix.vec2.clone(PERSPECTIVE_INITIAL_ROTATION); this.movementDelta = glmatrix.vec3.create(); this.movementInterval = null; @@ -274,7 +276,7 @@ export class PerspectiveCamera extends Camera { translation: glmatrix.vec3; - /// Pitch and yaw Euler angles. + /// Yaw and pitch Euler angles. rotation: glmatrix.vec2; private movementDelta: glmatrix.vec3;