diff options
Diffstat (limited to 'Source/Asura.Engine')
14 files changed, 70 insertions, 31 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; + }; } diff --git a/Source/Asura.Engine/graphics/binding/canvas.cpp b/Source/Asura.Engine/graphics/binding/canvas.binding.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/graphics/binding/canvas.cpp +++ b/Source/Asura.Engine/graphics/binding/canvas.binding.cpp diff --git a/Source/Asura.Engine/graphics/binding/color.cpp b/Source/Asura.Engine/graphics/binding/color.binding.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/graphics/binding/color.cpp +++ b/Source/Asura.Engine/graphics/binding/color.binding.cpp diff --git a/Source/Asura.Engine/graphics/binding/image.cpp b/Source/Asura.Engine/graphics/binding/image.binding.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/graphics/binding/image.cpp +++ b/Source/Asura.Engine/graphics/binding/image.binding.cpp diff --git a/Source/Asura.Engine/graphics/binding/image_data.binding.cpp b/Source/Asura.Engine/graphics/binding/image_data.binding.cpp new file mode 100644 index 0000000..d576718 --- /dev/null +++ b/Source/Asura.Engine/graphics/binding/image_data.binding.cpp @@ -0,0 +1,35 @@ +#include "../image.h" + +using namespace Luax; + +namespace AsuraEngine +{ + namespace Graphics + { + + void Image::RegisterLuaxInterface(LuaxState& state) + { + + } + + void Image::RegisterLuaxClass(LuaxState& state) + { + + } + + void Image::RegisterLuaxPostprocess(LuaxState& state) + { + // blendö٣AsuraEngine.EBlendMode + LuaxEnum EBlendMode[] = { + { "Additive", 1 }, + { "PreBlend", 2 }, + { "Substruction", 3 }, + { "Multiplied", 4 }, + {0, 0} + }; + + state.RegisterEnum("EBlendMode", EBlendMode); + } + + } +}
\ No newline at end of file diff --git a/Source/Asura.Engine/graphics/binding/image_data.cpp b/Source/Asura.Engine/graphics/binding/mesh2d.binding.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/graphics/binding/image_data.cpp +++ b/Source/Asura.Engine/graphics/binding/mesh2d.binding.cpp diff --git a/Source/Asura.Engine/graphics/binding/mesh2d.cpp b/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/graphics/binding/mesh2d.cpp +++ b/Source/Asura.Engine/graphics/binding/mesh2d_data.binding.cpp diff --git a/Source/Asura.Engine/graphics/binding/shader.cpp b/Source/Asura.Engine/graphics/binding/shader.binding.cpp index 27ed856..3f24bb7 100644 --- a/Source/Asura.Engine/graphics/binding/shader.cpp +++ b/Source/Asura.Engine/graphics/binding/shader.binding.cpp @@ -94,11 +94,6 @@ namespace AsuraEngine } - void Shader::RegisterLuaxClass(LuaxState& state) - { - - } - void Shader::RegisterLuaxInterface(LuaxState& state) { @@ -115,5 +110,10 @@ namespace AsuraEngine } + void Shader::RegisterLuaxPostprocess(LuaxState& state) + { + + } + } }
\ No newline at end of file diff --git a/Source/Asura.Engine/graphics/binding/mesh2d_data.cpp b/Source/Asura.Engine/graphics/binding/sprite_batch.binding.cpp index e69de29..e69de29 100644 --- a/Source/Asura.Engine/graphics/binding/mesh2d_data.cpp +++ b/Source/Asura.Engine/graphics/binding/sprite_batch.binding.cpp diff --git a/Source/Asura.Engine/graphics/binding/sprite_batch.cpp b/Source/Asura.Engine/graphics/binding/sprite_batch.cpp deleted file mode 100644 index e69de29..0000000 --- a/Source/Asura.Engine/graphics/binding/sprite_batch.cpp +++ /dev/null diff --git a/Source/Asura.Engine/graphics/binding/window.cpp b/Source/Asura.Engine/graphics/binding/window.binding.cpp index 3befc8c..3befc8c 100644 --- a/Source/Asura.Engine/graphics/binding/window.cpp +++ b/Source/Asura.Engine/graphics/binding/window.binding.cpp 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; + }; } |