andras/decla-red
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

Some refactoring

Browse source
This commit is contained in:
schmelczerandras 2020-09-14 19:18:59 +02:00
parent a51c06ae7b
commit 99f47e2961
45 changed files with 72 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/scripts/objects/types/camera.ts
View file

@ -1,5 +1,5 @@
import { vec2 } from 'gl-matrix';
import { BeforeRenderCommand } from '../../drawing/commands/before-render';
import { BeforeRenderCommand } from '../../graphics/commands/before-render';
import { CursorMoveCommand } from '../../input/commands/cursor-move-command';
import { ZoomCommand } from '../../input/commands/zoom';
import { MoveToCommand } from '../../physics/commands/move-to';
@ -7,7 +7,7 @@ import { BoundingBox } from '../../shapes/bounding-box';
import { GameObject } from '../game-object';
export class Camera extends GameObject {
private inViewAreaSize = 1920 * 1080 * 5;
private inViewAreaSize = 1920 * 1080 * 2;
private cursorPosition = vec2.create();
private _viewArea: BoundingBox;

26
frontend/src/scripts/objects/types/character.ts
View file

@ -1,7 +1,7 @@
import { vec2, vec3 } from 'gl-matrix';
import { RenderCommand } from '../../drawing/commands/render';
import { DrawableBlob } from '../../drawing/drawables/drawable-blob';
import { Flashlight } from '../../drawing/drawables/lights/flashlight';
import { RenderCommand } from '../../graphics/commands/render';
import { DrawableBlob } from '../../graphics/drawables/drawable-blob';
import { Flashlight } from '../../graphics/drawables/lights/flashlight';
import { IGame } from '../../i-game';
import { KeyDownCommand } from '../../input/commands/key-down';
import { KeyUpCommand } from '../../input/commands/key-up';
@ -14,23 +14,19 @@ import { GameObject } from '../game-object';
export class Character extends GameObject {
private keysDown: Set<string> = new Set();
private light: Flashlight;
private light = new Flashlight(
vec2.create(),
vec2.fromValues(-1, 0),
0.7,
vec3.fromValues(1, 0.6, 0.45),
1.5
);
private shape = new DrawableBlob(vec2.create());
private static speed = 1.5;
constructor(private game: IGame) {
super();
this.light = new Flashlight(
vec2.create(),
vec2.fromValues(-1, 0),
0.7,
vec3.fromValues(1, 0.6, 0.45),
1.5
);
//this.light = new CircleLight(vec2.create(), 0.2, vec3.fromValues(1, 0.6, 0.45), 1.5);
this.addCommandExecutor(StepCommand, this.stepHandler.bind(this));
this.addCommandExecutor(RenderCommand, this.draw.bind(this));
this.addCommandExecutor(TeleportToCommand, (c) => this.setPosition(c.position));
this.addCommandExecutor(KeyDownCommand, (c) => this.keysDown.add(c.key));
@ -116,7 +112,7 @@ export class Character extends GameObject {
private setPosition(value: vec2) {
this.shape.position = value;
this.light.center = vec2.add(vec2.create(), value, vec2.fromValues(150, 0));
this.light.center = vec2.add(vec2.create(), value, vec2.fromValues(50, -40));
}
public stepHandler(c: StepCommand) {

2
frontend/src/scripts/objects/types/info-text.ts
View file

@ -1,4 +1,4 @@
import { RenderCommand } from '../../drawing/commands/render';
import { RenderCommand } from '../../graphics/commands/render';
import { GameObject } from '../game-object';
export class InfoText extends GameObject {

4
frontend/src/scripts/objects/types/lamp.ts
View file

@ -1,6 +1,6 @@
import { vec2, vec3 } from 'gl-matrix';
import { RenderCommand } from '../../drawing/commands/render';
import { CircleLight } from '../../drawing/drawables/lights/circle-light';
import { RenderCommand } from '../../graphics/commands/render';
import { CircleLight } from '../../graphics/drawables/lights/circle-light';
import { MoveToCommand } from '../../physics/commands/move-to';
import { GameObject } from '../game-object';

4
frontend/src/scripts/objects/types/tunnel.ts
View file

@ -1,6 +1,6 @@
import { vec2 } from 'gl-matrix';
import { RenderCommand } from '../../drawing/commands/render';
import { DrawableTunnel } from '../../drawing/drawables/drawable-tunnel';
import { RenderCommand } from '../../graphics/commands/render';
import { DrawableTunnel } from '../../graphics/drawables/drawable-tunnel';
import { Physics } from '../../physics/physics';
import { GameObject } from '../game-object';