Skip to content

Commit

Permalink
Replace backImage and minimap with WasmImage
Browse files Browse the repository at this point in the history
  • Loading branch information
@rexim
rexim committed Sep 11, 2024
1 parent e0d29e8 commit 02ad0fc
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 35 deletions.
28 changes: 16 additions & 12 deletions client.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function createSpritePool(wasmClient) {
return { ptr };
}
function renderMinimap(wasmClient, display, camera, player, scene, spritePool) {
wasmClient.render_minimap(display.minimapPtr, display.minimapWidth, display.minimapHeight, camera.position.x, camera.position.y, camera.direction, player.position.x, player.position.y, scene.wallsPtr, scene.width, scene.height, spritePool.ptr);
wasmClient.render_minimap(display.minimap.ptr, display.minimap.width, display.minimap.height, camera.position.x, camera.position.y, camera.direction, player.position.x, player.position.y, scene.wallsPtr, scene.width, scene.height, spritePool.ptr);
}
function renderDebugInfo(ctx, deltaTime, game) {
const fontSize = 28;
Expand Down Expand Up @@ -82,25 +82,29 @@ function createDisplay(ctx, wasmClient, backImageWidth, backImageHeight) {
return {
ctx,
backCtx,
backImagePtr,
backImageWidth,
backImageHeight,
minimapWidth,
minimapHeight,
minimapPtr,
backImage: {
ptr: backImagePtr,
width: backImageWidth,
height: backImageHeight,
},
minimap: {
ptr: minimapPtr,
width: minimapWidth,
height: minimapHeight,
},
zBufferPtr,
};
}
function displaySwapBackImageData(display, wasmClient) {
const backImageData = new Uint8ClampedArray(wasmClient.memory.buffer, display.backImagePtr, display.backImageWidth * display.backImageHeight * 4);
display.backCtx.putImageData(new ImageData(backImageData, display.backImageWidth), 0, 0);
const backImageData = new Uint8ClampedArray(wasmClient.memory.buffer, display.backImage.ptr, display.backImage.width * display.backImage.height * 4);
display.backCtx.putImageData(new ImageData(backImageData, display.backImage.width), 0, 0);
display.ctx.drawImage(display.backCtx.canvas, 0, 0, display.ctx.canvas.width, display.ctx.canvas.height);
}
function cullAndSortSprites(wasmClient, camera, spritePool) {
wasmClient.cull_and_sort_sprites(camera.position.x, camera.position.y, camera.direction, spritePool.ptr);
}
function renderSprites(display, wasmClient, spritePool) {
wasmClient.render_sprites(display.backImagePtr, display.backImageWidth, display.backImageHeight, display.zBufferPtr, spritePool.ptr);
wasmClient.render_sprites(display.backImage.ptr, display.backImage.width, display.backImage.height, display.zBufferPtr, spritePool.ptr);
}
function pushSprite(wasmClient, spritePool, image, position, z, scale, cropPosition, cropSize) {
const cropPosition1 = new Vector2();
Expand Down Expand Up @@ -501,8 +505,8 @@ function renderGame(display, deltaTime, time, game) {
pushSprite(game.wasmClient, game.spritePool, game.assets.playerImage, player.position, 1, 1, new Vector2(55 * index, 0), new Vector2(55, 55));
}
});
game.wasmClient.render_floor_and_ceiling(display.backImagePtr, display.backImageWidth, display.backImageHeight, game.camera.position.x, game.camera.position.y, game.camera.direction);
game.wasmClient.render_walls(display.backImagePtr, display.backImageWidth, display.backImageHeight, display.zBufferPtr, game.assets.wallImage.ptr, game.assets.wallImage.width, game.assets.wallImage.height, game.camera.position.x, game.camera.position.y, game.camera.direction, game.level.scene.wallsPtr, game.level.scene.width, game.level.scene.height);
game.wasmClient.render_floor_and_ceiling(display.backImage.ptr, display.backImage.width, display.backImage.height, game.camera.position.x, game.camera.position.y, game.camera.direction);
game.wasmClient.render_walls(display.backImage.ptr, display.backImage.width, display.backImage.height, display.zBufferPtr, game.assets.wallImage.ptr, game.assets.wallImage.width, game.assets.wallImage.height, game.camera.position.x, game.camera.position.y, game.camera.direction, game.level.scene.wallsPtr, game.level.scene.width, game.level.scene.height);
cullAndSortSprites(game.wasmClient, game.camera, game.spritePool);
renderSprites(display, game.wasmClient, game.spritePool);
displaySwapBackImageData(display, game.wasmClient);
Expand Down
41 changes: 18 additions & 23 deletions client.mts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ interface Camera {
}

