From ffd24338b945ea2adf8a3c9ce217407da980b3a0 Mon Sep 17 00:00:00 2001 From: iamcheeseman <[hidden email]> Date: Fri, 6 Feb 2026 22:24:12 -0500 Subject: Fix many a issue --- src/main.odin | 77 +++++++++++++++++++++++++---------------------------------- 1 file changed, 33 insertions(+), 44 deletions(-) (limited to 'src/main.odin') diff --git a/src/main.odin b/src/main.odin index 20ea221..c1b5f13 100644 --- a/src/main.odin +++ b/src/main.odin @@ -30,8 +30,8 @@ SCREEN_SIZE_INT :: Vec2i{SCREEN_WIDTH, SCREEN_HEIGHT} state: struct { debug_mode: bool, camera_target: Vec2, + camera_pos: Vec2, last_fixed_update: f64, - // camera: rl.Camera2D, prop_list: Entity_List(Prop), wiggle_prop_list: Entity_List(Wiggle_Prop), platform_list: Entity_List(Platform), @@ -77,16 +77,14 @@ frame :: proc() { cb(dt) } - // state.camera.target = dt_lerp( - // state.camera.target, - // state.camera_target, - // CAMERA_ACCEL, - // ) + state.camera_pos = dt_lerp( + state.camera_pos, + state.camera_target, + CAMERA_ACCEL, + ) + + fw.set_camera_pos(state.camera_pos) - // cam := state.camera - // cam.target = linalg.round(cam.target) - // rl.BeginMode2D(cam) - fw.draw_rect( {0, 0}, {f32(current_room.width), f32(current_room.height)}, @@ -99,38 +97,31 @@ frame :: proc() { draw_room(current_room.id) - // rl.DrawRectangleGradientH( - // 0, - // 0, - // ROOM_FADE_SIZE, - // current_room.height, - // rl.BLACK, - // rl.BLANK, - // ) - // rl.DrawRectangleGradientH( - // current_room.width - ROOM_FADE_SIZE, - // 0, - // ROOM_FADE_SIZE, - // current_room.height, - // rl.BLANK, - // rl.BLACK, - // ) - // rl.DrawRectangleGradientV( - // 0, - // 0, - // current_room.width, - // ROOM_FADE_SIZE, - // rl.BLACK, - // rl.BLANK, - // ) - // rl.DrawRectangleGradientV( - // 0, - // current_room.height - ROOM_FADE_SIZE, - // current_room.width, - // ROOM_FADE_SIZE, - // rl.BLANK, - // rl.BLACK, - // ) + fw.draw_rect_gradient( + {0, 0}, + {ROOM_FADE_SIZE, f32(current_room.height)}, + tl_color = fw.BLACK, tr_color = fw.TRANSPARENT, + bl_color = fw.BLACK, br_color = fw.TRANSPARENT, + ) + fw.draw_rect_gradient( + {f32(current_room.width) - ROOM_FADE_SIZE, 0}, + {ROOM_FADE_SIZE, f32(current_room.height)}, + tl_color = fw.TRANSPARENT, tr_color = fw.BLACK, + bl_color = fw.TRANSPARENT, br_color = fw.BLACK, + ) + + fw.draw_rect_gradient( + {0, 0}, + {f32(current_room.width), ROOM_FADE_SIZE}, + tl_color = fw.BLACK, tr_color = fw.BLACK, + bl_color = fw.TRANSPARENT, br_color = fw.TRANSPARENT, + ) + fw.draw_rect_gradient( + {0, f32(current_room.height) - ROOM_FADE_SIZE}, + {f32(current_room.width), ROOM_FADE_SIZE}, + tl_color = fw.TRANSPARENT, tr_color = fw.TRANSPARENT, + bl_color = fw.BLACK, br_color = fw.BLACK, + ) if state.debug_mode { // Draw all collisions @@ -144,8 +135,6 @@ frame :: proc() { } } - // rl.EndMode2D() - // // fps_text := fmt.caprintf( // "FPS: %v", // rl.GetFPS(), -- cgit v1.3-2-g0d8e