doylet/feely_pona
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

fp: Update build script for new tely

Browse Source
This commit is contained in:
doyle 2023-12-01 16:46:58 +11:00
parent 4d1fffcc02
commit ee95cefdff
7 changed files with 613 additions and 776 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
External/tely vendored

@ -1 +1 @@
Subproject commit f23fa227c3880beeaf389cf3b14d30e70c6369b5 Subproject commit 17b352f0b86c538f6e197f7e3428b4c4e321f651

140
feely_pona.cpp
View File

@ -127,18 +127,18 @@ static TELY_AssetSpriteSheet FP_LoadSpriteSheetFromSpec(TELY_OS *os, TELY_Assets
static void FP_SetDefaultGamepadBindings(FP_GameControls *controls) static void FP_SetDefaultGamepadBindings(FP_GameControls *controls)
{ {
// NOTE: Note up/down/left/right uses analog sticks, non-negotiable. // NOTE: Note up/down/left/right uses analog sticks, non-negotiable.
controls->attack.gamepad_key = TELY_OSInputGamepadKey_X; controls->attack.gamepad_key = TELY_InputGamepadKey_X;
controls->range_attack.gamepad_key = TELY_OSInputGamepadKey_Y; controls->range_attack.gamepad_key = TELY_InputGamepadKey_Y;
controls->build_mode.gamepad_key = TELY_OSInputGamepadKey_L3; controls->build_mode.gamepad_key = TELY_InputGamepadKey_L3;
controls->strafe.gamepad_key = TELY_OSInputGamepadKey_B; controls->strafe.gamepad_key = TELY_InputGamepadKey_B;
controls->dash.gamepad_key = TELY_OSInputGamepadKey_A; controls->dash.gamepad_key = TELY_InputGamepadKey_A;
controls->buy_building.gamepad_key = TELY_OSInputGamepadKey_LeftBumper; controls->buy_building.gamepad_key = TELY_InputGamepadKey_LeftBumper;
controls->buy_upgrade.gamepad_key = TELY_OSInputGamepadKey_RightBumper; controls->buy_upgrade.gamepad_key = TELY_InputGamepadKey_RightBumper;
controls->move_building_ui_cursor_left.gamepad_key = TELY_OSInputGamepadKey_DLeft; controls->move_building_ui_cursor_left.gamepad_key = TELY_InputGamepadKey_DLeft;
controls->move_building_ui_cursor_right.gamepad_key = TELY_OSInputGamepadKey_DRight; controls->move_building_ui_cursor_right.gamepad_key = TELY_InputGamepadKey_DRight;
} }
static FP_ListenForNewPlayerResult FP_ListenForNewPlayer(TELY_OSInput *input, FP_Game *game, bool tutorial_is_allowed) static FP_ListenForNewPlayerResult FP_ListenForNewPlayer(TELY_Input *input, FP_Game *game, bool tutorial_is_allowed)
{ {
FP_ListenForNewPlayerResult result = {}; FP_ListenForNewPlayerResult result = {};
if (game->play.players.size == 2) if (game->play.players.size == 2)
@ -159,16 +159,16 @@ static FP_ListenForNewPlayerResult FP_ListenForNewPlayer(TELY_OSInput *input, FP
} }
} }
bool keyboard_pressed = !keyboard_already_allocated && TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_B); bool keyboard_pressed = !keyboard_already_allocated && TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_B);
bool gamepad_pressed = TELY_OSInput_GamepadKeyIsPressed(input, gamepad_index, TELY_OSInputGamepadKey_Start); bool gamepad_pressed = TELY_Input_GamepadKeyIsPressed(input, gamepad_index, TELY_InputGamepadKey_Start);
if (tutorial_is_allowed) { if (tutorial_is_allowed) {
if (!keyboard_already_allocated && TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_T)) { if (!keyboard_already_allocated && TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_T)) {
keyboard_pressed = true; keyboard_pressed = true;
result.tutorial_requested = true; result.tutorial_requested = true;
} }
if (TELY_OSInput_GamepadKeyIsPressed(input, gamepad_index, TELY_OSInputGamepadKey_Select)) { if (TELY_Input_GamepadKeyIsPressed(input, gamepad_index, TELY_InputGamepadKey_Select)) {
gamepad_pressed = true; gamepad_pressed = true;
result.tutorial_requested = true; result.tutorial_requested = true;
} }
@ -190,19 +190,19 @@ static FP_ListenForNewPlayerResult FP_ListenForNewPlayer(TELY_OSInput *input, FP
FP_GameControls *controls = &terry->controls; FP_GameControls *controls = &terry->controls;
if (keyboard_pressed) { if (keyboard_pressed) {
controls->mode = FP_GameControlMode_Keyboard; controls->mode = FP_GameControlMode_Keyboard;
controls->up.scan_key = TELY_OSInputScanKey_W; controls->up.scan_key = TELY_InputScanKey_W;
controls->down.scan_key = TELY_OSInputScanKey_S; controls->down.scan_key = TELY_InputScanKey_S;
controls->left.scan_key = TELY_OSInputScanKey_A; controls->left.scan_key = TELY_InputScanKey_A;
controls->right.scan_key = TELY_OSInputScanKey_D; controls->right.scan_key = TELY_InputScanKey_D;
controls->attack.scan_key = TELY_OSInputScanKey_J; controls->attack.scan_key = TELY_InputScanKey_J;
controls->range_attack.scan_key = TELY_OSInputScanKey_K; controls->range_attack.scan_key = TELY_InputScanKey_K;
controls->build_mode.scan_key = TELY_OSInputScanKey_H; controls->build_mode.scan_key = TELY_InputScanKey_H;
controls->strafe.scan_key = TELY_OSInputScanKey_L; controls->strafe.scan_key = TELY_InputScanKey_L;
controls->dash.scan_key = TELY_OSInputScanKey_N; controls->dash.scan_key = TELY_InputScanKey_N;
controls->buy_building.scan_key = TELY_OSInputScanKey_U; controls->buy_building.scan_key = TELY_InputScanKey_U;
controls->buy_upgrade.scan_key = TELY_OSInputScanKey_I; controls->buy_upgrade.scan_key = TELY_InputScanKey_I;
controls->move_building_ui_cursor_left.scan_key = TELY_OSInputScanKey_Q; controls->move_building_ui_cursor_left.scan_key = TELY_InputScanKey_Q;
controls->move_building_ui_cursor_right.scan_key = TELY_OSInputScanKey_E; controls->move_building_ui_cursor_right.scan_key = TELY_InputScanKey_E;
} else { } else {
controls->mode = FP_GameControlMode_Gamepad; controls->mode = FP_GameControlMode_Gamepad;
controls->gamepad_index = gamepad_index; controls->gamepad_index = gamepad_index;
@ -524,7 +524,7 @@ static void FP_AppendMobSpawnerWaypoints(FP_Game *game, FP_GameEntityHandle src_
} }
} }
static void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_OSInput *input, FP_GameEntity *entity, Dqn_V2 *acceleration_meters_per_s) static void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_Input *input, FP_GameEntity *entity, Dqn_V2 *acceleration_meters_per_s)
{ {
TELY_AssetSpriteSheet *sheet = &game->atlas_sprite_sheet; TELY_AssetSpriteSheet *sheet = &game->atlas_sprite_sheet;
FP_GameEntityAction *action = &entity->action; FP_GameEntityAction *action = &entity->action;
@ -1300,7 +1300,7 @@ static void FP_EntityActionStateMachine(FP_Game *game, TELY_Audio *audio, TELY_O
} }
} }
static void FP_Update(TELY_OS *os, FP_Game *game, TELY_OSInput *input, TELY_Audio *audio) static void FP_Update(TELY_OS *os, FP_Game *game, TELY_Input *input, TELY_Audio *audio)
{ {
Dqn_Profiler_ZoneScopeWithIndex("FP_Update", FP_ProfileZone_FPUpdate); Dqn_Profiler_ZoneScopeWithIndex("FP_Update", FP_ProfileZone_FPUpdate);
if (game->play.state == FP_GameState_Pause) if (game->play.state == FP_GameState_Pause)
@ -1314,16 +1314,16 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_OSInput *input, TELY_Audi
DQN_MSVC_WARNING_PUSH DQN_MSVC_WARNING_PUSH
DQN_MSVC_WARNING_DISABLE(4127) // Conditional expression is constant 'FP_DEVELOPER_MODE' DQN_MSVC_WARNING_DISABLE(4127) // Conditional expression is constant 'FP_DEVELOPER_MODE'
if (FP_DEVELOPER_MODE && TELY_OSInput_KeyIsReleased(input->mouse_left)) if (FP_DEVELOPER_MODE && TELY_Input_KeyIsReleased(input->mouse_keys[TELY_InputMouseKey_Left]))
game->play.clicked_entity = game->play.prev_active_entity; game->play.clicked_entity = game->play.prev_active_entity;
if (TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_Escape)) { if (TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_Escape)) {
game->play.state = FP_GameState_Pause; game->play.state = FP_GameState_Pause;
return; return;
} }
if (FP_DEVELOPER_MODE && game->play.clicked_entity.id) { if (FP_DEVELOPER_MODE && game->play.clicked_entity.id) {
if (TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_Delete)) if (TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_Delete))
FP_Game_DeleteEntity(game, game->play.clicked_entity); FP_Game_DeleteEntity(game, game->play.clicked_entity);
} }
DQN_MSVC_WARNING_POP DQN_MSVC_WARNING_POP
@ -1351,7 +1351,7 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_OSInput *input, TELY_Audi
// NOTE: Gamepad movement input // NOTE: Gamepad movement input
if (controls->mode == FP_GameControlMode_Gamepad) { if (controls->mode == FP_GameControlMode_Gamepad) {
TELY_OSInputGamepad *gamepad = input->gamepads + controls->gamepad_index; TELY_InputGamepad *gamepad = input->gamepads + controls->gamepad_index;
dir_vector += gamepad->left_stick; dir_vector += gamepad->left_stick;
} }
@ -2438,27 +2438,27 @@ static void FP_Update(TELY_OS *os, FP_Game *game, TELY_OSInput *input, TELY_Audi
Dqn_Profiler_EndZone(update_zone); Dqn_Profiler_EndZone(update_zone);
} }
static Dqn_Str8 FP_ScanKeyToLabel(Dqn_Arena *arena, TELY_OSInputScanKey scan_key) static Dqn_Str8 FP_ScanKeyToLabel(Dqn_Arena *arena, TELY_InputScanKey scan_key)
{ {
Dqn_Str8 result = {}; Dqn_Str8 result = {};
Dqn_Allocator allocator = Dqn_Arena_Allocator(arena); Dqn_Allocator allocator = Dqn_Arena_Allocator(arena);
if (scan_key >= TELY_OSInputScanKey_A && scan_key <= TELY_OSInputScanKey_Z) { if (scan_key >= TELY_InputScanKey_A && scan_key <= TELY_InputScanKey_Z) {
char scan_key_ch = DQN_CAST(char)('A' + (scan_key - TELY_OSInputScanKey_A)); char scan_key_ch = DQN_CAST(char)('A' + (scan_key - TELY_InputScanKey_A));
result = Dqn_Str8_InitF(allocator, "[%c]", scan_key_ch); result = Dqn_Str8_InitF(allocator, "[%c]", scan_key_ch);
} else { } else {
if (scan_key == TELY_OSInputScanKey_Up) { if (scan_key == TELY_InputScanKey_Up) {
result = Dqn_Str8_InitF(allocator, "[Up]"); result = Dqn_Str8_InitF(allocator, "[Up]");
} else if (scan_key == TELY_OSInputScanKey_Down) { } else if (scan_key == TELY_InputScanKey_Down) {
result = Dqn_Str8_InitF(allocator, "[Down]"); result = Dqn_Str8_InitF(allocator, "[Down]");
} else if (scan_key == TELY_OSInputScanKey_Left) { } else if (scan_key == TELY_InputScanKey_Left) {
result = Dqn_Str8_InitF(allocator, "[Left]"); result = Dqn_Str8_InitF(allocator, "[Left]");
} else if (scan_key == TELY_OSInputScanKey_Right) { } else if (scan_key == TELY_InputScanKey_Right) {
result = Dqn_Str8_InitF(allocator, "[Right]"); result = Dqn_Str8_InitF(allocator, "[Right]");
} else if (scan_key == TELY_OSInputScanKey_Semicolon) { } else if (scan_key == TELY_InputScanKey_Semicolon) {
result = Dqn_Str8_InitF(allocator, "[;]"); result = Dqn_Str8_InitF(allocator, "[;]");
} else if (scan_key == TELY_OSInputScanKey_Apostrophe) { } else if (scan_key == TELY_InputScanKey_Apostrophe) {
result = Dqn_Str8_InitF(allocator, "[']"); result = Dqn_Str8_InitF(allocator, "[']");
} else if (scan_key == TELY_OSInputScanKey_Backslash) { } else if (scan_key == TELY_InputScanKey_Backslash) {
result = Dqn_Str8_InitF(allocator, "[/]"); result = Dqn_Str8_InitF(allocator, "[/]");
} }
} }
@ -2481,13 +2481,13 @@ static void FP_DrawBillboardKeyBindHint(TELY_Renderer *renderer,
if (mode == FP_GameControlMode_Gamepad) { if (mode == FP_GameControlMode_Gamepad) {
Dqn_Str8 tex_name = {}; Dqn_Str8 tex_name = {};
if (key_bind.gamepad_key == TELY_OSInputGamepadKey_A) if (key_bind.gamepad_key == TELY_InputGamepadKey_A)
tex_name = g_anim_names.merchant_button_a; tex_name = g_anim_names.merchant_button_a;
else if (key_bind.gamepad_key == TELY_OSInputGamepadKey_B) else if (key_bind.gamepad_key == TELY_InputGamepadKey_B)
tex_name = g_anim_names.merchant_button_b; tex_name = g_anim_names.merchant_button_b;
else if (key_bind.gamepad_key == TELY_OSInputGamepadKey_X) else if (key_bind.gamepad_key == TELY_InputGamepadKey_X)
tex_name = g_anim_names.merchant_button_x; tex_name = g_anim_names.merchant_button_x;
else if (key_bind.gamepad_key == TELY_OSInputGamepadKey_Y) else if (key_bind.gamepad_key == TELY_InputGamepadKey_Y)
tex_name = g_anim_names.merchant_button_y; tex_name = g_anim_names.merchant_button_y;
if (tex_name.size) { if (tex_name.size) {
@ -2518,7 +2518,7 @@ static void FP_DrawBillboardKeyBindHint(TELY_Renderer *renderer,
static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_Audio *audio) static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_Audio *audio)
{ {
Dqn_Profiler_ZoneScopeWithIndex("FP_Render", FP_ProfileZone_FPRender); Dqn_Profiler_ZoneScopeWithIndex("FP_Render", FP_ProfileZone_FPRender);
TELY_OSInput *input = &os->input; TELY_Input *input = &os->input;
TELY_RFui *rfui = &game->rfui; TELY_RFui *rfui = &game->rfui;
TELY_Assets *assets = &os->assets; TELY_Assets *assets = &os->assets;
@ -3320,13 +3320,13 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
bool trigger_buy_anim = false; bool trigger_buy_anim = false;
if (have_enough_coins) { if (have_enough_coins) {
if (TELY_OSInput_ScanKeyIsPressed(input, key_bind.scan_key)) { if (TELY_Input_ScanKeyIsPressed(input, key_bind.scan_key)) {
game->play.player_trigger_purchase_building_timestamp = game->play.clock_ms + buy_duration_ms; game->play.player_trigger_purchase_building_timestamp = game->play.clock_ms + buy_duration_ms;
} else if (TELY_OSInput_ScanKeyIsDown(input, key_bind.scan_key)) { } else if (TELY_Input_ScanKeyIsDown(input, key_bind.scan_key)) {
trigger_buy_anim = true; trigger_buy_anim = true;
if (game->play.clock_ms > game->play.player_trigger_purchase_building_timestamp) if (game->play.clock_ms > game->play.player_trigger_purchase_building_timestamp)
game->play.player_trigger_purchase_building_timestamp = game->play.clock_ms; game->play.player_trigger_purchase_building_timestamp = game->play.clock_ms;
} else if (TELY_OSInput_ScanKeyIsReleased(input, key_bind.scan_key)) { } else if (TELY_Input_ScanKeyIsReleased(input, key_bind.scan_key)) {
if (game->play.clock_ms > game->play.player_trigger_purchase_building_timestamp) { if (game->play.clock_ms > game->play.player_trigger_purchase_building_timestamp) {
if (mapping.inventory_count) { if (mapping.inventory_count) {
player->coins -= *mapping.building_base_price; player->coins -= *mapping.building_base_price;
@ -3452,13 +3452,13 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
bool trigger_buy_anim = false; bool trigger_buy_anim = false;
if (have_enough_coins) { if (have_enough_coins) {
if (TELY_OSInput_ScanKeyIsPressed(input, key_bind.scan_key)) { if (TELY_Input_ScanKeyIsPressed(input, key_bind.scan_key)) {
game->play.player_trigger_purchase_upgrade_timestamp = game->play.clock_ms + buy_duration_ms; game->play.player_trigger_purchase_upgrade_timestamp = game->play.clock_ms + buy_duration_ms;
} else if (TELY_OSInput_ScanKeyIsDown(input, key_bind.scan_key)) { } else if (TELY_Input_ScanKeyIsDown(input, key_bind.scan_key)) {
trigger_buy_anim = true; trigger_buy_anim = true;
if (game->play.clock_ms > game->play.player_trigger_purchase_upgrade_timestamp) if (game->play.clock_ms > game->play.player_trigger_purchase_upgrade_timestamp)
game->play.player_trigger_purchase_upgrade_timestamp = game->play.clock_ms; game->play.player_trigger_purchase_upgrade_timestamp = game->play.clock_ms;
} else if (TELY_OSInput_ScanKeyIsReleased(input, key_bind.scan_key)) { } else if (TELY_Input_ScanKeyIsReleased(input, key_bind.scan_key)) {
if (game->play.clock_ms > game->play.player_trigger_purchase_upgrade_timestamp) { if (game->play.clock_ms > game->play.player_trigger_purchase_upgrade_timestamp) {
player->coins -= *mapping.upgrade_base_price; player->coins -= *mapping.upgrade_base_price;
*mapping.upgrade_base_price *= 1; *mapping.upgrade_base_price *= 1;
@ -3996,7 +3996,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
TELY_Render_PopFont(renderer); TELY_Render_PopFont(renderer);
TELY_Render_PopColourV4(renderer); TELY_Render_PopColourV4(renderer);
if (TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_Return)) if (TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_Return))
game->play.state = FP_GameState_Play; game->play.state = FP_GameState_Play;
} }
@ -4160,7 +4160,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
TELY_Render_PopFont(renderer); TELY_Render_PopFont(renderer);
TELY_Render_PopColourV4(renderer); TELY_Render_PopColourV4(renderer);
if (TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_Return)) if (TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_Return))
FP_PlayReset(game, os); FP_PlayReset(game, os);
} }
@ -4208,7 +4208,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
// NOTE: Debug UI ============================================================================== // NOTE: Debug UI ==============================================================================
if (TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F1)) if (TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F1))
game->play.debug_ui = !game->play.debug_ui; game->play.debug_ui = !game->play.debug_ui;
DQN_MSVC_WARNING_PUSH DQN_MSVC_WARNING_PUSH
@ -4289,23 +4289,23 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
if (TELY_RFui_ButtonF(rfui, "F1 Debug info").clicked) if (TELY_RFui_ButtonF(rfui, "F1 Debug info").clicked)
game->play.debug_ui = !game->play.debug_ui; game->play.debug_ui = !game->play.debug_ui;
if (TELY_RFui_ButtonF(rfui, "F2 Add coins x10,000").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F2)) { if (TELY_RFui_ButtonF(rfui, "F2 Add coins x10,000").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F2)) {
for (FP_GameEntityHandle player_handle : game->play.players) { for (FP_GameEntityHandle player_handle : game->play.players) {
FP_GameEntity *player = FP_Game_GetEntity(game, player_handle); FP_GameEntity *player = FP_Game_GetEntity(game, player_handle);
player->coins += 10'000; player->coins += 10'000;
} }
} }
if (TELY_RFui_ButtonF(rfui, "F3 Win game").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F3)) if (TELY_RFui_ButtonF(rfui, "F3 Win game").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F3))
game->play.state = FP_GameState_WinGame; game->play.state = FP_GameState_WinGame;
if (TELY_RFui_ButtonF(rfui, "F4 Lose game").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F4)) if (TELY_RFui_ButtonF(rfui, "F4 Lose game").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F4))
game->play.state = FP_GameState_LoseGame; game->play.state = FP_GameState_LoseGame;
if (TELY_RFui_ButtonF(rfui, "F5 Reset game").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F5)) if (TELY_RFui_ButtonF(rfui, "F5 Reset game").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F5))
FP_PlayReset(game, os); FP_PlayReset(game, os);
if (TELY_RFui_ButtonF(rfui, "F6 Increase health").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F6)) { if (TELY_RFui_ButtonF(rfui, "F6 Increase health").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F6)) {
for (FP_GameEntityHandle player_handle : game->play.players) { for (FP_GameEntityHandle player_handle : game->play.players) {
FP_GameEntity *player = FP_Game_GetEntity(game, player_handle); FP_GameEntity *player = FP_Game_GetEntity(game, player_handle);
player->hp_cap += FP_DEFAULT_DAMAGE; player->hp_cap += FP_DEFAULT_DAMAGE;
@ -4313,7 +4313,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
} }
} }
if (TELY_RFui_ButtonF(rfui, "F7 Increase stamina").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F7)) { if (TELY_RFui_ButtonF(rfui, "F7 Increase stamina").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F7)) {
for (FP_GameEntityHandle player_handle : game->play.players) { for (FP_GameEntityHandle player_handle : game->play.players) {
FP_GameEntity *player = FP_Game_GetEntity(game, player_handle); FP_GameEntity *player = FP_Game_GetEntity(game, player_handle);
player->stamina_cap += DQN_CAST(uint16_t)(FP_TERRY_DASH_STAMINA_COST * .5f); player->stamina_cap += DQN_CAST(uint16_t)(FP_TERRY_DASH_STAMINA_COST * .5f);
@ -4321,7 +4321,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
} }
} }
if (TELY_RFui_ButtonF(rfui, "F8 Increase mobile data").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F8)) { if (TELY_RFui_ButtonF(rfui, "F8 Increase mobile data").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F8)) {
for (FP_GameEntityHandle player_handle : game->play.players) { for (FP_GameEntityHandle player_handle : game->play.players) {
FP_GameEntity *player = FP_Game_GetEntity(game, player_handle); FP_GameEntity *player = FP_Game_GetEntity(game, player_handle);
player->terry_mobile_data_plan_cap += DQN_KILOBYTES(1); player->terry_mobile_data_plan_cap += DQN_KILOBYTES(1);
@ -4329,10 +4329,10 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
} }
} }
if (TELY_RFui_ButtonF(rfui, "F9 %s god mode", game->play.god_mode ? "Disable" : "Enable").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F9)) if (TELY_RFui_ButtonF(rfui, "F9 %s god mode", game->play.god_mode ? "Disable" : "Enable").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F9))
game->play.god_mode = !game->play.god_mode; game->play.god_mode = !game->play.god_mode;
if (TELY_RFui_ButtonF(rfui, "F11 Building inventory +1").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_F11)) { if (TELY_RFui_ButtonF(rfui, "F11 Building inventory +1").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_F11)) {
for (FP_GameEntityHandle player_handle : game->play.players) { for (FP_GameEntityHandle player_handle : game->play.players) {
FP_GameEntity *player = FP_Game_GetEntity(game, player_handle); FP_GameEntity *player = FP_Game_GetEntity(game, player_handle);
player->inventory.clubs += 1; player->inventory.clubs += 1;
@ -4342,7 +4342,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
} }
} }
if (TELY_RFui_ButtonF(rfui, "1 %s HUD", game->play.debug_hide_hud ? "Show" : "Hide").clicked || TELY_OSInput_ScanKeyIsPressed(input, TELY_OSInputScanKey_1)) if (TELY_RFui_ButtonF(rfui, "1 %s HUD", game->play.debug_hide_hud ? "Show" : "Hide").clicked || TELY_Input_ScanKeyIsPressed(input, TELY_InputScanKey_1))
game->play.debug_hide_hud = !game->play.debug_hide_hud; game->play.debug_hide_hud = !game->play.debug_hide_hud;
if (TELY_RFui_ButtonF(rfui, "%s bounding rects", game->play.debug_hide_bounding_rectangles ? "Show" : "Hide").clicked) if (TELY_RFui_ButtonF(rfui, "%s bounding rects", game->play.debug_hide_bounding_rectangles ? "Show" : "Hide").clicked)
@ -4449,7 +4449,7 @@ static void FP_Render(FP_Game *game, TELY_OS *os, TELY_Renderer *renderer, TELY_
TELY_OS_DLL_FUNCTION TELY_OS_DLL_FUNCTION
void TELY_OS_DLLFrameUpdate(TELY_OS *os) void TELY_OS_DLLFrameUpdate(TELY_OS *os)
{ {
TELY_OSInput *input = &os->input; TELY_Input *input = &os->input;
TELY_Renderer *renderer = &os->renderer; TELY_Renderer *renderer = &os->renderer;
FP_Game *game = DQN_CAST(FP_Game *) os->user_data; FP_Game *game = DQN_CAST(FP_Game *) os->user_data;
@ -4466,7 +4466,7 @@ void TELY_OS_DLLFrameUpdate(TELY_OS *os)
// ============================================================================================= // =============================================================================================
if (game->play.state == FP_GameState_Play || game->play.state == FP_GameState_Tutorial) { if (game->play.state == FP_GameState_Play || game->play.state == FP_GameState_Tutorial) {
if (TELY_OSInput_KeyWasDown(input->mouse_left) && TELY_OSInput_KeyIsDown(input->mouse_left)) { if (TELY_Input_KeyWasDown(input->mouse_keys[TELY_InputMouseKey_Left]) && TELY_Input_KeyIsDown(input->mouse_keys[TELY_InputMouseKey_Left])) {
if (game->play.prev_active_entity.id) if (game->play.prev_active_entity.id)
game->play.active_entity = game->play.prev_active_entity; game->play.active_entity = game->play.prev_active_entity;
} else { } else {
@ -4486,7 +4486,7 @@ void TELY_OS_DLLFrameUpdate(TELY_OS *os)
continue; continue;
game->play.hot_entity = entity->handle; game->play.hot_entity = entity->handle;
if (TELY_OSInput_KeyIsPressed(input->mouse_left)) { if (TELY_Input_KeyIsPressed(input->mouse_keys[TELY_InputMouseKey_Left])) {
game->play.active_entity = entity->handle; game->play.active_entity = entity->handle;
game->play.clicked_entity = entity->handle; game->play.clicked_entity = entity->handle;
} }

1227
feely_pona_build.cpp
View File

File diff suppressed because it is too large Load Diff

12
feely_pona_game.cpp
View File

@ -3,24 +3,24 @@
#include "feely_pona_unity.h" #include "feely_pona_unity.h"
#endif #endif
static bool FP_Game_KeyBindIsPressed(TELY_OSInput const *input, FP_GameControls const *controls, FP_GameKeyBind key_bind) static bool FP_Game_KeyBindIsPressed(TELY_Input const *input, FP_GameControls const *controls, FP_GameKeyBind key_bind)
{ {
bool result = false; bool result = false;
if (controls->mode == FP_GameControlMode_Keyboard) { if (controls->mode == FP_GameControlMode_Keyboard) {
result = TELY_OSInput_ScanKeyIsPressed(input, key_bind.scan_key); result = TELY_Input_ScanKeyIsPressed(input, key_bind.scan_key);
} else { } else {
result = TELY_OSInput_GamepadKeyIsPressed(input, controls->gamepad_index, key_bind.gamepad_key); result = TELY_Input_GamepadKeyIsPressed(input, controls->gamepad_index, key_bind.gamepad_key);
} }
return result; return result;
} }
static bool FP_Game_KeyBindIsDown(TELY_OSInput const *input, FP_GameControls const *controls, FP_GameKeyBind key_bind) static bool FP_Game_KeyBindIsDown(TELY_Input const *input, FP_GameControls const *controls, FP_GameKeyBind key_bind)
{ {
bool result = false; bool result = false;
if (controls->mode == FP_GameControlMode_Keyboard) { if (controls->mode == FP_GameControlMode_Keyboard) {
result = TELY_OSInput_ScanKeyIsDown(input, key_bind.scan_key); result = TELY_Input_ScanKeyIsDown(input, key_bind.scan_key);
} else { } else {
result = TELY_OSInput_GamepadKeyIsDown(input, controls->gamepad_index, key_bind.gamepad_key); result = TELY_Input_GamepadKeyIsDown(input, controls->gamepad_index, key_bind.gamepad_key);
} }
return result; return result;
} }

4
feely_pona_game.h
View File

@ -168,8 +168,8 @@ enum FP_GameInGameMenu
struct FP_GameKeyBind struct FP_GameKeyBind
{ {
TELY_OSInputScanKey scan_key; TELY_InputScanKey scan_key;
TELY_OSInputGamepadKey gamepad_key; TELY_InputGamepadKey gamepad_key;
}; };
enum FP_GameControlMode enum FP_GameControlMode

2
feely_pona_sprite_packer.cpp
View File

@ -8,6 +8,8 @@
#define DQN_ONLY_DSMAP #define DQN_ONLY_DSMAP
#define DQN_ONLY_LIST #define DQN_ONLY_LIST
#define DQN_ONLY_FS #define DQN_ONLY_FS
#define DQN_ONLY_SEMAPHORE
#define DQN_ONLY_THREAD
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#define DQN_IMPLEMENTATION #define DQN_IMPLEMENTATION
#include "External/tely/External/dqn/dqn.h" #include "External/tely/External/dqn/dqn.h"

2
feely_pona_unity.h
View File

@ -2,7 +2,7 @@
// Unity build header to compile the entire application as a single translation unit // Unity build header to compile the entire application as a single translation unit
#define TELY_PLATFORM_DLL_FILE_NAME "terry_cherry_dev_dll" #define TELY_PLATFORM_DLL_FILE_NAME "terry_cherry_dev_dll"
#include "External/tely/tely_os_raylib_unity.h" #include "External/tely/tely_backend_raylib_unity.h"
// NOTE: feely_pona ================================================================================ // NOTE: feely_pona ================================================================================
#if defined(_CLANGD) || defined(FEELY_PONA_IMPLEMENTATION) #if defined(_CLANGD) || defined(FEELY_PONA_IMPLEMENTATION)