From 2c4527ae8bc465a2011debd3cf63e11565c42fd3 Mon Sep 17 00:00:00 2001 From: codegirl-007 Date: Sun, 28 Jun 2026 00:46:28 -0700 Subject: [PATCH] move control constants to constants.odin --- game/constants.odin | 23 +++++++++++++++++++++++ game/controls.odin | 21 --------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/game/constants.odin b/game/constants.odin index 484484c..7ec282b 100644 --- a/game/constants.odin +++ b/game/constants.odin @@ -48,3 +48,26 @@ ENEMY_LABEL_COLOR :: rl.Color{255, 200, 200, 255} STARTING_BASE_HEALTH :: 20 STARTING_GOLD :: 100 +//controls constants +BOTTOM_BAR_Y :: SCREEN_H - CONTROL_BAR_H +ARCHER_BUTTON_W :: 120 +START_WAVE_BUTTON_W :: 110 +CONTROLS_BUTTON_GAP :: 12 +CONTROLS_BUTTON_H :: 24 +CONTROLS_BUTTON_Y :: BOTTOM_BAR_Y + 8 +CONTROLS_BUTTON_X :: (SCREEN_W - (ARCHER_BUTTON_W + CONTROLS_BUTTON_GAP + START_WAVE_BUTTON_W)) / 2 + +ARCHER_BUTTON_RECT :: rl.Rectangle { + f32(CONTROLS_BUTTON_X), + f32(CONTROLS_BUTTON_Y), + ARCHER_BUTTON_W, + CONTROLS_BUTTON_H, +} + +START_WAVE_BUTTON_RECT :: rl.Rectangle { + f32(CONTROLS_BUTTON_X + ARCHER_BUTTON_W + CONTROLS_BUTTON_GAP), + f32(CONTROLS_BUTTON_Y), + START_WAVE_BUTTON_W, + CONTROLS_BUTTON_H, +} + diff --git a/game/controls.odin b/game/controls.odin index bcc0876..6f9764a 100644 --- a/game/controls.odin +++ b/game/controls.odin @@ -3,27 +3,6 @@ package game import "core:fmt" import rl "vendor:raylib" -BOTTOM_BAR_Y :: SCREEN_H - CONTROL_BAR_H -ARCHER_BUTTON_W :: 120 -START_WAVE_BUTTON_W :: 110 -CONTROLS_BUTTON_GAP :: 12 -CONTROLS_BUTTON_H :: 24 -CONTROLS_BUTTON_Y :: BOTTOM_BAR_Y + 8 -CONTROLS_BUTTON_X :: (SCREEN_W - (ARCHER_BUTTON_W + CONTROLS_BUTTON_GAP + START_WAVE_BUTTON_W)) / 2 - -ARCHER_BUTTON_RECT :: rl.Rectangle { - f32(CONTROLS_BUTTON_X), - f32(CONTROLS_BUTTON_Y), - ARCHER_BUTTON_W, - CONTROLS_BUTTON_H, -} - -START_WAVE_BUTTON_RECT :: rl.Rectangle { - f32(CONTROLS_BUTTON_X + ARCHER_BUTTON_W + CONTROLS_BUTTON_GAP), - f32(CONTROLS_BUTTON_Y), - START_WAVE_BUTTON_W, - CONTROLS_BUTTON_H, -} poll_controls_command :: proc(world: ^World) -> Command { if world.phase != .Build do return Command{kind = .None}