From e47baca4f23db43ec91fbf64d5d06d7c0dbee495 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 6 Apr 2019 07:39:49 +0800 Subject: *misc --- source/Asura.Editor/config.h | 0 source/Asura.Editor/core/slot.h | 2 +- source/Asura.Editor/editor.h | 9 +++- source/Asura.Editor/system/window.cpp | 13 ++++++ source/Asura.Editor/system/window.h | 82 +++++++++++++++++++++++++++++++++++ source/Asura.Editor/type.h | 30 +++++++++++++ 6 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 source/Asura.Editor/config.h create mode 100644 source/Asura.Editor/system/window.cpp create mode 100644 source/Asura.Editor/system/window.h create mode 100644 source/Asura.Editor/type.h (limited to 'source/Asura.Editor') diff --git a/source/Asura.Editor/config.h b/source/Asura.Editor/config.h new file mode 100644 index 0000000..e69de29 diff --git a/source/Asura.Editor/core/slot.h b/source/Asura.Editor/core/slot.h index b62f406..f569cfe 100644 --- a/source/Asura.Editor/core/slot.h +++ b/source/Asura.Editor/core/slot.h @@ -4,7 +4,7 @@ #include #include -#include "../widgets/widget.h" +#include "../controls/widget.h" namespace AsuraEditor { diff --git a/source/Asura.Editor/editor.h b/source/Asura.Editor/editor.h index b086532..fbcfb62 100644 --- a/source/Asura.Editor/editor.h +++ b/source/Asura.Editor/editor.h @@ -21,9 +21,14 @@ namespace AsuraEditor private: /// - /// 界面和逻辑运行的state。 + /// 界面和逻辑运行的虚拟机。 /// - lua_State* mMainState; + Luax::LuaxVM* mEditorVM; + + /// + /// 游戏运行时的虚拟机。 + /// + Luax::LuaxVM* mRunnerVM; }; diff --git a/source/Asura.Editor/system/window.cpp b/source/Asura.Editor/system/window.cpp new file mode 100644 index 0000000..440c88c --- /dev/null +++ b/source/Asura.Editor/system/window.cpp @@ -0,0 +1,13 @@ +#include "window.h" + +namespace AsuraEditor +{ + + bool Window::Init(int posx, uint posy, uint w, uint h) + { + if (mHWND) + return false; + + } + +} \ No newline at end of file diff --git a/source/Asura.Editor/system/window.h b/source/Asura.Editor/system/window.h new file mode 100644 index 0000000..c9837e3 --- /dev/null +++ b/source/Asura.Editor/system/window.h @@ -0,0 +1,82 @@ +#ifndef __ASURA_EDITOR_WINDOW_H__ +#define __ASURA_EDITOR_WINDOW_H__ + +#include +#include + +#include + +#include "../type.h" + +namespace AsuraEditor +{ + + /// + /// 窗口风格,只指明了框架的风格,具体的控件由应用程序绘制。 + /// + enum WindowStyle + { + WINDOW_STYLE_BASIC, ///< 基础风格 + WINDOW_STYLE_TOOL, ///< 工具栏风格 + WINDOW_STYLE_CONFIRM, ///< 确认窗口 + }; + + /// + /// 创建窗口时需要的配置项。 + /// + struct WindowConfig + { + std::string title; ///< 标题 + uint x, y; ///< 坐标 + uint width, height; ///< 大小 + WindowStyle style; ///< 风格 + }; + + /// + /// 编辑器创建的win32窗口,每一个窗口包含一个HWND和一个HDC + /// + class Window + : public AEScripting::Portable + { + public: + + Window(); + ~Window(); + + bool Init(WindowConfig& config); + + private: + + //------------------------------------------------------------------------------// + + LUAX_DECL_FACTORY(Window); + + LUAX_DECL_ENUM(WindowStyle); + + LUAX_DECL_METHOD(_New); + LUAX_DECL_METHOD(_Init); + LUAX_DECL_METHOD(_SetPosition); + + //------------------------------------------------------------------------------// + + /// + /// 父窗口。 + /// + Window* mParent; + + /// + /// 窗口句柄和设备上下文。 + /// + HWND mHWND; + HDC mHDC; + + /// + /// 窗口风格。 + /// + WindowStyle mStyle; + + }; + +} + +#endif \ No newline at end of file diff --git a/source/Asura.Editor/type.h b/source/Asura.Editor/type.h new file mode 100644 index 0000000..d58cf87 --- /dev/null +++ b/source/Asura.Editor/type.h @@ -0,0 +1,30 @@ +#ifndef __ASURA_EDITOR_TYPE_H__ +#define __ASURA_EDITOR_TYPE_H__ + +#include +#include + +namespace AsuraEditor +{ + + typedef int8_t int8; + typedef uint8_t uint8; + //typedef uint8 byte; + typedef char byte; + typedef int16_t int16; + typedef uint16_t uint16; + typedef int32_t int32; + typedef uint32_t uint32; + typedef int64_t int64; + typedef uint64_t uint64; + + typedef uint32_t uint; + typedef int32_t sint; + + typedef std::size_t size_t; + + typedef const char cc8; + +} + +#endif \ No newline at end of file -- cgit v1.1-26-g67d0