remove ui namespace which is not really used, move CameraData in camera_modes.h to avoid the inclusion of canva.h

src/shader.cpp

@@ -2,8 +2,6 @@
 #include "log.h"
 #include "shader.h"
 
-using namespace ui;
-
 std::map<kShader, Shader> ShaderManager::m_shaders;
 Shader* ShaderManager::m_current;
 
@@ -146,7 +144,7 @@ void Shader::u_float(kShaderUniform id, float f)
         LOG("UNIFORM float %d NOT FOUND in shader %d", (int)id, (int)name)
     else glUniform1f(m_umap[id], f);
 }
-GLint ui::Shader::GetAttribLocation(const char* name)
+GLint Shader::GetAttribLocation(const char* name)
 {
     return glGetAttribLocation(prog, name);
 }
@@ -188,13 +186,13 @@ void ShaderManager::u_int(kShaderUniform id, int i)
     m_current->u_int(id, i);
 }
 
-Shader* ui::ShaderManager::get(kShader id)
+Shader* ShaderManager::get(kShader id)
 {
     auto it = m_shaders.find(id);
     return (it == m_shaders.end()) ? nullptr : &it->second;
 }
 
-void ui::ShaderManager::u_float(kShaderUniform id, float f)
+void ShaderManager::u_float(kShaderUniform id, float f)
 {
     m_current->u_float(id, f);
 }