working rotation and zoom. pan bad

inc/shaders.hpp

@@ -2,18 +2,16 @@
 
 #include <glad/glad.h>
 #include <variant>
+#include <glm/glm.hpp>
 #include "util.hpp"
 
-namespace shader {
-
 // Reads shader source files, compiles, and links
-bool load(uint* out_id, const char* vertex_filepath, const char* fragment_filepath);
+bool load_shader(uint* out_id, const char* vertex_filepath, const char* fragment_filepath);
 
 // Sets shader as active on the gpu
-void use(uint id);
+void use_shader(uint id);
 
 // Set uniform value
-typedef std::variant<int, float, bool, vec4, vec3, vec2, vec4i, vec3i, vec2i> uniform_variant;
+typedef std::variant<int, float, bool, glm::vec4, glm::vec3, glm::vec2, glm::ivec4, glm::ivec3, glm::ivec2, glm::mat4>
+    uniform_variant;
 void set_uniform(uint id, const char* name, uniform_variant value);
-
-} // namespace shaders