summaryrefslogtreecommitdiff
path: root/Source/Asura.Engine/Graphics
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Asura.Engine/Graphics')
-rw-r--r--Source/Asura.Engine/Graphics/Image.h22
-rw-r--r--Source/Asura.Engine/Graphics/Shader.h6
2 files changed, 15 insertions, 13 deletions
diff --git a/Source/Asura.Engine/Graphics/Image.h b/Source/Asura.Engine/Graphics/Image.h
index 66c7ae1..2607969 100644
--- a/Source/Asura.Engine/Graphics/Image.h
+++ b/Source/Asura.Engine/Graphics/Image.h
@@ -1,14 +1,14 @@
#ifndef __ASURA_ENGINE_IMAGE_H__
#define __ASURA_ENGINE_IMAGE_H__
-#include "Math/Vector2.hpp"
-#include "Scripting/Portable.h"
-#include "FileSystem/Reloadable.h"
-#include "StringMap.hpp"
-#include "Manager.hpp"
-#include "Texture.h"
-#include "Color.h"
-#include "ImageData.h"
+#include "math/vector2.hpp"
+#include "scripting/portable.h"
+#include "fileSystem/reloadable.h"
+#include "stringmap.hpp"
+#include "manager.hpp"
+#include "texture.h"
+#include "color.h"
+#include "image_data.h"
namespace AsuraEngine
{
@@ -23,7 +23,7 @@ namespace AsuraEngine
///
class Image ASURA_FINAL
: public Drawable
- , public Scripting::Portable
+ , public Scripting::Portable<Image>
, public Filesystem::Reloadable
{
public:
@@ -59,8 +59,6 @@ namespace AsuraEngine
public:
- //----------------------------------------------------------------------------------------------------------
-
LUAX_DECL_FACTORY(SimImage);
LUAX_DECL_METHOD(l_Load);
@@ -68,8 +66,6 @@ namespace AsuraEngine
LUAX_DECL_METHOD(l_GetHeight);
LUAX_DECL_METHOD(l_GetSize);
- //----------------------------------------------------------------------------------------------------------
-
};
}
diff --git a/Source/Asura.Engine/Graphics/Shader.h b/Source/Asura.Engine/Graphics/Shader.h
index 7c00dda..4976106 100644
--- a/Source/Asura.Engine/Graphics/Shader.h
+++ b/Source/Asura.Engine/Graphics/Shader.h
@@ -94,6 +94,8 @@ namespace AsuraEngine
///
GLuint mProgramHandle;
+ //------------------------------------------------------------------------------------------------------------
+
public:
LUAX_DECL_FACTORY(SimShader);
@@ -111,6 +113,10 @@ namespace AsuraEngine
LUAX_DECL_METHOD(l_SetUniformVector4);
LUAX_DECL_METHOD(l_SetUniformColor);
+ private:
+
+ Luax::LuaxMemberRef mCodeLuaRef;
+
};
}