AstralTransRocketries/Cubyz
1
0
Fork 0
mirror of https://github.com/PixelGuys/Cubyz.git synced 2025-09-08 19:50:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix till++'s problems.

Browse Source
This commit is contained in:
IntegratedQuantum 2022-12-05 17:51:02 +01:00
parent bcb8747dc1
commit ac41fb8c96
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.zig
View File

@ -76,6 +76,7 @@ pub const Window = struct {
std.log.err("GLFW Error({}): {s}", .{errorCode, description});
}
fn keyCallback(_: ?*c.GLFWwindow, key: c_int, scancode: c_int, action: c_int, mods: c_int) callconv(.C) void {
_ = mods;
if(action == c.GLFW_PRESS) {
inline for(@typeInfo(@TypeOf(keyboard)).Struct.fields) |field| {
if(key == @field(keyboard, field.name).key) {
@ -96,7 +97,6 @@ pub const Window = struct {
}
}
}
std.log.info("Key pressed: {}, {}, {}, {}", .{key, scancode, action, mods});
}
fn framebufferSize(_: ?*c.GLFWwindow, newWidth: c_int, newHeight: c_int) callconv(.C) void {
std.log.info("Framebuffer: {}, {}", .{newWidth, newHeight});
@ -129,10 +129,13 @@ pub const Window = struct {
ignoreDataAfterRecentGrab = false;
currentPos = newPos;
}
fn glDebugOutput(_: c_uint, typ: c_uint, _: c_uint, severity: c_uint, length: c_int, message: [*c]const u8, _: ?*const anyopaque) callconv(.C) void {
if(typ == c.GL_DEBUG_TYPE_ERROR or typ == c.GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR or typ == c.GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR or typ == c.GL_DEBUG_TYPE_PORTABILITY or typ == c.GL_DEBUG_TYPE_PERFORMANCE) {
fn glDebugOutput(_: c_uint, _: c_uint, _: c_uint, severity: c_uint, length: c_int, message: [*c]const u8, _: ?*const anyopaque) callconv(.C) void {
if(severity == c.GL_DEBUG_SEVERITY_HIGH) {
std.log.err("OpenGL {}:{s}", .{severity, message[0..@intCast(usize, length)]});
@panic("OpenGL error");
} else if(severity == c.GL_DEBUG_SEVERITY_MEDIUM) {
std.log.warn("OpenGL {}:{s}", .{severity, message[0..@intCast(usize, length)]});
} else if(severity == c.GL_DEBUG_SEVERITY_LOW) {
std.log.info("OpenGL {}:{s}", .{severity, message[0..@intCast(usize, length)]});
}
}
};

5
src/network.zig
View File

@ -1053,7 +1053,10 @@ pub const Protocols: struct {
type_itemStackCollect => {
const jsonObject = json.parseFromString(main.threadAllocator, data[1..]);
defer jsonObject.free(main.threadAllocator);
const item = try items.Item.init(jsonObject);
const item = items.Item.init(jsonObject) catch |err| {
std.log.err("Error {s} while collecting item {s}. Ignoring it.", .{@errorName(err), data[1..]});
return;
};
game.Player.mutex.lock();
defer game.Player.mutex.unlock();
const remaining = game.Player.inventory__SEND_CHANGES_TO_SERVER.addItem(item, jsonObject.get(u16, "amount", 0));

4
src/renderer.zig
View File

@ -795,10 +795,8 @@ pub const MeshSelection = struct {
@intToFloat(f32, voxelModel.maxZ)/16.0
);
c.glLineWidth(2);
c.glBindVertexArray(cubeVAO);
c.glDrawElements(c.GL_LINES, 12*2, c.GL_UNSIGNED_BYTE, null);
c.glLineWidth(1);
c.glDrawElements(c.GL_LINES, 12*2, c.GL_UNSIGNED_BYTE, null); // TODO: Draw thicker lines so they are more visible. Maybe a simple shader + cube mesh is enough.
}
}
};