w/e
This commit is contained in:
1 parent
c41f8866d9
commit
6d69fa8898
6 files changed
+224
-140
No files matched your search
@@ -3,3 +3,8 @@ pub const c = @cImport({
|
||||
@cInclude("raymath.h");
|
||||
@cInclude("rlgl.h");
|
||||
});
|
||||
|
||||
pub const enet = @cImport({
|
||||
@cDefine("WIN32_LEAN_AND_MEAN", "");
|
||||
@cInclude("enet/enet.h");
|
||||
});
|
||||
+36
-30
@@ -1,6 +1,5 @@
|
||||
const std = @import("std");
|
||||
const zm = @import("zmath");
|
||||
const znet = @import("znet");
|
||||
const rl = @import("raylib");
|
||||
const bufzilla = @import("bufzilla");
|
||||
const ft = @import("mach-freetype");
|
||||
@@ -9,6 +8,8 @@ const kb = @import("kb");
|
||||
|
||||
const shared = @import("shared");
|
||||
|
||||
const c = @import("c.zig").c;
|
||||
const enet = @import("c.zig").enet;
|
||||
const client = @import("client.zig");
|
||||
const entity = @import("entity.zig");
|
||||
const misc = @import("misc.zig");
|
||||
@@ -47,10 +48,15 @@ pub fn main() !void {
|
||||
var stdout = std.fs.File.stdout();
|
||||
|
||||
_ = try stdout.write("Hello, Client!\n");
|
||||
|
||||
try znet.init();
|
||||
defer znet.deinit();
|
||||
// rl.setConfigFlags(.{ .window_highdpi = true, .vsync_hint = true });
|
||||
|
||||
if (enet.enet_initialize() != 0) {
|
||||
std.log.info("Failed to load ENet", .{});
|
||||
return;
|
||||
}
|
||||
|
||||
defer enet.enet_deinitialize();
|
||||
|
||||
rl.setConfigFlags(.{ .window_highdpi = true, .vsync_hint = false });
|
||||
rl.initWindow(screen_width, screen_height, "zzz");
|
||||
defer rl.closeWindow();
|
||||
|
||||
@@ -107,14 +113,14 @@ pub fn main() !void {
|
||||
// const tx = try rl.loadTextureFromImage(img);
|
||||
// rl.unloadImage(img);
|
||||
|
||||
const host = try znet.Host.init(.{
|
||||
.addr = null,
|
||||
.peer_limit = 1,
|
||||
.channel_limit = .max,
|
||||
.incoming_bandwidth = .unlimited,
|
||||
.outgoing_bandwidth = .unlimited,
|
||||
});
|
||||
defer host.deinit();
|
||||
// const host = try znet.Host.init(.{
|
||||
// .addr = null,
|
||||
// .peer_limit = 1,
|
||||
// .channel_limit = .max,
|
||||
// .incoming_bandwidth = .unlimited,
|
||||
// .outgoing_bandwidth = .unlimited,
|
||||
// });
|
||||
// defer host.deinit();
|
||||
|
||||
// const peer = try host.connect(.{
|
||||
// .addr = try .init(.{
|
||||
@@ -195,27 +201,27 @@ pub fn main() !void {
|
||||
|
||||
// std.log.info("t: {}", .{t});
|
||||
|
||||
while (try host.service(0)) |event| switch (event) {
|
||||
.connect => |data| {
|
||||
_ = data;
|
||||
// std.log.info("{}", .{data.peer});
|
||||
},
|
||||
.disconnect => |data| {
|
||||
_ = data;
|
||||
// std.log.info("{}", .{data.peer});
|
||||
},
|
||||
.receive => |data| {
|
||||
defer data.packet.deinit();
|
||||
// while (try host.service(0)) |event| switch (event) {
|
||||
// .connect => |data| {
|
||||
// _ = data;
|
||||
// // std.log.info("{}", .{data.peer});
|
||||
// },
|
||||
// .disconnect => |data| {
|
||||
// _ = data;
|
||||
// // std.log.info("{}", .{data.peer});
|
||||
// },
|
||||
// .receive => |data| {
|
||||
// defer data.packet.deinit();
|
||||
|
||||
const slice = data.packet.dataSlice();
|
||||
// const slice = data.packet.dataSlice();
|
||||
|
||||
var reader = bufzilla.Reader(.{}).init(slice);
|
||||
// var reader = bufzilla.Reader(.{}).init(slice);
|
||||
|
||||
const id = try reader.readPath("id");
|
||||
// const id = try reader.readPath("id");
|
||||
|
||||
std.log.info("{any}", .{id});
|
||||
},
|
||||
};
|
||||
// std.log.info("{any}", .{id});
|
||||
// },
|
||||
// };
|
||||
|
||||
rl.pollInputEvents();
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
pub const c = @cImport({
|
||||
// @cInclude("enet/enet.h");
|
||||
});
|
||||
@@ -1,5 +1,4 @@
|
||||
const std = @import("std");
|
||||
const znet = @import("znet");
|
||||
const bufzilla = @import("bufzilla");
|
||||
|
||||
const shared = @import("shared");
|
||||
@@ -30,14 +29,14 @@ pub fn spawn(chunk: *shared.chunk.Chunk, comptime T: type, allocator: std.mem.Al
|
||||
var writer = bufzilla.Writer.init(&fixed);
|
||||
try writer.writeAny(msg);
|
||||
|
||||
const encoded = fixed.buffered();
|
||||
// const encoded = fixed.buffered();
|
||||
|
||||
const packet = try znet.Packet.init(encoded, 0, .reliable);
|
||||
var iterator = server.host.iterPeers();
|
||||
// const packet = try znet.Packet.init(encoded, 0, .reliable);
|
||||
// var iterator = server.host.iterPeers();
|
||||
|
||||
while (iterator.next()) |peer| {
|
||||
if (peer.state() == .connected) {
|
||||
try peer.send(packet);
|
||||
}
|
||||
}
|
||||
// while (iterator.next()) |peer| {
|
||||
// if (peer.state() == .connected) {
|
||||
// try peer.send(packet);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
+26
-27
@@ -1,6 +1,5 @@
|
||||
const std = @import("std");
|
||||
const zm = @import("zmath");
|
||||
const znet = @import("znet");
|
||||
|
||||
const shared = @import("shared");
|
||||
|
||||
@@ -28,19 +27,19 @@ pub fn main() !void {
|
||||
|
||||
try stdout.flush();
|
||||
|
||||
try znet.init();
|
||||
defer znet.deinit();
|
||||
// try znet.init();
|
||||
// defer znet.deinit();
|
||||
|
||||
server.host = try znet.Host.init(.{
|
||||
.addr = try .init(.{
|
||||
.ip = .any,
|
||||
.port = .{ .uint = 5000 },
|
||||
}),
|
||||
.peer_limit = 32,
|
||||
.channel_limit = .max,
|
||||
.incoming_bandwidth = .unlimited,
|
||||
.outgoing_bandwidth = .unlimited,
|
||||
});
|
||||
// server.host = try znet.Host.init(.{
|
||||
// .addr = try .init(.{
|
||||
// .ip = .any,
|
||||
// .port = .{ .uint = 5000 },
|
||||
// }),
|
||||
// .peer_limit = 32,
|
||||
// .channel_limit = .max,
|
||||
// .incoming_bandwidth = .unlimited,
|
||||
// .outgoing_bandwidth = .unlimited,
|
||||
// });
|
||||
|
||||
// const address = try std.net.Address.parseIp4("127.0.0.1", shared.protocol.SERVER_PORT);
|
||||
// var tcp_server = try address.listen(.{});
|
||||
@@ -65,20 +64,20 @@ pub fn main() !void {
|
||||
|
||||
// std.log.info("t: {}", .{t});
|
||||
|
||||
while (try server.host.service(0)) |event| switch (event) {
|
||||
.connect => |data| {
|
||||
_ = data;
|
||||
// std.log.info("{}", .{data.peer});
|
||||
},
|
||||
.disconnect => |data| {
|
||||
_ = data;
|
||||
// std.log.info("{}", .{data.peer});
|
||||
},
|
||||
.receive => |data| {
|
||||
std.log.info("{s}", .{data.packet.dataSlice()});
|
||||
defer data.packet.deinit();
|
||||
},
|
||||
};
|
||||
// while (try server.host.service(0)) |event| switch (event) {
|
||||
// .connect => |data| {
|
||||
// _ = data;
|
||||
// // std.log.info("{}", .{data.peer});
|
||||
// },
|
||||
// .disconnect => |data| {
|
||||
// _ = data;
|
||||
// // std.log.info("{}", .{data.peer});
|
||||
// },
|
||||
// .receive => |data| {
|
||||
// std.log.info("{s}", .{data.packet.dataSlice()});
|
||||
// defer data.packet.deinit();
|
||||
// },
|
||||
// };
|
||||
|
||||
// const connection = try tcp_server.accept();
|
||||
// defer connection.stream.close();
|
||||
|
||||
Reference in new issue
Block a user