jacob/power_play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
jacob 2024-03-06 13:59:34 -06:00
parent 8b8d01e67c
commit a25941d364
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game.c
View File

@ -188,7 +188,7 @@ INTERNAL void game_update(void)
entity_enable_prop(e, ENTITY_PROP_PLAYER_CONTROLLED); entity_enable_prop(e, ENTITY_PROP_PLAYER_CONTROLLED);
e->player_max_speed = 5.f; e->player_max_speed = 5.f;
e->player_acceleration = 20.0f; e->player_acceleration = 15.0f;
player_ent = e; player_ent = e;
@ -357,8 +357,9 @@ break_animation:
struct v2 look_pos = L.tick.player_focus; struct v2 look_pos = L.tick.player_focus;
struct v2 look_dir = v2_sub(ent->rel_trs.t, look_pos); struct v2 look_dir = v2_sub(ent->rel_trs.t, look_pos);
look_dir = v2_norm(look_dir); look_dir = v2_norm(look_dir);
f32 r = math_atan2(look_dir.y, look_dir.x); if (!v2_eq(look_dir, V2(0, 0))) {
ent->rel_trs.r = -r; ent->rel_trs.r = -math_atan2(look_dir.y, look_dir.x);
}
} }
/* ========================== * /* ========================== *

3
src/user.c
View File

@ -443,6 +443,8 @@ INTERNAL void user_update(void)
/* Zoom camera/view */ /* Zoom camera/view */
f32 zoom_rate = 2; f32 zoom_rate = 2;
f32 zoom_min = 1.f / 128.f;
f32 zoom_max = 1.f * 128.f;
f32 new_zoom = L.world_view.zoom; f32 new_zoom = L.world_view.zoom;
for (u32 i = 0; i < zooms_abs; ++i) { for (u32 i = 0; i < zooms_abs; ++i) {
if (dir > 0) { if (dir > 0) {
@ -450,6 +452,7 @@ INTERNAL void user_update(void)
} else { } else {
new_zoom *= 1.0f / zoom_rate; new_zoom *= 1.0f / zoom_rate;
} }
new_zoom = clamp_f32(new_zoom, zoom_min, zoom_max);
} }
struct v2 old_mouse = view_mouse_pos(L.world_view); struct v2 old_mouse = view_mouse_pos(L.world_view);