summaryrefslogtreecommitdiff
path: root/source/Asura.Editor
diff options
context:
space:
mode:
Diffstat (limited to 'source/Asura.Editor')
-rw-r--r--source/Asura.Editor/Controls/GUIButton.h2
-rw-r--r--source/Asura.Editor/Controls/GUIContent.h2
-rw-r--r--source/Asura.Editor/Controls/GUILabel.h2
-rw-r--r--source/Asura.Editor/Controls/GUIPanel.h2
-rw-r--r--source/Asura.Editor/Controls/GUISlider.h2
-rw-r--r--source/Asura.Editor/Controls/GUIToggle.h2
-rw-r--r--source/Asura.Editor/Controls/TextUtil.h2
-rw-r--r--source/Asura.Editor/Core/GUIState.h2
-rw-r--r--source/Asura.Editor/Editor.h4
-rw-r--r--source/Asura.Editor/Graphics/DrawInfo.h2
-rw-r--r--source/Asura.Editor/Graphics/Drawer.h4
-rw-r--r--source/Asura.Editor/Graphics/Style.h2
-rw-r--r--source/Asura.Editor/System/ContainerWindow.h4
-rw-r--r--source/Asura.Editor/System/Input.h33
-rw-r--r--source/Asura.Editor/System/MenuController.h2
-rw-r--r--source/Asura.Editor/editor.h4
-rw-r--r--source/Asura.Editor/graphics/drawer.h4
-rw-r--r--source/Asura.Editor/graphics/style.h2
18 files changed, 24 insertions, 53 deletions
diff --git a/source/Asura.Editor/Controls/GUIButton.h b/source/Asura.Editor/Controls/GUIButton.h
index ece60ca..e1199db 100644
--- a/source/Asura.Editor/Controls/GUIButton.h
+++ b/source/Asura.Editor/Controls/GUIButton.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_BUTTON_H_
#define _ASURA_EDITOR_GUI_BUTTON_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Controls/GUIContent.h b/source/Asura.Editor/Controls/GUIContent.h
index c70a03c..88213f4 100644
--- a/source/Asura.Editor/Controls/GUIContent.h
+++ b/source/Asura.Editor/Controls/GUIContent.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_CONTENT_H_
#define _ASURA_EDITOR_GUI_CONTENT_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Controls/GUILabel.h b/source/Asura.Editor/Controls/GUILabel.h
index 172a329..d4e2d28 100644
--- a/source/Asura.Editor/Controls/GUILabel.h
+++ b/source/Asura.Editor/Controls/GUILabel.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_LABEL_H_
#define _ASURA_EDITOR_GUI_LABEL_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Controls/GUIPanel.h b/source/Asura.Editor/Controls/GUIPanel.h
index 6bcd00d..105edde 100644
--- a/source/Asura.Editor/Controls/GUIPanel.h
+++ b/source/Asura.Editor/Controls/GUIPanel.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_PANEL_H_
#define _ASURA_EDITOR_GUI_PANEL_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Controls/GUISlider.h b/source/Asura.Editor/Controls/GUISlider.h
index 8d91e85..94691c3 100644
--- a/source/Asura.Editor/Controls/GUISlider.h
+++ b/source/Asura.Editor/Controls/GUISlider.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_SLIDER_H_
#define _ASURA_EDITOR_GUI_SLIDER_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Controls/GUIToggle.h b/source/Asura.Editor/Controls/GUIToggle.h
index b26e919..64632be 100644
--- a/source/Asura.Editor/Controls/GUIToggle.h
+++ b/source/Asura.Editor/Controls/GUIToggle.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_TOGGLE_H_
#define _ASURA_EDITOR_GUI_TOGGLE_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Controls/TextUtil.h b/source/Asura.Editor/Controls/TextUtil.h
index 24fb1e1..40c5114 100644
--- a/source/Asura.Editor/Controls/TextUtil.h
+++ b/source/Asura.Editor/Controls/TextUtil.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_TEXTUTIL_H_
#define _ASURA_EDITOR_TEXTUTIL_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Core/GUIState.h b/source/Asura.Editor/Core/GUIState.h
index 0abaf58..b4fce49 100644
--- a/source/Asura.Editor/Core/GUIState.h
+++ b/source/Asura.Editor/Core/GUIState.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_STATE_H_
#define _ASURA_EDITOR_GUI_STATE_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Editor.h b/source/Asura.Editor/Editor.h
index ab91ab7..01a5b37 100644
--- a/source/Asura.Editor/Editor.h
+++ b/source/Asura.Editor/Editor.h
@@ -1,8 +1,8 @@
#ifndef _ASURA_EDITOR_H_
#define _ASURA_EDITOR_H_
-#include <asura-utils/Scripting/Portable.hpp>
-#include <asura-utils/Classes.h>
+#include <asura-base/Scripting/Scripting.h>
+#include <asura-base/Classes.h>
#include <windows.h>
diff --git a/source/Asura.Editor/Graphics/DrawInfo.h b/source/Asura.Editor/Graphics/DrawInfo.h
index ee38319..f399b41 100644
--- a/source/Asura.Editor/Graphics/DrawInfo.h
+++ b/source/Asura.Editor/Graphics/DrawInfo.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_DRAW_INFO_H_
#define _ASURA_EDITOR_DRAW_INFO_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/Graphics/Drawer.h b/source/Asura.Editor/Graphics/Drawer.h
index 638ce08..4adfa3f 100644
--- a/source/Asura.Editor/Graphics/Drawer.h
+++ b/source/Asura.Editor/Graphics/Drawer.h
@@ -1,8 +1,8 @@
#ifndef _ASURA_EDITOR_PAINTER_H_
#define _ASURA_EDITOR_PAINTER_H_
-#include <asura-utils/Scripting/Portable.hpp>
-#include <asura-utils/Singleton.hpp>
+#include <asura-base/Scripting/Scripting.h>
+#include <asura-base/Singleton.hpp>
#include <asura-core/Graphics/Image.h>
namespace AsuraEditor
diff --git a/source/Asura.Editor/Graphics/Style.h b/source/Asura.Editor/Graphics/Style.h
index b6ed2c5..2676c68 100644
--- a/source/Asura.Editor/Graphics/Style.h
+++ b/source/Asura.Editor/Graphics/Style.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_STYLE_H_
#define _ASURA_EDITOR_GUI_STYLE_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/System/ContainerWindow.h b/source/Asura.Editor/System/ContainerWindow.h
index ee72b72..5893aff 100644
--- a/source/Asura.Editor/System/ContainerWindow.h
+++ b/source/Asura.Editor/System/ContainerWindow.h
@@ -4,8 +4,8 @@
#include <windows.h>
#include <string.h>
-#include <asura-utils/Scripting/Portable.hpp>
-#include <asura-utils/Classes.h>
+#include <asura-base/Scripting/Scripting.h>
+#include <asura-base/Classes.h>
#include "../Type.h"
diff --git a/source/Asura.Editor/System/Input.h b/source/Asura.Editor/System/Input.h
index 682e69f..9401981 100644
--- a/source/Asura.Editor/System/Input.h
+++ b/source/Asura.Editor/System/Input.h
@@ -3,42 +3,13 @@
#include <windows.h>
-#include <asura-utils/Classes.h>
-#include <asura-utils/Math/Vector2.hpp>
+#include <asura-base/Classes.h>
+#include <asura-base/Math/Vector2.hpp>
#include <asura-core/Input/InputDevice.h>
namespace_begin(AsuraEditor)
-// Win32 input entry
-class Input : public AEInput::InputDevice
-{
-public:
- Input();
- ~Input();
-
- bool Open(HWND window);
- void Close(void);
-
- bool GetJoystickNames(std::vector<std::string> &names);
-
- bool Activate(bool active);
- bool ToggleFullscreen(bool fullscreen, HWND window);
-
- bool Process(bool discard);
- LRESULT OnKey(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
- LRESULT OnInput(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
- LRESULT OnDeviceChange(LPCWSTR name, bool add);
-
- static bool ConvertPositionToClientAreaCoord(HWND activeWindow, POINT position, AEMath::Vector2f& newPos);
-
-private:
-
- bool UpdateState();
-
-};
-
-extern Input g_Input;
namespace_end
diff --git a/source/Asura.Editor/System/MenuController.h b/source/Asura.Editor/System/MenuController.h
index 591cbd9..2deb21e 100644
--- a/source/Asura.Editor/System/MenuController.h
+++ b/source/Asura.Editor/System/MenuController.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_MENU_CONTROLLER_H_
#define _ASURA_EDITOR_MENU_CONTROLLER_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
diff --git a/source/Asura.Editor/editor.h b/source/Asura.Editor/editor.h
index ab91ab7..01a5b37 100644
--- a/source/Asura.Editor/editor.h
+++ b/source/Asura.Editor/editor.h
@@ -1,8 +1,8 @@
#ifndef _ASURA_EDITOR_H_
#define _ASURA_EDITOR_H_
-#include <asura-utils/Scripting/Portable.hpp>
-#include <asura-utils/Classes.h>
+#include <asura-base/Scripting/Scripting.h>
+#include <asura-base/Classes.h>
#include <windows.h>
diff --git a/source/Asura.Editor/graphics/drawer.h b/source/Asura.Editor/graphics/drawer.h
index 638ce08..4adfa3f 100644
--- a/source/Asura.Editor/graphics/drawer.h
+++ b/source/Asura.Editor/graphics/drawer.h
@@ -1,8 +1,8 @@
#ifndef _ASURA_EDITOR_PAINTER_H_
#define _ASURA_EDITOR_PAINTER_H_
-#include <asura-utils/Scripting/Portable.hpp>
-#include <asura-utils/Singleton.hpp>
+#include <asura-base/Scripting/Scripting.h>
+#include <asura-base/Singleton.hpp>
#include <asura-core/Graphics/Image.h>
namespace AsuraEditor
diff --git a/source/Asura.Editor/graphics/style.h b/source/Asura.Editor/graphics/style.h
index b6ed2c5..2676c68 100644
--- a/source/Asura.Editor/graphics/style.h
+++ b/source/Asura.Editor/graphics/style.h
@@ -1,7 +1,7 @@
#ifndef _ASURA_EDITOR_GUI_STYLE_H_
#define _ASURA_EDITOR_GUI_STYLE_H_
-#include <asura-utils/Classes.h>
+#include <asura-base/Classes.h>
namespace_begin(AsuraEditor)
generated by cgit v1.1-26-g67d0 at 2025-05-28 17:37:04 +0000