Major tilemap/grid refactor, collision detection, interactable detection

flake.nix

@@ -24,8 +24,8 @@
 
           buildInputs = with pkgs; [
             libGL
+            # X11 dependencies for Raylib
             raylib
-            raygui
             xorg.libX11
             xorg.libXcursor
             xorg.libXi
@@ -38,7 +38,6 @@
             export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${with pkgs; lib.makeLibraryPath [
               libGL
               raylib
-              raygui
               xorg.libX11
               xorg.libXcursor
               xorg.libXi

src/gamestate.odin

@@ -1,4 +0,0 @@
-package main
-
-GameState :: struct {}
-

src/hue_shift.fs

@@ -1,43 +0,0 @@
-#version 330
-
-// Input from vertex shader
-in vec2 fragTexCoord;
-in vec4 fragColor;
-
-// Output to the screen
-out vec4 finalColor; 
-
-uniform sampler2D texture0;
-uniform float hueShift;
-
-// RGB to HSV conversion
-vec3 rgb2hsv(vec3 c) {
-    vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
-    vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
-    vec4 q = mix(vec4(p.xyw, c.r), vec4(c.r, p.yzx), step(p.x, c.r));
-    float d = q.x - min(q.w, q.y);
-    float e = 1.0e-10;
-    return vec3(abs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
-}
-
-// HSV to RGB conversion
-vec3 hsv2rgb(vec3 c) {
-    vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
-    vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
-    return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
-}
-
-void main() {
-    // Standard Raylib texture lookup
-    vec4 texelColor = texture(texture0, fragTexCoord) * fragColor;
-    
-    // Convert to HSV
-    vec3 hsv = rgb2hsv(texelColor.rgb);
-    
-    // Shift the Hue (hsv.x) and wrap it around 1.0 using fract()
-    hsv.x = fract(hsv.x + hueShift);
-    
-    // Convert back to RGB and output
-    vec3 rgb = hsv2rgb(hsv);
-    finalColor = vec4(rgb, texelColor.a);
-}

src/main.odin

@@ -4,10 +4,6 @@ import "core:fmt"
 import "core:strings"
 import "vendor:raylib"
 
-shader: raylib.Shader
-hue_loc: i32
-
-delta: f32
 player: Player
 
 main :: proc() {
@@ -17,24 +13,12 @@ main :: proc() {
 	raylib.SetConfigFlags(config_flags)
 
 	raylib.InitWindow(1920, 1080, "Game")
-	defer raylib.CloseWindow()
 	raylib.SetTargetFPS(60)
 
-	raylib.SetExitKey(nil)
-
-	init_pause_menu()
-
 	init_world()
-	defer deinit_world()
-
-	// Test shader stuff
-	shader = raylib.LoadShader(nil, "hue_shift.fs")
-	hue_loc = raylib.GetShaderLocation(shader, "hueShift")
-	shift_value: f32 = 0.4
-	raylib.SetShaderValue(shader, hue_loc, &shift_value, .FLOAT)
 
 	player = {
-		position = {300, 300},
+		position = {0, 0},
 		camera = {
 			zoom = 4,
 			offset = {f32(raylib.GetScreenWidth()) / 2, f32(raylib.GetScreenHeight()) / 2},
@@ -46,7 +30,7 @@ main :: proc() {
 
 	for (!raylib.WindowShouldClose()) {
 
-		if !is_paused do delta = raylib.GetFrameTime()
+		delta := raylib.GetFrameTime()
 
 		raylib.BeginDrawing()
 		raylib.ClearBackground(raylib.BLACK)
@@ -59,19 +43,17 @@ main :: proc() {
 
 		raylib.EndMode2D()
 		raylib.DrawFPS(20, 20)
-		draw_pause_menu()
 		draw_player_grid_debug()
 		raylib.EndDrawing()
 
 		update(delta)
 	}
+
+	raylib.CloseWindow()
 }
 
 @(private = "file")
 update :: proc(delta: f32) {
-	process_pause_menu_input()
-
-	if is_paused do return
 	update_world(delta)
 	update_player(&player, delta)
 }

src/pausemenu.odin

@@ -1,42 +0,0 @@
-package main
-
-import "core:fmt"
-import rl "vendor:raylib"
-
-test_pause_tex: rl.Texture2D
-test_pause_button_rect: rl.Rectangle
-
-is_paused := false
-
-init_pause_menu :: proc() {
-	test_pause_tex = rl.LoadTexture("./assets/pause.jpg")
-	test_pause_button_rect = {
-		x      = 200,
-		y      = 200,
-		width  = f32(test_pause_tex.width),
-		height = f32(test_pause_tex.height),
-	}
-}
-
-draw_pause_menu :: proc() {
-	if (is_paused) do rl.DrawTexture(test_pause_tex, 200, 200, rl.WHITE)
-}
-
-process_pause_menu_input :: proc() {
-	mouse_pos := rl.GetMousePosition()
-
-	if rl.IsKeyPressed(.ESCAPE) do is_paused = !is_paused
-
-	if !is_paused do return
-
-	if (rl.CheckCollisionPointRec(mouse_pos, test_pause_button_rect)) {
-		if (rl.IsMouseButtonPressed(rl.MouseButton.LEFT)) {
-			test_pause_click()
-		}
-	}
-}
-
-test_pause_click :: proc() {
-	is_paused = false
-}
-

src/player.odin

@@ -3,15 +3,12 @@ package main
 import "core:math"
 import "vendor:raylib"
 
-PLAYER_DEFAULT_SPRINT_SPEED :: 100
+PLAYER_SPRINT_SPEED :: 2.5
-PLAYER_DEFAULT_SPEED :: 60
+PLAYER_SPEED :: 1.5
 PLAYER_WIDTH :: 32
 PLAYER_HEIGHT :: 32
 PLAYER_SPRITE_PATH :: "assets/player/player.png"
 
-player_speed := PLAYER_DEFAULT_SPEED
-player_sprint_speed := PLAYER_DEFAULT_SPRINT_SPEED
-
 spritesheet: raylib.Texture2D
 framesX: i32
 framesY: i32
@@ -52,42 +49,42 @@ handle_player_camera :: proc(p: ^Player, delta: f32) {
 @(private = "file")
 handle_player_input :: proc(p: ^Player, delta: f32) {
 	dir: raylib.Vector2 = {0, 0}
+
 	if raylib.IsKeyDown(.W) do dir.y -= 1
 	if raylib.IsKeyDown(.S) do dir.y += 1
 	if raylib.IsKeyDown(.A) do dir.x -= 1
 	if raylib.IsKeyDown(.D) do dir.x += 1
 
-	if dir.x != 0 || dir.y != 0 {
+	is_moving := dir.x != 0 || dir.y != 0
+
+	if is_moving {
 		is_sprinting := raylib.IsKeyDown(.LEFT_SHIFT)
 		dir = raylib.Vector2Normalize(dir)
 
-		speed_val := f32(is_sprinting ? player_sprint_speed : player_speed)
+		speed: f32 = is_sprinting ? PLAYER_SPRINT_SPEED : PLAYER_SPEED
-		p.animator.anim.fps = is_sprinting ? i32(player_sprint_speed / 10) : i32(player_speed / 10)
+		p.animator.anim.fps = is_sprinting ? 11 : 6
 
-		velocity := dir * speed_val * delta
+		velocity := dir * speed
 
-		foot_y := p.position.y + f32(p.sprite.height)
+		new_pos_x := p.position
-		box_half_w: f32 = 4.0
+		new_pos_x.x += velocity.x
-		center_offset_x := f32(p.sprite.width) * 0.5
 
-		next_x := p.position.x + velocity.x
+		foot_offset_y := f32(p.sprite.height)
-		if !is_wall_at({next_x + center_offset_x - box_half_w, foot_y}) &&
+		foot_offset_x := f32(p.sprite.width) * 0.5
-		   !is_wall_at({next_x + center_offset_x + box_half_w, foot_y}) {
+
-			p.position.x = next_x
+		if !is_wall_at({new_pos_x.x + foot_offset_x, new_pos_x.y + foot_offset_y}) {
+			p.position.x = new_pos_x.x
 		}
 
-		next_y := p.position.y + velocity.y
+		new_pos_y := p.position
-		if !is_wall_at(
+		new_pos_y.y += velocity.y
-			   {p.position.x + center_offset_x - box_half_w, next_y + f32(p.sprite.height)},
+		if !is_wall_at({p.position.x + foot_offset_x, new_pos_y.y + foot_offset_y}) {
-		   ) &&
+			p.position.y = new_pos_y.y
-		   !is_wall_at(
-				   {p.position.x + center_offset_x + box_half_w, next_y + f32(p.sprite.height)},
-			   ) {
-			p.position.y = next_y
 		}
 
 		if dir.x < 0 do p.facing_left = true
 		if dir.x > 0 do p.facing_left = false
+
 		p.state = .WALKING
 	} else {
 		p.state = .IDLE
@@ -116,9 +113,6 @@ update_player :: proc(p: ^Player, delta: f32) {
 	handle_player_input(p, delta)
 	handle_player_camera(p, delta)
 
-	// Remove this in release
-	handle_debug_inputs()
-
 	if (p.state == .IDLE) {
 		set_sprite_animation(&p.animator, &idle_animation)
 	}
@@ -148,25 +142,8 @@ is_wall_at :: proc(world_pos: raylib.Vector2) -> bool {
 	gx := int(math.floor(world_pos.x / tile_size))
 	gy := int(math.floor(world_pos.y / tile_size))
 
-	if gx < 0 || gx >= ground_layer_grid.width || gy < 0 || gy >= ground_layer_grid.height {
-		return true
-	}
-
 	tile := get_tile(&ground_layer_grid, gx, gy)
+
 	return tile != nil && tile.type == .WALL
 }
 
-handle_debug_inputs :: proc() {
-	if (raylib.IsKeyPressed(.KP_ADD)) do player_sprint_speed += 10
-	if (raylib.IsKeyPressed(.KP_SUBTRACT)) do player_sprint_speed -= 10
-
-	if (raylib.IsKeyDown(.LEFT_CONTROL) && raylib.IsKeyPressed(.EQUAL)) {
-		player.camera.zoom += 0.5
-	}
-
-	if (raylib.IsKeyDown(.LEFT_CONTROL) && raylib.IsKeyPressed(.MINUS)) {
-		player.camera.zoom -= 0.5
-	}
-
-}
-

src/tile.odin

@@ -6,6 +6,7 @@ TILEMAP_TILE_SIZE :: 16
 
 Tile :: struct {
 	frame_index: i32,
+	color:       raylib.Color,
 	type:        TileType,
 	interaction: InteractionType,
 	resource:    ResourceType,
@@ -34,6 +35,61 @@ InteractionType :: enum {
 	EXAMINE,
 }
 
+nothing_tile := Tile {
+	type        = .NOTHING,
+	frame_index = 0,
+	color       = raylib.WHITE,
+	interaction = .NONE,
+	resource    = .NONE,
+	animator    = nil,
+}
+
+ground_tile := Tile {
+	type        = .GROUND,
+	frame_index = 0,
+	color       = raylib.WHITE,
+	interaction = .NONE,
+	resource    = .NONE,
+	animator    = nil,
+}
+
+test_wall_tile := Tile {
+	type        = .WALL,
+	frame_index = 1,
+	color       = raylib.WHITE,
+	interaction = .NONE,
+	resource    = .NONE,
+	animator    = nil,
+}
+
+plant_tile := Tile {
+	type        = .FLORA,
+	frame_index = 0,
+	color       = raylib.WHITE,
+	interaction = .HARVEST,
+	resource    = .FLORA,
+	animator    = nil,
+}
+
+plant_2_tile := Tile {
+	type        = .FLORA,
+	frame_index = 1,
+	color       = raylib.WHITE,
+	interaction = .HARVEST,
+	resource    = .FLORA,
+	animator    = nil,
+}
+
+plant_3_tile := Tile {
+	type        = .FLORA,
+	frame_index = 2,
+	color       = raylib.WHITE,
+	interaction = .HARVEST,
+	resource    = .FLORA,
+	animator    = nil,
+}
+
+
 draw_tile :: proc(
 	tilemap_sheet: ^TilemapSpritesheet,
 	tile: ^Tile,

src/tile_definitions.odin

@@ -1,129 +0,0 @@
-package main
-
-Ground_Tile_ID :: enum {
-	NOTHING,
-	GROUND,
-	WALL,
-}
-
-Interactive_Tile_ID :: enum {
-	PEPE_1,
-	PEPE_2,
-	PEPE_3,
-	FLOWER_1,
-	FLOWER_2,
-	FLOWER_3,
-	MINERAL_1,
-	MINERAL_2,
-	MINERAL_3,
-	MINERAL_4,
-	MINERAL_5,
-	MINERAL_6,
-}
-
-
-GROUND_TILES_MAP := [Ground_Tile_ID]Tile {
-	.NOTHING = {
-		type = .NOTHING,
-		frame_index = 0,
-		interaction = .NONE,
-		resource = .NONE,
-		animator = nil,
-	},
-	.GROUND = {
-		type = .GROUND,
-		frame_index = 0,
-		interaction = .NONE,
-		resource = .NONE,
-		animator = nil,
-	},
-	.WALL = {type = .WALL, frame_index = 5, interaction = .NONE, resource = .NONE, animator = nil},
-}
-
-INTERACTIVE_TILES_MAP := [Interactive_Tile_ID]Tile {
-	.PEPE_1 = {
-		type = .FLORA,
-		frame_index = 0,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.PEPE_2 = {
-		type = .FLORA,
-		frame_index = 1,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.PEPE_3 = {
-		type = .FLORA,
-		frame_index = 2,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.FLOWER_1 = {
-		type = .FLORA,
-		frame_index = 3,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.FLOWER_2 = {
-		type = .FLORA,
-		frame_index = 4,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.FLOWER_3 = {
-		type = .FLORA,
-		frame_index = 5,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.MINERAL_1 = {
-		type = .FLORA,
-		frame_index = 6,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.MINERAL_2 = {
-		type = .FLORA,
-		frame_index = 7,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.MINERAL_3 = {
-		type = .FLORA,
-		frame_index = 8,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.MINERAL_4 = {
-		type = .FLORA,
-		frame_index = 9,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.MINERAL_5 = {
-		type = .FLORA,
-		frame_index = 10,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-	.MINERAL_6 = {
-		type = .FLORA,
-		frame_index = 11,
-		interaction = .HARVEST,
-		resource = .FLORA,
-		animator = nil,
-	},
-}
-

src/tilemap.odin

@@ -55,12 +55,7 @@ update_tile_grid :: proc(grid: ^Grid, camera: ^raylib.Camera2D, tile_w, tile_h:
 	}
 }
 
-draw_tile_grid :: proc(
+draw_tile_grid :: proc(sheet: ^TilemapSpritesheet, grid: ^Grid, camera: ^raylib.Camera2D) {
-	sheet: ^TilemapSpritesheet,
-	grid: ^Grid,
-	camera: ^raylib.Camera2D,
-	color: raylib.Color,
-) {
 	tile_w := f32(sheet.tile_width)
 	tile_h := f32(sheet.tile_height)
 
@@ -73,7 +68,7 @@ draw_tile_grid :: proc(
 			if tile.type == .NOTHING do continue
 
 			pos := raylib.Vector2{f32(x) * tile_w, f32(y) * tile_h}
-			draw_tile(sheet, tile, pos, color)
+			draw_tile(sheet, tile, pos, raylib.WHITE)
 		}
 	}
 }

src/world.odin

@@ -1,11 +1,8 @@
 package main
 
-import "vendor:raylib"
 WORLD_SIZE_X :: 1000
 WORLD_SIZE_Y :: 1000
 
-world_base_color := raylib.WHITE
-
 ground_layer_grid: Grid
 ground_tilemap_sheet: TilemapSpritesheet
 
@@ -13,8 +10,6 @@ interactables_layer_grid: Grid
 interactables_tilemap_sheet: TilemapSpritesheet
 
 init_world :: proc() {
-
-
 	ground_tilemap_sheet = load_tilemap_sheet(
 		"assets/tiles/master_tilemap.png",
 		TILEMAP_TILE_SIZE,
@@ -27,20 +22,17 @@ init_world :: proc() {
 		TILEMAP_TILE_SIZE,
 	)
 
-	ground_layer_grid = create_tile_grid(WORLD_SIZE_X, WORLD_SIZE_Y, GROUND_TILES_MAP[.GROUND])
+	ground_layer_grid = create_tile_grid(WORLD_SIZE_X, WORLD_SIZE_Y, ground_tile)
-	interactables_layer_grid = create_tile_grid(
+	interactables_layer_grid = create_tile_grid(WORLD_SIZE_X, WORLD_SIZE_Y, nothing_tile)
-		WORLD_SIZE_X,
-		WORLD_SIZE_Y,
-		GROUND_TILES_MAP[.NOTHING],
-	)
-
-
-	for i := 0; i < 11; i += 1 {
-		id := Interactive_Tile_ID(i)
-		set_tile(&interactables_layer_grid, i, 5, INTERACTIVE_TILES_MAP[id])
-	}
 
+	set_tile(&interactables_layer_grid, 2, 2, plant_tile)
+	set_tile(&interactables_layer_grid, 4, 2, plant_2_tile)
+	set_tile(&interactables_layer_grid, 6, 2, plant_3_tile)
 
+	set_tile(&ground_layer_grid, 5, 5, test_wall_tile)
+	set_tile(&ground_layer_grid, 6, 5, test_wall_tile)
+	set_tile(&ground_layer_grid, 7, 5, test_wall_tile)
+	set_tile(&ground_layer_grid, 8, 5, test_wall_tile)
 }
 
 deinit_world :: proc() {
@@ -67,17 +59,7 @@ update_world :: proc(delta: f32) {
 }
 
 draw_world :: proc() {
-	raylib.BeginShaderMode(shader)
+	draw_tile_grid(&ground_tilemap_sheet, &ground_layer_grid, &player.camera)
-
+	draw_tile_grid(&interactables_tilemap_sheet, &interactables_layer_grid, &player.camera)
-	draw_tile_grid(&ground_tilemap_sheet, &ground_layer_grid, &player.camera, world_base_color)
-
-	draw_tile_grid(
-		&interactables_tilemap_sheet,
-		&interactables_layer_grid,
-		&player.camera,
-		raylib.WHITE,
-	)
-
-	raylib.EndShaderMode()
 }