brossferatu/coven
Public Access
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compiles again

Browse Source
This commit is contained in:
Daniel Bross
2024-10-13 00:54:26 +02:00
parent 8f2dad9cec
commit 9939c84f09
9 changed files with 172 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
networking/networking.jai
View File

@@ -178,8 +178,8 @@ Player_Update_Data :: struct {
pitch: float;
}
message_mutex: Mutex;
update_mutex: Mutex;
message_mutex: Thread.Mutex;
update_mutex: Thread.Mutex;
net_init :: () {
net_log("Init\n");
@@ -190,17 +190,17 @@ net_init :: () {
net_log("Couldn't initialize Lyn\n");
}
if thread_init(*thread, networking_thread_proc) {
thread_start(*thread);;
if Thread.thread_init(*thread, networking_thread_proc) {
Thread.thread_start(*thread);;
}
if thread_init(*message_thread, net_check_for_messages) {
thread_start(*message_thread);;
if Thread.thread_init(*message_thread, net_check_for_messages) {
Thread.thread_start(*message_thread);;
}
init(*update_mutex);
init(*message_mutex);
init(*internal_message_mutex);
Thread.init(*update_mutex);
Thread.init(*message_mutex);
Thread.init(*internal_message_mutex);
}
net_get_state :: () -> Net_Networking_State {
@@ -275,7 +275,7 @@ net_log_error :: inline (message: string, args: .. Any) {
log_error(tprint("NET: %", message), args);
}
networking_thread_proc :: (thread: *Thread) -> s64 {
networking_thread_proc :: (thread: *Thread.Thread) -> s64 {
while true {
update_networking();
sleep_milliseconds(10);
@@ -283,12 +283,12 @@ networking_thread_proc :: (thread: *Thread) -> s64 {
return 0;
}
net_check_for_messages :: (thread: *Thread) -> s64 {
net_check_for_messages :: (thread: *Thread.Thread) -> s64 {
while true {
success, message, address := net_read_message(net_data.socket);
if success {
lock(*internal_message_mutex);
defer unlock(*internal_message_mutex);
Thread.lock(*internal_message_mutex);
defer Thread.unlock(*internal_message_mutex);
pending: Internal_Pending_Message;
pending.message = message;
@@ -460,29 +460,29 @@ on_message_received :: (message: Net_Message, address: Net_Address) {
}
case .START_GAME; {
{
lock(*update_mutex);
defer unlock(*update_mutex);
Thread.lock(*update_mutex);
defer Thread.unlock(*update_mutex);
array_add(*pending_net_messages, message);
}
}
case .SPAWN_ENTITY; {
{
lock(*update_mutex);
defer unlock(*update_mutex);
Thread.lock(*update_mutex);
defer Thread.unlock(*update_mutex);
array_add(*pending_net_messages, message);
}
}
case .TRANSFORM_UPDATE; {
lock(*update_mutex);
defer unlock(*update_mutex);
Thread.lock(*update_mutex);
defer Thread.unlock(*update_mutex);
array_add(*pending_net_messages, message);
}
case; {
lock(*update_mutex);
defer unlock(*update_mutex);
Thread.lock(*update_mutex);
defer Thread.unlock(*update_mutex);
array_add(*pending_net_messages, message);
}
@@ -493,8 +493,8 @@ update_networking :: () {
reset_temporary_storage();
{
lock(*message_mutex);
defer unlock(*message_mutex);
Thread.lock(*message_mutex);
defer Thread.unlock(*message_mutex);
for * messages_to_send {
if net_is_client() {
@@ -507,8 +507,8 @@ update_networking :: () {
}
{
lock(*internal_message_mutex);
defer unlock(*internal_message_mutex);
Thread.lock(*internal_message_mutex);
defer Thread.unlock(*internal_message_mutex);
for internal_pending_messages {
on_message_received(it.message, it.address);
@@ -585,12 +585,12 @@ Internal_Pending_Message :: struct {
}
internal_pending_messages : [..] Internal_Pending_Message;
internal_message_mutex: Mutex;
internal_message_mutex: Thread.Mutex;
thread : Thread;
message_thread : Thread;
thread : Thread.Thread;
message_thread : Thread.Thread;
state : Net_Networking_State;
#import "Thread";
Thread :: #import "Thread";
#import "Basic";
Socket :: #import "Socket";