From 58f1dbad740d4d2ca807cecf9b3de77ff11f05dd Mon Sep 17 00:00:00 2001 From: IgLemp Date: Fri, 24 Mar 2023 22:09:18 +0100 Subject: [PATCH] Changed function names to CamelCase --- src/main.zig | 7 +++---- src/physics.zig | 6 +++--- src/types.zig | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main.zig b/src/main.zig index a43f15b..2695c88 100644 --- a/src/main.zig +++ b/src/main.zig @@ -39,7 +39,6 @@ pub fn main() anyerror!void var player: obj.Player = .{ .box = .{ .x = 20, .y = 300, .width = 20, .height = 20 }, - .detection_box = .{ .width = 21, .height = 21 }, .velocity = .{ .x = 0, .y = 0 }, }; @@ -67,14 +66,14 @@ pub fn main() anyerror!void if (fly) { if (rl.IsKeyDown(rl.KeyboardKey.KEY_UP)) { player.velocity.y += 1.5; } if (rl.IsKeyDown(rl.KeyboardKey.KEY_DOWN)) { player.velocity.y -= 1.5; } - phs.movement.free_fly(&player); + phs.movement.FreeFly(&player); } else { if (rl.IsKeyPressed(rl.KeyboardKey.KEY_UP)) { player.velocity.y = 15; } // jump - phs.apply_forces(&player); + phs.ApplyForces(&player); } // run collisions - phs.apply_player_collisions(&player, map); + phs.ApplyPlayerCollisions(&player, map); // camera setup camera.target = rl.Vector2 { .x = player.box.x + player.box.width / 2, .y = player.box.y + player.box.height / 2 }; diff --git a/src/physics.zig b/src/physics.zig index c727d7c..1c80183 100644 --- a/src/physics.zig +++ b/src/physics.zig @@ -8,7 +8,7 @@ const FRICTION: f32 = 10; -pub fn apply_forces(player: *obj.Player) void { +pub fn ApplyForces(player: *obj.Player) void { // apply gravity player.velocity.y += GRAVITY * rl.GetFrameTime(); player.box.y -= player.velocity.y; @@ -25,7 +25,7 @@ pub fn apply_forces(player: *obj.Player) void { } pub const movement = struct { - pub fn free_fly(player: *obj.Player) void { + pub fn FreeFly(player: *obj.Player) void { // apply friction for X if (player.velocity.x > 0) { player.velocity.x -= FRICTION * rl.GetFrameTime(); } if (player.velocity.x < 0) { player.velocity.x += FRICTION * rl.GetFrameTime(); } @@ -46,7 +46,7 @@ pub fn apply_forces(player: *obj.Player) void { -pub fn apply_player_collisions(player: *obj.Player, map: obj.Map) void { +pub fn ApplyPlayerCollisions(player: *obj.Player, map: obj.Map) void { // for every tile for (map.tiles) |tile| { diff --git a/src/types.zig b/src/types.zig index 7385afd..df461ce 100644 --- a/src/types.zig +++ b/src/types.zig @@ -7,15 +7,15 @@ pub const Object = struct { pub const Player = struct { box: rl.Rectangle, - detection_box: NullOriginBox, + // detection_box: NullOriginBox, velocity: rl.Vector2, // max_velocity: f32, }; -const NullOriginBox = struct { - height: f32, - width: f32 -}; +// const NullOriginBox = struct { +// height: f32, +// width: f32 +// }; pub const Map = struct { tiles: []Object,