codegirl.games/tower-defense-prototype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "rename hud.odin to overlay.odin, add clay button to start wave"

Browse Source 
This reverts commit d097e36419.
This commit is contained in:
codegirl007
2026-06-18 00:53:49 -07:00
parent d097e36419
commit 6b68ce3fa1
6 changed files with 57 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/commands.odin
+6 -3
View File
@@ -15,9 +15,6 @@ Command :: struct {
}
gather_commands :: proc(world: ^World) -> Command {
overlay_cmd := poll_overlay_command()
if overlay_cmd.kind != .None do return overlay_cmd
if world.phase == .Build && rl.IsKeyPressed(.N) {
return Command{kind = .Start_Wave}
}
@@ -28,6 +25,12 @@ gather_commands :: proc(world: ^World) -> Command {
return Command{kind = .Place_Tower, gx = gx, gy = gy}
}
if rl.IsMouseButtonPressed(.LEFT) {
mouse := rl.GetMousePosition()
gx, gy := screen_to_grid(mouse.x, mouse.y)
return Command{kind = .Place_Tower, gx = gx, gy = gy}
}
return Command{kind = .None}
}
game/constants.odin
-8
View File
@@ -1,7 +1,5 @@
package game
import clay "../clay-odin"
MAP_W :: 30 // map width in tiles
MAP_H :: 20 // map height in tiles
TILE_SIZE :: 32 // size of tiles in pixels
@@ -19,9 +17,3 @@ MAX_PROJECTILES :: 64
PROJECTILE_SPEED :: 280 // pixels per second
PROJECTILE_HIT_RADIUS :: 10
UI_BAR_COLOR :: clay.Color{20, 40, 20, 200}
UI_TEXT_COLOR :: clay.Color{240, 240, 230, 255}
UI_GOLD_COLOR :: clay.Color{255, 215, 80, 255}
UI_BUTTON_COLOR :: clay.Color{60, 120, 60, 255}
UI_BUTTON_HOVER :: clay.Color{80, 150, 80, 255}
game/hud.odin
+50
View File
@@ -0,0 +1,50 @@
package game
import clay "../clay-odin"
import "core:fmt"
import rl "vendor:raylib"
UI_BAR_COLOR :: clay.Color{20, 40, 20, 200}
UI_TEXT_COLOR :: clay.Color{240, 240, 230, 255}
UI_GOLD_COLOR :: clay.Color{255, 215, 80, 255}
ui_text_scratch: [64]u8
build_hud :: proc(world: ^World) {
if clay.UI(clay.ID("HudBar"))(
{
layout = {
layoutDirection = .LeftToRight,
sizing = {width = clay.SizingGrow({}), height = clay.SizingFixed(28)},
padding = clay.PaddingAll(6),
childGap = 8,
childAlignment = {y = .Center},
},
backgroundColor = UI_BAR_COLOR,
},
) {
gold_text := fmt.bprintf(ui_text_scratch[:], "Gold: %d", world.gold)
clay.Text(
gold_text,
clay.TextElementConfig{textColor = UI_GOLD_COLOR, fontId = UI_FONT_ID, fontSize = 18},
)
}
}
render_hud :: proc(world: ^World) {
rl.DrawText(fmt.ctprintf("Base HP: %d", world.base_health), 10, 32, 22, rl.BLACK)
rl.DrawText(fmt.ctprintf("Enemies: %d", active_enemy_count(world)), 10, 54, 22, rl.BLACK)
rl.DrawText(fmt.ctprintf("Wave: %d / %d", world.wave, MAX_WAVES), 10, 76, 22, rl.BLACK)
switch world.phase {
case .Build:
rl.DrawText("Build - click towers, N = start wave", 10, 98, 22, rl.BLACK)
case .Combat:
rl.DrawText("Combat!", 10, 98, 22, rl.MAROON)
case .Game_Over:
rl.DrawText("GAME_OVER", 260, 280, 40, rl.RED)
case .Victory:
rl.DrawText("Victory!", 260, 280, 40, rl.GREEN)
}
}
game/overlay.odin
-89
View File
@@ -1,89 +0,0 @@
package game
import clay "../clay-odin"
import "core:fmt"
import rl "vendor:raylib"
ui_hud_scratch: struct {
gold: [64]u8,
hp: [64]u8,
wave: [64]u8,
}
build_overlay :: proc(world: ^World) {
if clay.UI(clay.ID("HudBar"))(
{
layout = {
layoutDirection = .LeftToRight,
sizing = {width = clay.SizingGrow({}), height = clay.SizingFixed(28)},
padding = clay.PaddingAll(6),
childGap = 8,
childAlignment = {y = .Center},
},
backgroundColor = UI_BAR_COLOR,
},
) {
gold_text := fmt.bprintf(ui_hud_scratch.gold[:], "Gold: %d", world.gold)
clay.Text(
gold_text,
clay.TextElementConfig{textColor = UI_GOLD_COLOR, fontId = UI_FONT_ID, fontSize = 18},
)
hp_text := fmt.bprintf(ui_hud_scratch.hp[:], "Base HP: %d", world.base_health)
clay.Text(
hp_text,
clay.TextElementConfig{textColor = UI_TEXT_COLOR, fontId = UI_FONT_ID, fontSize = 18},
)
wave_text := fmt.bprintf(ui_hud_scratch.wave[:], "Wave: %d / %d", world.wave, MAX_WAVES)
clay.Text(
wave_text,
clay.TextElementConfig{textColor = UI_TEXT_COLOR, fontId = UI_FONT_ID, fontSize = 18},
)
if world.phase == .Build {
if clay.UI(clay.ID("StartWaveBtn"))(
{
layout = {
sizing = {width = clay.SizingFixed(110), height = clay.SizingFixed(22)},
padding = clay.PaddingAll(4),
childAlignment = {x = .Center, y = .Center},
},
backgroundColor = clay.Hovered() ? UI_BUTTON_HOVER : UI_BUTTON_COLOR,
},
) {
clay.Text(
"Start Wave",
clay.TextElementConfig {
textColor = UI_TEXT_COLOR,
fontId = UI_FONT_ID,
fontSize = 16,
},
)
}
}
}
}
render_overlay :: proc(world: ^World) {
switch world.phase {
case .Build:
case .Combat:
rl.DrawText("Combat!", 10, 98, 22, rl.MAROON)
case .Game_Over:
rl.DrawText("GAME_OVER", 260, 280, 40, rl.RED)
case .Victory:
rl.DrawText("Victory!", 260, 280, 40, rl.GREEN)
}
}
poll_overlay_command :: proc() -> Command {
if clay.PointerOver(clay.ID("StartWaveBtn")) {
ptr := clay.GetPointerState()
if ptr.state == .PressedThisFrame {
return Command{kind = .Start_Wave}
}
}
return Command{kind = .None}
}
game/render.odin
-1
View File
@@ -5,6 +5,5 @@ render_world :: proc(world: ^World) {
render_enemies(world)
render_towers(world)
render_projectiles(world)
render_overlay(world)
}
game/ui.odin
+1 -1
View File
@@ -33,7 +33,7 @@ ui_prepare_frame :: proc(world: ^World, dt: f32) {
clay.UpdateScrollContainers(false, {}, dt)
clay.BeginLayout()
build_overlay(world)
build_hud(world)
ui_render_commands = clay.EndLayout(dt)
}