Browse Source

core update

Kajetan Johannes Hammerle 1 month ago
parent
commit
ce0de2e22a
3 changed files with 15 additions and 16 deletions
  1. 6 7
      client/GameClient.cpp
  2. 8 8
      client/rendering/Shaders.cpp
  3. 1 1
      subprojects/gaming-core

+ 6 - 7
client/GameClient.cpp

@@ -30,13 +30,12 @@ struct Receiver {
             return;
         }
         switch(id) {
-            case Packets::S_CHAT:
-                {
-                    StringBuffer<256> s;
-                    in.readString(s);
-                    puts(s);
-                    break;
-                }
+            case Packets::S_CHAT: {
+                StringBuffer<256> s;
+                in.readString(s);
+                puts(s);
+                break;
+            }
             case Packets::S_WORLD_SEGMENT:
                 WorldPackets::receiveChunk(Game::world, in);
                 break;

+ 8 - 8
client/rendering/Shaders.cpp

@@ -1,31 +1,31 @@
 #include "client/rendering/Shaders.h"
 
 Error Shaders::init() {
-    Error error = world.compile("resources/shader/world.vs", nullptr,
-                                "resources/shader/world.fs");
+    Error error =
+        world.compile("resources/shader/world.vs", "resources/shader/world.fs");
     if(error.has()) {
         return error;
     }
-    error = ssao.compile("resources/shader/ssao.vs", nullptr,
-                         "resources/shader/ssao.fs");
+    error =
+        ssao.compile("resources/shader/ssao.vs", "resources/shader/ssao.fs");
     if(error.has()) {
         return error;
     }
-    error = ssaoBlur.compile("resources/shader/ssaoBlur.vs", nullptr,
+    error = ssaoBlur.compile("resources/shader/ssaoBlur.vs",
                              "resources/shader/ssaoBlur.fs");
     if(error.has()) {
         return error;
     }
-    error = shadow.compile("resources/shader/worldShadow.vs", nullptr,
+    error = shadow.compile("resources/shader/worldShadow.vs",
                            "resources/shader/worldShadow.fs");
     if(error.has()) {
         return error;
     }
-    error = postWorld.compile("resources/shader/worldPost.vs", nullptr,
+    error = postWorld.compile("resources/shader/worldPost.vs",
                               "resources/shader/worldPost.fs");
     if(error.has()) {
         return error;
     }
-    return overlay.compile("resources/shader/overlay.vs", nullptr,
+    return overlay.compile("resources/shader/overlay.vs",
                            "resources/shader/overlay.fs");
 }

+ 1 - 1
subprojects/gaming-core

@@ -1 +1 @@
-Subproject commit d3ab446131d53191c6cdc567ab8d8854d00f5e15
+Subproject commit c7ebc81e4488a4a1ac5f642606fa62e1e722087c