From 80d15e7f489d424849dc34de1d94cce362235577 Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Sun, 13 Apr 2025 19:51:28 -0500
Subject: [PATCH] naming

---
 flake.nix                                     |  4 ++--
 modules/ClientModule/src/ClientModule.cpp     | 21 ++++++++++++++++
 modules/ClientModule/src/ClientModule.h       | 24 +++++++++++++++++++
 .../NetworkingModule/src/NetworkingModule.cpp | 17 -------------
 .../NetworkingModule/src/NetworkingModule.h   | 18 --------------
 modules/ServerModule/src/ServerModule.cpp     | 21 ++++++++++++++++
 modules/ServerModule/src/ServerModule.h       | 24 +++++++++++++++++++
 7 files changed, 92 insertions(+), 37 deletions(-)
 create mode 100644 modules/ClientModule/src/ClientModule.cpp
 create mode 100644 modules/ClientModule/src/ClientModule.h
 delete mode 100644 modules/NetworkingModule/src/NetworkingModule.cpp
 delete mode 100644 modules/NetworkingModule/src/NetworkingModule.h
 create mode 100644 modules/ServerModule/src/ServerModule.cpp
 create mode 100644 modules/ServerModule/src/ServerModule.h

diff --git a/flake.nix b/flake.nix
index 84a1372..ed8955c 100755
--- a/flake.nix
+++ b/flake.nix
@@ -44,9 +44,9 @@
                     modules/NetworkingModule/src/*.cpp \
                     -fpic -shared \
                     -I src -I include \
+                    -I ${pkgs.gamenetworkingsockets}/include/GameNetworkingSockets \
+                    -lGameNetworkingSockets \
                     -DNETWORKINGMODULE_DYNAMIC \
-                    -lGameNetworkingSockets
-                    -lGL -lglfw -lGLEW \
                     -Wall \
                     -o $name 
                 ''; 
diff --git a/modules/ClientModule/src/ClientModule.cpp b/modules/ClientModule/src/ClientModule.cpp
new file mode 100644
index 0000000..740fd62
--- /dev/null
+++ b/modules/ClientModule/src/ClientModule.cpp
@@ -0,0 +1,21 @@
+#include "ClientModule.h"
+
+ClientModule::ClientModule(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {
+    name = "ClientModule";
+}
+
+ClientModule::~ClientModule() {
+    GameNetworkingSockets_Kill();
+}
+
+void ClientModule::onLoad() {
+    SteamDatagramErrMsg errMsg;
+	if ( !GameNetworkingSockets_Init( nullptr, errMsg ) ) {
+	    //FatalError( "GameNetworkingSockets_Init failed.  %s", errMsg );
+        std::cerr << "GameNetworkingSockets_Init() Failed: " << errMsg << std::endl;
+    }
+
+    //g_logTimeZero = SteamNetworkingUtils()->GetLocalTimestamp();
+
+	//SteamNetworkingUtils()->SetDebugOutputFunction( k_ESteamNetworkingSocketsDebugOutputType_Msg, DebugOutput );
+}
diff --git a/modules/ClientModule/src/ClientModule.h b/modules/ClientModule/src/ClientModule.h
new file mode 100644
index 0000000..86f3a5e
--- /dev/null
+++ b/modules/ClientModule/src/ClientModule.h
@@ -0,0 +1,24 @@
+#include "Archimedes.h"
+
+#include <steam/steamnetworkingsockets.h>
+#include <steam/isteamnetworkingutils.h>
+
+class ClientModule : public Archimedes::Module {
+
+    public:
+        ClientModule(Archimedes::App*, void*);
+        ~ClientModule();
+        void onLoad();
+        void run();
+
+        void startClient(std::string);
+        void startServer(unsigned int);
+
+    private:
+
+};
+
+#ifdef CLIENTMODULE_DYNAMIC
+#define MODULE_TYPE ClientModule
+#include "endModule.h"
+#endif
diff --git a/modules/NetworkingModule/src/NetworkingModule.cpp b/modules/NetworkingModule/src/NetworkingModule.cpp
deleted file mode 100644
index fcca2dc..0000000
--- a/modules/NetworkingModule/src/NetworkingModule.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "NetworkingModule.h"
-
-NetworkingModule::NetworkingModule(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {
-    name = "NetworkingModule";
-}
-
-NetworkingModule::~NetworkingModule() {
-
-}
-
-void NetworkingModule::onLoad() {
-
-}
-
-void NetworkingModule::run() {
-
-}
diff --git a/modules/NetworkingModule/src/NetworkingModule.h b/modules/NetworkingModule/src/NetworkingModule.h
deleted file mode 100644
index 761148e..0000000
--- a/modules/NetworkingModule/src/NetworkingModule.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "Archimedes.h"
-
-#include <steam/steamnetworkingsockets.h>
-#include <steam/isteamnetworkingutils.h>
-
-class NetworkingModule : public Archimedes::Module {
-
-    public:
-        NetworkingModule(Archimedes::App*, void*);
-        ~NetworkingModule();
-        void run();
-        void onLoad();
-};
-
-#ifdef NETWORKINGMODULE_DYNAMIC
-#define MODULE_TYPE NetworkingModule
-#include "endModule.h"
-#endif
diff --git a/modules/ServerModule/src/ServerModule.cpp b/modules/ServerModule/src/ServerModule.cpp
new file mode 100644
index 0000000..a2290fe
--- /dev/null
+++ b/modules/ServerModule/src/ServerModule.cpp
@@ -0,0 +1,21 @@
+#include "ServerModule.h"
+
+ServerModule::ServerModule(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {
+    name = "ServerModule";
+}
+
+ServerModule::~ServerModule() {
+    GameNetworkingSockets_Kill();
+}
+
+void ServerModule::onLoad() {
+    SteamDatagramErrMsg errMsg;
+	if ( !GameNetworkingSockets_Init( nullptr, errMsg ) ) {
+	    //FatalError( "GameNetworkingSockets_Init failed.  %s", errMsg );
+        std::cerr << "GameNetworkingSockets_Init() Failed: " << errMsg << std::endl;
+    }
+
+    //g_logTimeZero = SteamNetworkingUtils()->GetLocalTimestamp();
+
+	//SteamNetworkingUtils()->SetDebugOutputFunction( k_ESteamNetworkingSocketsDebugOutputType_Msg, DebugOutput );
+}
diff --git a/modules/ServerModule/src/ServerModule.h b/modules/ServerModule/src/ServerModule.h
new file mode 100644
index 0000000..01bbbb3
--- /dev/null
+++ b/modules/ServerModule/src/ServerModule.h
@@ -0,0 +1,24 @@
+#include "Archimedes.h"
+
+#include <steam/steamnetworkingsockets.h>
+#include <steam/isteamnetworkingutils.h>
+
+class ServerModule : public Archimedes::Module {
+
+    public:
+        ServerModule(Archimedes::App*, void*);
+        ~ServerModule();
+        void onLoad();
+        void run();
+
+        void startClient(std::string);
+        void startServer(unsigned int);
+
+    private:
+
+};
+
+#ifdef SERVERMODULE_DYNAMIC
+#define MODULE_TYPE ServerModule
+#include "endModule.h"
+#endif