From ad192fe7068081ed88f8616581bf450d601e99b1 Mon Sep 17 00:00:00 2001 From: James Barnett Date: Tue, 29 Dec 2020 20:13:01 +0000 Subject: Add textures --- src/main/kotlin/main.kt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/main/kotlin/main.kt') diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt index 65995e1..7533287 100644 --- a/src/main/kotlin/main.kt +++ b/src/main/kotlin/main.kt @@ -1,6 +1,7 @@ fun main() { - val raycaster = Raycaster() - val renderer = Renderer(viewportWidth = 640, viewportHeight = 480) + val renderer = Renderer(viewportWidth = 320, viewportHeight = 240, outputScale = 3) + val textureManager = TextureManager() + .apply { loadTextures() } val camera = Camera( fov = 90, xPos = 2.0, @@ -10,7 +11,9 @@ fun main() { val map = Map() val minimap = Minimap(map) - val context = RaycastContext(renderer, camera, map, minimap) + val context = RaycastContext(renderer, textureManager, camera, map, minimap) + + val raycaster = Raycaster(stepPrecision = 32) CameraController(camera, moveSpeed = 0.5, rotateSpeed = 5) { paint(raycaster, context) @@ -21,9 +24,11 @@ fun main() { } fun paint(raycaster: Raycaster, raycastContext: RaycastContext) { - raycastContext.renderer.clear() - raycaster.raycast(raycastContext) - raycastContext.minimap.update(raycastContext.camera) + with(raycastContext) { + renderer.clear() + raycaster.raycast(this) + minimap.update(camera) + } } fun toRadians(degrees: Double): Double { -- cgit v1.2.3