added NodeButton as composition and cleaned up old Widget code

2017-02-11 15:51:22 +00:00
parent b1abb42dd5
commit fb25ffb347
4 changed files with 113 additions and 378 deletions
--- a/engine/app.cpp
+++ b/engine/app.cpp
@@ -132,8 +132,8 @@ void App::init()
    ShaderManager::create(kShader::UVs, shader_v, shader_uv_f);
    ShaderManager::create(kShader::Font, shader_font_v, shader_font_f);
    ShaderManager::create(kShader::Atlas, shader_atlas_v, shader_atlas_f);
-    NodeBorder::init();
-    NodeImage::init();
+    NodeBorder::static_init();
+    NodeImage::static_init();

    if (!tex.load("data/uvs.jpg"))
        printf("error loading image\n");