diff options
Diffstat (limited to 'source/libs/asura-lib-core')
-rw-r--r-- | source/libs/asura-lib-core/graphics/binding/_image.cpp | 4 | ||||
-rw-r--r-- | source/libs/asura-lib-core/graphics/image.h | 9 | ||||
-rw-r--r-- | source/libs/asura-lib-core/graphics/shader.h | 2 | ||||
-rw-r--r-- | source/libs/asura-lib-core/input/mouse.h | 4 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window.cpp (renamed from source/libs/asura-lib-core/graphics/window.cpp) | 0 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window.h (renamed from source/libs/asura-lib-core/graphics/window.h) | 4 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window_impl_glew.cpp (renamed from source/libs/asura-lib-core/graphics/window_impl_glew.cpp) | 0 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window_impl_glew.h (renamed from source/libs/asura-lib-core/graphics/window_impl_glew.h) | 0 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window_impl_glut.cpp (renamed from source/libs/asura-lib-core/graphics/window_impl_glut.cpp) | 0 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window_impl_glut.h (renamed from source/libs/asura-lib-core/graphics/window_impl_glut.h) | 0 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window_impl_sdl.cpp (renamed from source/libs/asura-lib-core/graphics/window_impl_sdl.cpp) | 0 | ||||
-rw-r--r-- | source/libs/asura-lib-core/window/window_impl_sdl.h (renamed from source/libs/asura-lib-core/graphics/window_impl_sdl.h) | 0 |
12 files changed, 12 insertions, 11 deletions
diff --git a/source/libs/asura-lib-core/graphics/binding/_image.cpp b/source/libs/asura-lib-core/graphics/binding/_image.cpp index b455ad5..cb008d3 100644 --- a/source/libs/asura-lib-core/graphics/binding/_image.cpp +++ b/source/libs/asura-lib-core/graphics/binding/_image.cpp @@ -80,8 +80,8 @@ namespace AsuraEngine { LUAX_PREPARE(L, Image); - uint x = state.CheckParam<uint>(2); - uint y = state.CheckParam<uint>(3); + uint x = state.CheckValue<uint>(2); + uint y = state.CheckValue<uint>(3); Color32* c32 = new Color32(self->GetPixel(x, y)); c32->PushLuaxUserdata(state); return 1; diff --git a/source/libs/asura-lib-core/graphics/image.h b/source/libs/asura-lib-core/graphics/image.h index 4c1c7b5..4d9787b 100644 --- a/source/libs/asura-lib-core/graphics/image.h +++ b/source/libs/asura-lib-core/graphics/image.h @@ -22,8 +22,9 @@ namespace AsuraEngine class ImageFactory; /// - /// ImageͼƬڴȡϷĽһImageڴ桢ԴֻᱣһݣҪ - /// imageêλãźתǶȣʹspriteһֻࡣҪǿǵeditorengineʹòͬķװ + /// ImageͼƬڴȡϷĽһImageڴ桢Դֻᱣһ + /// ݣҪimageêλãźתǶȣʹsprite + /// һֻࡣҪǿǵeditorengineʹòͬķװ /// class Image ASURA_FINAL : public Drawable @@ -39,8 +40,8 @@ namespace AsuraEngine ~Image(); /// - /// bufferimageϢmPixelsΪգݡ¹imageʹglTexImage2Dύimage - /// ݡ + /// bufferimageϢmPixelsΪգݡ¹image + /// ʹglTexImage2Dύimageݡ /// bool Load(ImageData* data); diff --git a/source/libs/asura-lib-core/graphics/shader.h b/source/libs/asura-lib-core/graphics/shader.h index 575a37e..1c81355 100644 --- a/source/libs/asura-lib-core/graphics/shader.h +++ b/source/libs/asura-lib-core/graphics/shader.h @@ -94,7 +94,7 @@ namespace AsuraEngine /// GLuint mProgramHandle; - //------------------------------------------------------------------------------------------------------------ + //------------------------------------------------------------------------------// public: diff --git a/source/libs/asura-lib-core/input/mouse.h b/source/libs/asura-lib-core/input/mouse.h index 0f34fdd..3ab67fa 100644 --- a/source/libs/asura-lib-core/input/mouse.h +++ b/source/libs/asura-lib-core/input/mouse.h @@ -1,8 +1,8 @@ #ifndef __ASURA_ENGINE_MOUSE_H__ #define __ASURA_ENGINE_MOUSE_H__ -#include "Cursor.h" -#include "InputDevice.hpp" +#include "cursor.h" +#include "input_device.hpp" namespace AsuraEngine { diff --git a/source/libs/asura-lib-core/graphics/window.cpp b/source/libs/asura-lib-core/window/window.cpp index 83a4f53..83a4f53 100644 --- a/source/libs/asura-lib-core/graphics/window.cpp +++ b/source/libs/asura-lib-core/window/window.cpp diff --git a/source/libs/asura-lib-core/graphics/window.h b/source/libs/asura-lib-core/window/window.h index 1b219a2..39db73e 100644 --- a/source/libs/asura-lib-core/graphics/window.h +++ b/source/libs/asura-lib-core/window/window.h @@ -4,8 +4,8 @@ #include <asura-lib-utils/scripting/portable.hpp> #include <asura-lib-utils/math/vector2.hpp> -#include "render_state.h" -#include "render_target.h" +#include "../graphics/render_state.h" +#include "../graphics/render_target.h" namespace AsuraEngine { diff --git a/source/libs/asura-lib-core/graphics/window_impl_glew.cpp b/source/libs/asura-lib-core/window/window_impl_glew.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/window_impl_glew.cpp +++ b/source/libs/asura-lib-core/window/window_impl_glew.cpp diff --git a/source/libs/asura-lib-core/graphics/window_impl_glew.h b/source/libs/asura-lib-core/window/window_impl_glew.h index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/window_impl_glew.h +++ b/source/libs/asura-lib-core/window/window_impl_glew.h diff --git a/source/libs/asura-lib-core/graphics/window_impl_glut.cpp b/source/libs/asura-lib-core/window/window_impl_glut.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/window_impl_glut.cpp +++ b/source/libs/asura-lib-core/window/window_impl_glut.cpp diff --git a/source/libs/asura-lib-core/graphics/window_impl_glut.h b/source/libs/asura-lib-core/window/window_impl_glut.h index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/window_impl_glut.h +++ b/source/libs/asura-lib-core/window/window_impl_glut.h diff --git a/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp b/source/libs/asura-lib-core/window/window_impl_sdl.cpp index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/window_impl_sdl.cpp +++ b/source/libs/asura-lib-core/window/window_impl_sdl.cpp diff --git a/source/libs/asura-lib-core/graphics/window_impl_sdl.h b/source/libs/asura-lib-core/window/window_impl_sdl.h index e69de29..e69de29 100644 --- a/source/libs/asura-lib-core/graphics/window_impl_sdl.h +++ b/source/libs/asura-lib-core/window/window_impl_sdl.h |