From 03bf16cba41c006dca36de91c3630f487014f9e8 Mon Sep 17 00:00:00 2001 From: Louis Pearson Date: Sat, 6 Aug 2022 01:18:55 -0600 Subject: [PATCH] Remove debug statements --- src/game.zig | 22 +--------------------- src/main.zig | 1 + tools/LDtkImport.zig | 37 ------------------------------------- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/src/game.zig b/src/game.zig index bba2b55..320c733 100644 --- a/src/game.zig +++ b/src/game.zig @@ -217,34 +217,17 @@ pub fn start() !void { .pos = 0, .buffer = world_data, }; - w4.tracef("[world]: size=%d", world_data.len); const world_reader = stream.reader(); var levels = try world.read(alloc, world_reader); var level_data_offset = try stream.getPos(); - w4.tracef("header_size=%d", level_data_offset); - try stream.seekTo(level_data_offset + levels[1].offset); - w4.tracef("seek_to=%d", try stream.getPos()); - - for (levels) |lvl, i| { - w4.tracef("[%d]: offset=%d, x=%d, y=%d", i, lvl.offset, @intCast(isize, lvl.x), @intCast(isize, lvl.y)); - } + try stream.seekTo(level_data_offset + levels[0].offset); level = try world.Level.read(world_reader); - w4.tracef("level_read_end=%d", try stream.getPos()); - // w4.tracef( - // "[level 0]: x=%d, y=%d, width=%d, size=%d, entity_count=%d, seek_head=%d", - // level.world_x, - // level.world_y, - // level.width, - // level.size, - // level.entity_count, - // ); level_buf = try alloc.alloc(world.TileData, level.size); try level.readTiles(world_reader, level_buf); - w4.tracef("level_read_end=%d", try stream.getPos()); try extract.extractLevel(.{ .alloc = frame_alloc, @@ -258,11 +241,8 @@ pub fn start() !void { .switch_on = world.Tiles.SwitchesOn, }); - w4.tracef("entity_count=%d", level.entity_count); - w4.tracef("entity_size=%d", level.entity_count * world.Entity.calculateSize()); var entity_buf = try alloc.alloc(world.Entity, level.entity_count); try level.readEntities(world_reader, entity_buf); - w4.tracef("entity_read_end=%d", try stream.getPos()); const spawnArr = level.getSpawn() orelse return error.NoPlayerSpawn; const spawn = Vec2{ spawnArr[0], spawnArr[1] }; diff --git a/src/main.zig b/src/main.zig index f66e40d..ed183de 100644 --- a/src/main.zig +++ b/src/main.zig @@ -44,6 +44,7 @@ export fn update() void { error.EndOfStream => showErr(@errorName(e)), error.OutOfMemory => showErr(@errorName(e)), error.NullTiles => showErr(@errorName(e)), + error.NoPlayerSpawn => showErr(@errorName(e)), }, } } diff --git a/tools/LDtkImport.zig b/tools/LDtkImport.zig index 286a4c3..7611672 100644 --- a/tools/LDtkImport.zig +++ b/tools/LDtkImport.zig @@ -95,7 +95,6 @@ fn make(step: *std.build.Step) !void { .y = level.world_y, .offset = offset, }); - std.log.warn("[{}] x={} y={}; {} + {} = {}", .{ i, level.world_x, level.world_y, last_offset, last_size, offset }); } // Create array to write data to @@ -107,45 +106,9 @@ fn make(step: *std.build.Step) !void { // Write levels for (levels.items) |level| { - std.log.warn("{} + {} + {} + {} + {} + {} + {}", .{ - @sizeOf(i8), - @sizeOf(i8), - @sizeOf(u16), - @sizeOf(u16), - @sizeOf(u16), - level.tiles.?.len, - level.entities.?.len * world.Entity.calculateSize(), - }); - - std.log.warn("x={} y={} w={} s={} ec={} t={} e={}", .{ - level.world_x, - level.world_y, - level.width, - level.size, - level.entity_count, - level.tiles.?.len, - level.entities.?.len, - }); try level.write(writer); } - { - var stream = std.io.FixedBufferStream([]const u8){ - .pos = 0, - .buffer = data.items, - }; - const world_reader = stream.reader(); - var lvls = try world.read(allocator, world_reader); - var level_data_offset = try stream.getPos(); - std.log.warn("level_data_offset {}", .{level_data_offset}); - - try stream.seekTo(level_data_offset + lvls[1].offset); - std.log.warn("seek to 1 {}", .{try stream.getPos()}); - - var level = try world.Level.read(world_reader); - std.log.warn("level x={}, y={}", .{ level.world_x, level.world_y }); - } - // Open output file and write data into it cwd.makePath(this.builder.getInstallPath(.lib, "")) catch |e| switch (e) { error.PathAlreadyExists => {},