function renderMinimap(wasmClient: WasmClient, display: Display, camera: Camera, player: Player, scene: Scene, spritePool: SpritePool) {
wasmClient.render_minimap(display.minimapPtr, display.minimapWidth, display.minimapHeight,
wasmClient.render_minimap(display.minimap.ptr, display.minimap.width, display.minimap.height,
camera.position.x, camera.position.y, camera.direction,
player.position.x, player.position.y,
scene.wallsPtr, scene.width, scene.height,
Expand Down Expand Up @@ -101,17 +101,8 @@ function renderDebugInfo(ctx: CanvasRenderingContext2D, deltaTime: number, game:
interface Display {
ctx: CanvasRenderingContext2D;
backCtx: OffscreenCanvasRenderingContext2D;

// TODO: replace with minimap: WasmImage
minimapPtr: number;
minimapWidth: number;
minimapHeight: number;

// TODO: replace with backImage: WasmImage
backImagePtr: number;
backImageWidth: number;
backImageHeight: number;

minimap: WasmImage;
backImage: WasmImage;
zBufferPtr: number;
}

Expand Down Expand Up @@ -151,19 +142,23 @@ function createDisplay(ctx: CanvasRenderingContext2D, wasmClient: WasmClient, ba
return {
ctx,
backCtx,
backImagePtr,
backImageWidth,
backImageHeight,
minimapWidth,
minimapHeight,
minimapPtr,
backImage: {
ptr: backImagePtr,
width: backImageWidth,
height: backImageHeight,
},
minimap: {
ptr: minimapPtr,
width: minimapWidth,
height: minimapHeight,
},
zBufferPtr,
};
}

function displaySwapBackImageData(display: Display, wasmClient: WasmClient) {
const backImageData = new Uint8ClampedArray(wasmClient.memory.buffer, display.backImagePtr, display.backImageWidth*display.backImageHeight*4);
display.backCtx.putImageData(new ImageData(backImageData, display.backImageWidth), 0, 0);
const backImageData = new Uint8ClampedArray(wasmClient.memory.buffer, display.backImage.ptr, display.backImage.width*display.backImage.height*4);
display.backCtx.putImageData(new ImageData(backImageData, display.backImage.width), 0, 0);
display.ctx.drawImage(display.backCtx.canvas, 0, 0, display.ctx.canvas.width, display.ctx.canvas.height);
}

Expand All @@ -172,7 +167,7 @@ function cullAndSortSprites(wasmClient: WasmClient, camera: Camera, spritePool:
}

function renderSprites(display: Display, wasmClient: WasmClient, spritePool: SpritePool) {
wasmClient.render_sprites(display.backImagePtr, display.backImageWidth, display.backImageHeight, display.zBufferPtr, spritePool.ptr)
wasmClient.render_sprites(display.backImage.ptr, display.backImage.width, display.backImage.height, display.zBufferPtr, spritePool.ptr)
}

function pushSprite(wasmClient: WasmClient, spritePool: SpritePool, image: WasmImage, position: Vector2, z: number, scale: number, cropPosition?: Vector2, cropSize?: Vector2) {
Expand Down Expand Up @@ -647,9 +642,9 @@ function renderGame(display: Display, deltaTime: number, time: number, game: Gam
}
})

game.wasmClient.render_floor_and_ceiling(display.backImagePtr, display.backImageWidth, display.backImageHeight, game.camera.position.x, game.camera.position.y, game.camera.direction);
game.wasmClient.render_floor_and_ceiling(display.backImage.ptr, display.backImage.width, display.backImage.height, game.camera.position.x, game.camera.position.y, game.camera.direction);
game.wasmClient.render_walls(
display.backImagePtr, display.backImageWidth, display.backImageHeight, display.zBufferPtr,
display.backImage.ptr, display.backImage.width, display.backImage.height, display.zBufferPtr,
game.assets.wallImage.ptr, game.assets.wallImage.width, game.assets.wallImage.height,
game.camera.position.x, game.camera.position.y, game.camera.direction,
game.level.scene.wallsPtr, game.level.scene.width, game.level.scene.height);
Expand Down

0 comments on commit 02ad0fc

Please sign in to comment.