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 0008d70..b56f9a5 100644 Binary files a/src/game/compiled-shaders/dx11/frag.bin and b/src/game/compiled-shaders/dx11/frag.bin differ diff --git a/src/game/compiled-shaders/glsl/frag.bin b/src/game/compiled-shaders/glsl/frag.bin index 79d5098..bec6cf7 100644 Binary files a/src/game/compiled-shaders/glsl/frag.bin and b/src/game/compiled-shaders/glsl/frag.bin differ diff --git a/src/game/compiled-shaders/spirv/frag.bin b/src/game/compiled-shaders/spirv/frag.bin index bc6fc76..359c212 100644 Binary files a/src/game/compiled-shaders/spirv/frag.bin and b/src/game/compiled-shaders/spirv/frag.bin differ 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;