pihkaal/pihkaal-me
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: improve screen context system

Browse Source
This commit is contained in:
Stevan
2025-12-13 19:52:31 +01:00
parent 80fbab446b
commit b70d0f3347
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nds.ts
View File

@@ -1,7 +1,6 @@
import * as THREE from "three"; import * as THREE from "three";
import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js"; import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js";
import { ScreenManager } from "./screen-manager"; import { ScreenManager } from "./screen-manager";
import { HomeScreen } from "./screens/home";
const SCREEN_SOURCE_TEX_SIZE = 1024; const SCREEN_SOURCE_TEX_SIZE = 1024;
const TOP_SCREEN_SOURCE_TEX_HEIGHT = SCREEN_SOURCE_TEX_SIZE / 404; const TOP_SCREEN_SOURCE_TEX_HEIGHT = SCREEN_SOURCE_TEX_SIZE / 404;
@@ -37,11 +36,10 @@ export class NDS extends THREE.Object3D {
public constructor(camera: THREE.Camera, domElement: HTMLCanvasElement) { public constructor(camera: THREE.Camera, domElement: HTMLCanvasElement) {
super(); super();
// Initialize screen manager this.screenManager = new ScreenManager();
this.screenManager = new ScreenManager(new HomeScreen());
const loader = new GLTFLoader();
// load model // load model
const loader = new GLTFLoader();
loader.load("/nintendo-ds/scene.gltf", ({ scene: model }) => { loader.load("/nintendo-ds/scene.gltf", ({ scene: model }) => {
model.scale.set(50, 50, 50); model.scale.set(50, 50, 50);

16
src/screen-manager.ts
View File

@@ -1,16 +1,20 @@
import type { Screen, ScreenContext } from "./screen"; import type { Screen } from "./screen";
import { HomeScreen } from "./screens/home";
export class ScreenManager { export class ScreenManager {
private currentScreen: Screen; private currentScreen: Screen;
private context: ScreenContext;
constructor(initialScreen: Screen) { constructor() {
this.currentScreen = initialScreen; const context = {
this.context = {
navigate: (screen: Screen) => { navigate: (screen: Screen) => {
if (this.currentScreen.destroy) {
this.currentScreen.destroy();
}
this.currentScreen = screen; this.currentScreen = screen;
}, },
}; };
this.currentScreen = new HomeScreen(context);
} }
renderTop(ctx: CanvasRenderingContext2D) { renderTop(ctx: CanvasRenderingContext2D) {
@@ -29,7 +33,7 @@ export class ScreenManager {
handleTouch(x: number, y: number) { handleTouch(x: number, y: number) {
if (this.currentScreen.handleTouch) { if (this.currentScreen.handleTouch) {
this.currentScreen.handleTouch(x, y, this.context); this.currentScreen.handleTouch(x, y);
} }
} }
} }

3
src/screen.ts
View File

@@ -5,5 +5,6 @@ export interface ScreenContext {
export interface Screen { export interface Screen {
renderTop(ctx: CanvasRenderingContext2D): void; renderTop(ctx: CanvasRenderingContext2D): void;
renderBottom(ctx: CanvasRenderingContext2D): void; renderBottom(ctx: CanvasRenderingContext2D): void;
handleTouch?(x: number, y: number, context: ScreenContext): void; handleTouch?(x: number, y: number): void;
destroy?(): void;
} }

1
src/utils/buttonNavigation.ts
View File

@@ -27,7 +27,6 @@ export class ButtonNavigation<T extends string> {
this.navigation = config.navigation; this.navigation = config.navigation;
this.onButtonClick = config.onButtonClick; this.onButtonClick = config.onButtonClick;
// TODO: this should be handled by the nds itself i think, and dispatched
this.keydownHandler = this.handleKeyPress.bind(this); this.keydownHandler = this.handleKeyPress.bind(this);
window.addEventListener("keydown", this.keydownHandler); window.addEventListener("keydown", this.keydownHandler);
} }