From c868a3c43ec5c6d9267f8beb170587ce9e5be52e Mon Sep 17 00:00:00 2001 From: Asuro Date: Sat, 8 Feb 2025 02:49:13 +0100 Subject: [PATCH] idk man --- src/build.ps1 | 2 +- src/engine/main.cpp | 2 +- src/game/compiled-shaders/dx11/frag.bin | Bin 270 -> 270 bytes src/game/compiled-shaders/glsl/frag.bin | Bin 10359 -> 10343 bytes src/game/compiled-shaders/spirv/frag.bin | Bin 362 -> 406 bytes src/game/rendering/Rendering.h | 2 +- src/game/shaders/frag.sc | 2 +- src/game/shaders/varying.def.sc | 2 +- 8 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/build.ps1 b/src/build.ps1 index ce880a2..3924080 100644 --- a/src/build.ps1 +++ b/src/build.ps1 @@ -1 +1 @@ -cmake --build cmake-build +cmake --build cmake-build --config Debug diff --git a/src/engine/main.cpp b/src/engine/main.cpp index 96b99f3..36f675d 100644 --- a/src/engine/main.cpp +++ b/src/engine/main.cpp @@ -192,7 +192,7 @@ int main() char PathBuf[512]{ 0 }; GetCurrentDirectory(sizeof(PathBuf), PathBuf); - printf("Current path: %s", PathBuf); + printf("Current path: %s\n", PathBuf); if (!ReloadDLL()) return 1; diff --git a/src/game/compiled-shaders/dx11/frag.bin b/src/game/compiled-shaders/dx11/frag.bin index 0008d70cf3a9b4672ac7ba5bf88b9d5cd4ac9b54..b56f9a51343e4fd493a29b66f3bd43c8c1388693 100644 GIT binary patch delta 84 zcmeBU>SLN9CeWETvoY*h(R=@?`Rg>V{Qo{tEtHXeVojV$k^lqqCjkKlMg|6kR0am- YPYMDIAYjJ8zzSo#$wB1p7{JOH0CzDHR{#J2 delta 84 zcmeBU>SLN9CeYt~oA1@%tbOa3mfx7fb9Kr@wNOTei8XO1sSFIvpA-ZbK){TFfdj^7 TasY`m*fTI7upI*fBS;hgiMbS} diff --git a/src/game/compiled-shaders/glsl/frag.bin b/src/game/compiled-shaders/glsl/frag.bin index 79d5098d4b9dacb3038ce8f04ffa48af74f70f52..bec6cf737b84eb84ccd90687214821fa565299e7 100644 GIT binary patch delta 37 pcmew!@H~LuE!cy5N%wnC1~3TO$nT@U6Q7))lV4elbURzVW?-IqkuwaT65KMF#rIc!wk*< diff --git a/src/game/compiled-shaders/spirv/frag.bin b/src/game/compiled-shaders/spirv/frag.bin index bc6fc76283b05850a48f4e0427731fc75d2011f3..359c212071ee81b3593681e82ccb4c2eafcd9a98 100644 GIT binary patch delta 236 zcmaFGG>uu_E!cy5N%wnC1~6z~WME)sQf6mhV`SiF;9$_3C~qpx&cMRJ0LHnAnRy^} zN(>APx)alN?O7Q>%(D38{G9wE1CSIe0~>=b0|P@+dRj%iTTx=VOJYf)0Rw|O0}EKK z97quZgs(esy|twR0}BI4kdc9bfrEj8!5Yd384MBw$?GsMFfb#@gZR3W^%<2lY#CU< cx|A6hz{cA#FoUfJ@&7U~GFUKx%wS*u09*$e-v9sr delta 173 zcmbQn{EA85E!cy5N%wnC1~3R=WME)sQf6mhV`SiF;9$_7C~qpv#=yeB0LHnAnRy^} zdK0sCnb{chCaxD})SGzS+Etr@g@KKMfk6f&%g|u2!@$nK!N9;E3l#&2!>|Ga3xh5L k0|PSy16YkUl&?40n^9T9j)9p$532Jo10#b410&c>00+wx7XSbN diff --git a/src/game/rendering/Rendering.h b/src/game/rendering/Rendering.h index 2261a1e..9af0a5f 100644 --- a/src/game/rendering/Rendering.h +++ b/src/game/rendering/Rendering.h @@ -32,7 +32,7 @@ namespace Game virtual void traceVargs(const char* _filePath, uint16_t _line, const char* _format, va_list _argList) override { printf("%s (%d): ", _filePath, _line); - printf(_format, _argList); + vprintf(_format, _argList); } virtual void profilerBegin(const char* /*_name*/, uint32_t /*_abgr*/, const char* /*_filePath*/, uint16_t /*_line*/) override diff --git a/src/game/shaders/frag.sc b/src/game/shaders/frag.sc index 8035e62..ee704a3 100644 --- a/src/game/shaders/frag.sc +++ b/src/game/shaders/frag.sc @@ -3,5 +3,5 @@ $input v_color0 void main() { - gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0); + gl_FragColor = v_color0; } diff --git a/src/game/shaders/varying.def.sc b/src/game/shaders/varying.def.sc index 9d9d83e..5cce0ac 100644 --- a/src/game/shaders/varying.def.sc +++ b/src/game/shaders/varying.def.sc @@ -1,4 +1,4 @@ -vec4 v_color0 : COLOR0 = vec4(1.0, 0.0, 0.0, 1.0); +vec4 v_color0 : COLOR0 = vec4(1.0, 1.0, 0.0, 1.0); vec3 a_position : POSITION; vec4 a_color0 : COLOR0;