From fc0929a302111320db9a62241aaed01b6ccfca18 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Thu, 24 Oct 2024 18:34:58 -0400
Subject: Set g_ModelMatrix, allow -t without package

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 flake.nix      | 7 ++-----
 src/mauri.cc   | 1 +
 src/shader.cc  | 1 +
 src/texture.cc | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7151dfd..90941f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,16 +52,14 @@
               glm
               nlohmann_json
               fftw
-              gst_all_1.gstreamer
-              gst_all_1.gst-plugins-base
-              gst_all_1.gst-plugins-good
               glfw3
-              SDL2
               wayland
               wayland-protocols
               wayland-scanner
               wlr-protocols
               egl-wayland
+              xorg.libXext
+              xorg.libXrandr
               jansson
               # notcurses build
               libdeflate
@@ -103,7 +101,6 @@
               gdk-pixbuf
               xwayland
               xorg.xcbutilwm
-              xorg.xrandr
               # wlroots build
               mesa
               vulkan-headers
diff --git a/src/mauri.cc b/src/mauri.cc
index ed41cde..077b060 100644
--- a/src/mauri.cc
+++ b/src/mauri.cc
@@ -82,6 +82,7 @@ auto wmain(s32 argc, wchar_t **argv) -> s32
 
     if (args.found("directory"))
     {
+        asset_manager()->prepare_output = args.found("target");
         asset_manager()->add_search_directory(args.getString("directory"));
     }
 
diff --git a/src/shader.cc b/src/shader.cc
index e17b4d1..c8ba7b0 100644
--- a/src/shader.cc
+++ b/src/shader.cc
@@ -424,6 +424,7 @@ auto Shader::bind(RenderShader *shader, Engine *engine, Object *object, mat4x4 *
         shader->set_uniform("g_ModelViewProjectionMatrix", TYPE_MAT4, glm::value_ptr(*model));
         shader->set_uniform("g_ModelViewProjectionMatrixInverse", TYPE_MAT4, glm::value_ptr(inverse));
         shader->set_uniform("g_EffectModelViewProjectionMatrix", TYPE_MAT4, glm::value_ptr(engine->default_mat));
+        shader->set_uniform("g_ModelMatrix", TYPE_MAT4, glm::value_ptr(engine->default_mat));
     }
 
     if (object)
diff --git a/src/texture.cc b/src/texture.cc
index ea29bc0..4ea7211 100644
--- a/src/texture.cc
+++ b/src/texture.cc
@@ -112,6 +112,7 @@ Texture::Texture(Asset *asset)
                     break;
                 case DXT5:
                 {
+                    warn("DXT5 texture");
                     u32 *decompressed = new u32[(mm_width + 3) * (mm_height + 3)];
                     BlockDecompressImageDXT5(mm_width, mm_height, buffer, decompressed);
                     texture->format = GL_RGBA;
@@ -121,6 +122,7 @@ Texture::Texture(Asset *asset)
                 }
                 case DXT1:
                 {
+                    warn("DXT1 texture");
                     u32 *decompressed = new u32[(mm_width + 3) * (mm_height + 3)];
                     BlockDecompressImageDXT1(mm_width, mm_height, buffer, decompressed);
                     texture->format = GL_RGBA;
-- 
cgit v1.2.3-101-g0448