diff options
Diffstat (limited to 'src/lua/modules')
| -rw-r--r-- | src/lua/modules/graphics/graphics.cpp | 5 | ||||
| -rw-r--r-- | src/lua/modules/graphics/jsl.cpp | 13 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/lua/modules/graphics/graphics.cpp b/src/lua/modules/graphics/graphics.cpp index 98a4fef..92168ad 100644 --- a/src/lua/modules/graphics/graphics.cpp +++ b/src/lua/modules/graphics/graphics.cpp @@ -8,6 +8,7 @@ namespace jin { namespace lua { + using namespace jin::graphics; using jin::filesystem::Filesystem; using jin::filesystem::Buffer; @@ -404,7 +405,7 @@ namespace lua exit(1); } fs->read(path, &b); - font->loadb((const unsigned char*)b.data); + font->loadMemory((const unsigned char*)b.data); } proxy->bind(new Ref<Font>(font, JIN_GRAPHICS_FONT)); return 1; @@ -420,7 +421,7 @@ namespace lua #include "lua/resources/font.ttf.h" // load default font context.defaultFont = new Font(); - context.defaultFont->loadb(font_ttf); + context.defaultFont->loadMemory(font_ttf); } context.curFont = context.defaultFont; return 0; diff --git a/src/lua/modules/graphics/jsl.cpp b/src/lua/modules/graphics/jsl.cpp index 9714695..c2808ca 100644 --- a/src/lua/modules/graphics/jsl.cpp +++ b/src/lua/modules/graphics/jsl.cpp @@ -18,19 +18,6 @@ namespace lua return proxy->getRef<JSLProgram>(); } - static enum VARIABLE_TYPE - { - INVALID = 0, - - NUMBER, - IMAGE, - CANVAS, - VEC2, - VEC3, - VEC4, - COLOR, - }; - /** * jsl:sendNumber("variable", 0.1) */ |