IgLemp/platformer
1
0
Fork 0
mirror of https://github.com/IgLemp/platformer.git synced 2025-04-03 00:37:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Swapped allocators

Browse Source
This commit is contained in:
IgLemp 2023-06-15 12:13:56 +02:00
parent c5d1b05d8c
commit c003155edd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.zig
View File

@ -14,8 +14,8 @@ pub fn main() anyerror!void
{ {
// MEMORY ALLOCATOR // MEMORY ALLOCATOR
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); var gpAlloc = std.heap.GeneralPurposeAllocator(.{}){};
var arenaAlloc = arena.allocator(); var allocator = gpAlloc.allocator();
// Initialization // Initialization
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@ -39,7 +39,7 @@ pub fn main() anyerror!void
// .{ .box = .{ .x = 100, .y = 0, .width = 20, .height = 200, }, .texture = null } // .{ .box = .{ .x = 100, .y = 0, .width = 20, .height = 200, }, .texture = null }
// }; // };
var objects = std.ArrayList(obj.Object).init(arenaAlloc); var objects = std.ArrayList(obj.Object).init(allocator);
try objects.append(.{ .box = .{ .x = 0, .y = 0, .width = 300, .height = 20, }, .texture = null }); try objects.append(.{ .box = .{ .x = 0, .y = 0, .width = 300, .height = 20, }, .texture = null });
try objects.append(.{ .box = .{ .x = 100, .y = 0, .width = 20, .height = 200, }, .texture = null }); try objects.append(.{ .box = .{ .x = 100, .y = 0, .width = 20, .height = 200, }, .texture = null });
@ -120,7 +120,7 @@ pub fn main() anyerror!void
// tile drawing // tile drawing
for (map.tiles.allocatedSlice()) |tile| { for (map.tiles.items) |tile| {
var dispTile = .{ .x = tile.box.x, .y = tile.box.y - tile.box.height, .width = tile.box.width, .height = tile.box.height }; var dispTile = .{ .x = tile.box.x, .y = tile.box.y - tile.box.height, .width = tile.box.width, .height = tile.box.height };
rl.DrawRectangleRec(dispTile, rl.GRAY); rl.DrawRectangleRec(dispTile, rl.GRAY);

2
src/physics.zig
View File

@ -49,7 +49,7 @@ pub const movement = struct {
pub fn ApplyPlayerCollisions(player: *obj.Player, map: obj.Map) void { pub fn ApplyPlayerCollisions(player: *obj.Player, map: obj.Map) void {
// for every tile // for every tile
for (map.tiles.allocatedSlice()) |tile| { for (map.tiles.items) |tile| {
// check if any collision occured // check if any collision occured
if ( rl.CheckCollisionRecs(player.box, tile.box) ) { if ( rl.CheckCollisionRecs(player.box, tile.box) ) {