minor changes and added namespace to avoid conflicts when integrating with PanoPainter

engine/shader.h

@@ -1,6 +1,8 @@
 #pragma once
 #include "util.h"
 
+namespace ui {
+
 enum class kShaderUniform : uint16_t
 {
     MVP = const_hash("mvp"),
@@ -45,3 +47,5 @@ public:
     static void u_mat4(kShaderUniform id, const glm::mat4& m);
     static void u_int(kShaderUniform id, int i);
 };
+
+}