added image widget with atlas support and global texture manager

2017-02-07 23:42:39 +00:00
parent 83e59573e0
commit 5e5ddf310c
10 changed files with 167 additions and 9 deletions
--- a/engine/shader.h
+++ b/engine/shader.h
@@ -6,8 +6,8 @@ enum class kShaderUniform : uint16_t
    MVP = const_hash("mvp"),
    Tex = const_hash("tex"),
    Col = const_hash("col"),
-    Tof = const_hash("texoff"),
-    Tsz = const_hash("texsz"),
+    Tof = const_hash("tof"),
+    Tsz = const_hash("tsz"),
 };

 class Shader
@@ -29,6 +29,7 @@ enum class kShader : uint16_t
    Texture     = const_hash("texture"),
    UVs         = const_hash("uvs"),
    Font        = const_hash("font"),
+    Atlas       = const_hash("atlas"),
 };

 class ShaderManager