simplify more
This commit is contained in:
parent
f03da42b5e
commit
2fe3c69963
40 changed files with 690 additions and 873 deletions
|
|
@ -7,7 +7,6 @@ import { DeltaTimeCalculator } from '../utils/delta-time-calculator';
|
|||
import { rgbColorToCss, type RgbColor } from '../utils/rgb-color';
|
||||
import { AgentPopulation } from './agent-population';
|
||||
import { DevStatsOverlay } from './dev-stats-overlay';
|
||||
import { EraserPointerPreviewController } from './eraser-pointer-preview-controller';
|
||||
import { EraserPreview } from './eraser-preview';
|
||||
import { ExportSnapshotRenderer } from './export-snapshot-renderer';
|
||||
import { FramePerformance } from './frame-performance';
|
||||
|
|
@ -25,7 +24,6 @@ export default class GameLoop {
|
|||
private readonly introPrompt: IntroPrompt;
|
||||
private readonly eraserPreview: EraserPreview;
|
||||
private readonly pointerInput: GardenPointerInput;
|
||||
private readonly eraserPreviewController: EraserPointerPreviewController;
|
||||
private readonly agentPopulation: AgentPopulation;
|
||||
private readonly exportSnapshotRenderer: ExportSnapshotRenderer;
|
||||
private readonly framePerformance = new FramePerformance();
|
||||
|
|
@ -34,6 +32,7 @@ export default class GameLoop {
|
|||
private readonly seedValue = Math.floor(Math.random() * 0xffffffff);
|
||||
private readonly seed = this.seedValue.toString(16);
|
||||
private readonly resizeListener = this.resize.bind(this);
|
||||
private readonly _canvasSize: vec2 = vec2.create();
|
||||
|
||||
private pendingIntroResizeAt: DOMHighResTimeStamp | null = null;
|
||||
private previousAccentColor = '';
|
||||
|
|
@ -54,7 +53,6 @@ export default class GameLoop {
|
|||
this.framePerformance.adaptiveCapInitial
|
||||
);
|
||||
this.introPrompt = new IntroPrompt(ui.prompt);
|
||||
this.eraserPreview = new EraserPreview(canvas, ui.eraserPreview);
|
||||
this.toolbarContrastMonitor = new ToolbarContrastMonitor(canvas, ui.toolbar, device);
|
||||
this.agentPopulation = new AgentPopulation(
|
||||
this.resources.agentGenerationPipeline,
|
||||
|
|
@ -77,11 +75,11 @@ export default class GameLoop {
|
|||
onEraseGestureEnded: () => this.agentPopulation.requestCompactionAfterErase(),
|
||||
spawnStrokeAgents: (from, to) => this.agentPopulation.spawnStrokeAgents(from, to),
|
||||
});
|
||||
this.eraserPreviewController = new EraserPointerPreviewController({
|
||||
this.eraserPreview = new EraserPreview(
|
||||
canvas,
|
||||
eraserPreview: this.eraserPreview,
|
||||
getIsSwipeActive: () => this.pointerInput.isSwipeActive,
|
||||
});
|
||||
ui.eraserPreview,
|
||||
() => this.pointerInput.isSwipeActive
|
||||
);
|
||||
this.exportSnapshotRenderer = new ExportSnapshotRenderer({
|
||||
device,
|
||||
renderPipeline: this.resources.renderPipeline,
|
||||
|
|
@ -100,7 +98,7 @@ export default class GameLoop {
|
|||
});
|
||||
|
||||
window.addEventListener('resize', this.resizeListener);
|
||||
this.eraserPreviewController.attach();
|
||||
this.eraserPreview.attach();
|
||||
this.syncDevStatsOverlay();
|
||||
}
|
||||
|
||||
|
|
@ -110,11 +108,11 @@ export default class GameLoop {
|
|||
|
||||
public setEraseMode(isErasing: boolean): void {
|
||||
this.pointerInput.setEraseMode(isErasing);
|
||||
this.eraserPreviewController.setEraseMode(isErasing);
|
||||
this.eraserPreview.setEraseMode(isErasing);
|
||||
}
|
||||
|
||||
public updateEraserPreview(event?: PointerEvent): void {
|
||||
this.eraserPreviewController.update(event);
|
||||
this.eraserPreview.update(event);
|
||||
}
|
||||
|
||||
public onVibeChanged(): void {
|
||||
|
|
@ -153,7 +151,7 @@ export default class GameLoop {
|
|||
|
||||
window.removeEventListener('resize', this.resizeListener);
|
||||
this.pointerInput.detach();
|
||||
this.eraserPreviewController.detach();
|
||||
this.eraserPreview.detach();
|
||||
this.devStatsOverlay?.destroy();
|
||||
this.devStatsOverlay = null;
|
||||
this.toolbarContrastMonitor.destroy();
|
||||
|
|
@ -198,7 +196,6 @@ export default class GameLoop {
|
|||
canvasPixelRatio,
|
||||
introProgress,
|
||||
selectedColorIndex: settings.selectedColorIndex,
|
||||
isErasing,
|
||||
channelColors,
|
||||
backgroundColor,
|
||||
eraserPixelSize,
|
||||
|
|
@ -300,7 +297,8 @@ export default class GameLoop {
|
|||
}
|
||||
|
||||
private get canvasSize(): vec2 {
|
||||
return vec2.fromValues(this.canvas.width, this.canvas.height);
|
||||
vec2.set(this._canvasSize, this.canvas.width, this.canvas.height);
|
||||
return this._canvasSize;
|
||||
}
|
||||
|
||||
private get canvasPixelRatio(): number {
|
||||
|
|
|
|||
Loading…
Reference in a new issue