From 039ab8cc0fd8cb7ed726b88363b391ccea1354fc Mon Sep 17 00:00:00 2001 From: karutoh Date: Sun, 14 Jan 2024 09:38:57 -0800 Subject: [PATCH] Changed project structure. --- CMakeLists.txt | 287 +++++++++--------- include/Dock.h | 7 - include/{ => ehs}/Anchor.h | 0 include/{ => ehs}/Array.h | 22 +- include/{ => ehs}/Base64.h | 0 include/{ => ehs}/BaseObj.h | 0 include/{ => ehs}/Color3.h | 0 include/{ => ehs}/Color4.h | 0 include/{ => ehs}/Data.h | 0 include/{ => ehs}/DataType.h | 0 include/ehs/Dock.h | 10 + include/{ => ehs}/EHS.h | 2 +- include/{ => ehs}/Encryption.h | 0 include/{ => ehs}/GarbageCollector.h | 4 +- include/{ => ehs}/HRNG.h | 0 include/{ => ehs}/HashMap.h | 0 include/{ => ehs}/Link.h | 0 include/{ => ehs}/LinkedList.h | 0 include/{ => ehs}/Log.h | 0 include/{ => ehs}/Mat2.h | 0 include/{ => ehs}/Mat3.h | 0 include/{ => ehs}/Mat4.h | 0 include/{ => ehs}/Math.h | 2 +- include/{ => ehs}/PRNG.h | 0 include/{ => ehs}/PtrData.h | 0 include/{ => ehs}/Quat.h | 0 include/{ => ehs}/Range.h | 0 include/{ => ehs}/Rect.h | 0 include/{ => ehs}/SArray.h | 0 include/{ => ehs}/Serializer.h | 0 include/{ => ehs}/ShdPtr.h | 0 include/{ => ehs}/Str.h | 0 include/{ => ehs}/Task.h | 4 +- include/{ => ehs}/Type.h | 0 include/{ => ehs}/Types.h | 2 +- include/{ => ehs}/URI.h | 0 include/{ => ehs}/UTF.h | 0 include/{ => ehs}/UniPtr.h | 0 include/{ => ehs}/Util.h | 0 include/{ => ehs}/Vec2.h | 0 include/{ => ehs}/Vec3.h | 0 include/{ => ehs}/Vec4.h | 0 include/{ => ehs}/Vector.h | 18 +- include/{ => ehs}/Version.h | 0 include/{ => ehs}/WkPtr.h | 0 include/{ => ehs}/database/DVar.h | 6 +- include/{ => ehs}/io/BaseFile.h | 10 +- include/{ => ehs}/io/BaseFileMonitor.h | 4 +- include/{ => ehs}/io/BaseWindow.h | 10 +- include/{ => ehs}/io/COM.h | 2 +- include/{ => ehs}/io/Console.h | 6 +- include/{ => ehs}/io/File.h | 2 +- include/{ => ehs}/io/FileMonitor.h | 0 include/{ => ehs}/io/FileMonitor_UNX.h | 2 +- include/{ => ehs}/io/FileMonitor_W32.h | 2 +- include/{ => ehs}/io/File_UNX.h | 12 +- include/{ => ehs}/io/File_W32.h | 12 +- include/{ => ehs}/io/FontAtlas.h | 10 +- include/{ => ehs}/io/Glyph.h | 8 +- include/{ => ehs}/io/RIFF.h | 8 +- include/{ => ehs}/io/RIFF_Chunk.h | 6 +- include/{ => ehs}/io/Window.h | 2 +- include/{ => ehs}/io/Window_W32.h | 8 +- include/{ => ehs}/io/Window_Way.h | 0 include/{ => ehs}/io/Window_XCB.h | 26 +- include/{ => ehs}/io/audio/Audio.h | 14 +- include/{ => ehs}/io/audio/AudioCodec.h | 6 +- include/{ => ehs}/io/audio/AudioDevice.h | 2 +- include/{ => ehs}/io/audio/AudioDevice_ALSA.h | 2 +- include/{ => ehs}/io/audio/AudioDevice_W32.h | 2 +- include/{ => ehs}/io/audio/BaseAudioDevice.h | 10 +- include/{ => ehs}/io/hid/Button.h | 4 +- include/{ => ehs}/io/hid/ButtonState.h | 2 +- include/{ => ehs}/io/hid/HID.h | 2 +- include/{ => ehs}/io/hid/Input.h | 4 +- include/{ => ehs}/io/hid/InputHandler.h | 2 +- include/{ => ehs}/io/hid/Keyboard.h | 2 +- include/{ => ehs}/io/hid/Mouse.h | 4 +- include/{ => ehs}/io/img/Img.h | 6 +- include/{ => ehs}/io/img/ImgCodec.h | 6 +- include/{ => ehs}/io/img/PNG.h | 4 +- include/{ => ehs}/io/img/PNG_Chunk.h | 6 +- include/{ => ehs}/io/model/AnimBone.h | 4 +- include/{ => ehs}/io/model/Animation.h | 6 +- include/{ => ehs}/io/model/Bone.h | 6 +- include/{ => ehs}/io/model/KeyFrame.h | 10 +- include/{ => ehs}/io/model/Mesh.h | 10 +- include/{ => ehs}/io/model/Model.h | 6 +- include/{ => ehs}/io/model/PropertyChange.h | 2 +- include/{ => ehs}/io/model/Vertex.h | 10 +- include/{ => ehs}/io/socket/BaseTCP.h | 4 +- include/{ => ehs}/io/socket/BaseUDP.h | 4 +- include/{ => ehs}/io/socket/Comms.h | 12 +- include/{ => ehs}/io/socket/CommsSystem.h | 8 +- include/{ => ehs}/io/socket/DNS.h | 4 +- include/{ => ehs}/io/socket/Endpoint.h | 12 +- include/{ => ehs}/io/socket/Fragments.h | 4 +- include/{ => ehs}/io/socket/Operation.h | 6 +- include/{ => ehs}/io/socket/Request.h | 8 +- include/{ => ehs}/io/socket/Response.h | 8 +- include/{ => ehs}/io/socket/SSL.h | 4 +- include/{ => ehs}/io/socket/Socket.h | 0 include/{ => ehs}/io/socket/TCP.h | 0 include/{ => ehs}/io/socket/TCP_BSD.h | 6 +- include/{ => ehs}/io/socket/TCP_W32.h | 6 +- include/{ => ehs}/io/socket/UDP.h | 0 include/{ => ehs}/io/socket/UDP_BSD.h | 4 +- include/{ => ehs}/io/socket/UDP_W32.h | 4 +- include/{ => ehs}/io/socket/Utils.h | 4 +- include/{ => ehs}/io/socket/rest/Spotify.h | 8 +- include/{ => ehs}/io/socket/rest/Twitch.h | 6 +- include/{ => ehs}/io/socket/rest/TwitchChat.h | 6 +- .../{ => ehs}/io/xdg-shell-client-protocol.h | 0 include/{ => ehs}/json/Json.h | 4 +- include/{ => ehs}/json/JsonArray.h | 4 +- include/{ => ehs}/json/JsonBase.h | 4 +- include/{ => ehs}/json/JsonBool.h | 4 +- include/{ => ehs}/json/JsonNum.h | 4 +- include/{ => ehs}/json/JsonObj.h | 4 +- include/{ => ehs}/json/JsonStr.h | 4 +- include/{ => ehs}/json/JsonVar.h | 4 +- include/{ => ehs}/system/Architecture.h | 0 include/{ => ehs}/system/BaseMutex.h | 2 +- include/{ => ehs}/system/BaseOpen.h | 2 +- include/{ => ehs}/system/BaseSemaphore.h | 4 +- include/{ => ehs}/system/BaseSystem.h | 4 +- include/{ => ehs}/system/CPU.h | 6 +- include/{ => ehs}/system/FileSystem.h | 4 +- include/{ => ehs}/system/Mutex.h | 2 +- include/{ => ehs}/system/Mutex_PT.h | 2 +- include/{ => ehs}/system/Mutex_W32.h | 2 +- include/{ => ehs}/system/OS.h | 0 include/{ => ehs}/system/Open.h | 0 include/{ => ehs}/system/Open_UNX.h | 0 include/{ => ehs}/system/Open_W32.h | 0 include/{ => ehs}/system/Semaphore.h | 0 include/{ => ehs}/system/Semaphore_P.h | 4 +- include/{ => ehs}/system/Semaphore_W32.h | 4 +- include/{ => ehs}/system/System.h | 2 +- include/{ => ehs}/system/System_LNX.h | 2 +- include/{ => ehs}/system/System_W32.h | 0 include/{ => ehs}/system/Thread.h | 10 +- include/{ => ehs}/system/User.h | 4 +- src/Base64.cpp | 2 +- src/BaseObj.cpp | 2 +- src/Color3.cpp | 4 +- src/Color4.cpp | 4 +- src/Data.cpp | 2 +- src/DataType.cpp | 2 +- src/EHS.cpp | 16 +- src/Encryption.cpp | 4 +- src/GarbageCollector.cpp | 2 +- src/HRNG_ARM64.cpp | 2 +- src/Log.cpp | 2 +- src/Math.cpp | 4 +- src/PtrData.cpp | 2 +- src/Range.cpp | 2 +- src/StrToHash.cpp | 6 +- src/Task.cpp | 2 +- src/Type.cpp | 2 +- src/URI.cpp | 2 +- src/Util.cpp | 2 +- src/Version.cpp | 2 +- src/database/DVar.cpp | 2 +- src/io/BaseFile.cpp | 2 +- src/io/BaseFileMonitor.cpp | 2 +- src/io/BaseWindow.cpp | 2 +- src/io/COM.cpp | 4 +- src/io/Console.cpp | 6 +- src/io/FileMonitor_UNX.cpp | 4 +- src/io/FileMonitor_W32.cpp | 4 +- src/io/File_UNX.cpp | 2 +- src/io/FontAtlas.cpp | 6 +- src/io/Glyph.cpp | 2 +- src/io/RIFF.cpp | 4 +- src/io/RIFF_Chunk.cpp | 2 +- src/io/Window_XCB.cpp | 91 +++++- src/io/audio/Audio.cpp | 6 +- src/io/audio/AudioCodec.cpp | 2 +- src/io/audio/AudioDevice_ALSA.cpp | 6 +- src/io/audio/AudioDevice_W32.cpp | 2 +- src/io/audio/BaseAudioDevice.cpp | 2 +- src/io/hid/Button.cpp | 2 +- src/io/hid/ButtonState.cpp | 2 +- src/io/hid/HID.cpp | 2 +- src/io/hid/Input.cpp | 2 +- src/io/hid/InputHandler.cpp | 2 +- src/io/hid/Keyboard.cpp | 2 +- src/io/hid/Mouse.cpp | 2 +- src/io/img/Img.cpp | 2 +- src/io/img/ImgCodec.cpp | 4 +- src/io/img/PNG.cpp | 2 +- src/io/img/PNG_Chunk.cpp | 2 +- src/io/model/AnimBone.cpp | 2 +- src/io/model/Animation.cpp | 2 +- src/io/model/Bone.cpp | 2 +- src/io/model/KeyFrame.cpp | 2 +- src/io/model/Mesh.cpp | 6 +- src/io/model/Model.cpp | 2 +- src/io/model/PropertyChange.cpp | 2 +- src/io/socket/BaseTCP.cpp | 4 +- src/io/socket/BaseUDP.cpp | 2 +- src/io/socket/Comms.cpp | 8 +- src/io/socket/CommsSystem.cpp | 8 +- src/io/socket/DNS.cpp | 4 +- src/io/socket/Endpoint.cpp | 8 +- src/io/socket/Fragments.cpp | 2 +- src/io/socket/Operation.cpp | 8 +- src/io/socket/Request.cpp | 4 +- src/io/socket/Response.cpp | 2 +- src/io/socket/SSL.cpp | 2 +- src/io/socket/Socket.cpp | 2 +- src/io/socket/TCP_BSD.cpp | 4 +- src/io/socket/UDP_BSD.cpp | 4 +- src/io/socket/UDP_W32.cpp | 2 +- src/io/socket/rest/Spotify.cpp | 8 +- src/io/socket/rest/Twitch.cpp | 8 +- src/io/socket/rest/TwitchChat.cpp | 6 +- src/json/Json.cpp | 4 +- src/json/JsonArray.cpp | 10 +- src/json/JsonBase.cpp | 2 +- src/json/JsonBool.cpp | 2 +- src/json/JsonNum.cpp | 2 +- src/json/JsonObj.cpp | 4 +- src/json/JsonStr.cpp | 2 +- src/json/JsonVar.cpp | 14 +- src/system/BaseMutex.cpp | 2 +- src/system/BaseOpen.cpp | 2 +- src/system/BaseSemaphore.cpp | 2 +- src/system/BaseSystem.cpp | 2 +- src/system/CPU.cpp | 10 +- src/system/FileSystem.cpp | 4 +- src/system/Mutex_PT.cpp | 2 +- src/system/Mutex_W32.cpp | 4 +- src/system/Open_UNX.cpp | 4 +- src/system/Semaphore_P.cpp | 4 +- src/system/Semaphore_W32.cpp | 4 +- src/system/System_LNX.cpp | 6 +- src/system/Thread.cpp | 4 +- src/system/User.cpp | 4 +- 240 files changed, 696 insertions(+), 573 deletions(-) delete mode 100644 include/Dock.h rename include/{ => ehs}/Anchor.h (100%) rename include/{ => ehs}/Array.h (95%) rename include/{ => ehs}/Base64.h (100%) rename include/{ => ehs}/BaseObj.h (100%) rename include/{ => ehs}/Color3.h (100%) rename include/{ => ehs}/Color4.h (100%) rename include/{ => ehs}/Data.h (100%) rename include/{ => ehs}/DataType.h (100%) create mode 100644 include/ehs/Dock.h rename include/{ => ehs}/EHS.h (98%) rename include/{ => ehs}/Encryption.h (100%) rename include/{ => ehs}/GarbageCollector.h (95%) rename include/{ => ehs}/HRNG.h (100%) rename include/{ => ehs}/HashMap.h (100%) rename include/{ => ehs}/Link.h (100%) rename include/{ => ehs}/LinkedList.h (100%) rename include/{ => ehs}/Log.h (100%) rename include/{ => ehs}/Mat2.h (100%) rename include/{ => ehs}/Mat3.h (100%) rename include/{ => ehs}/Mat4.h (100%) rename include/{ => ehs}/Math.h (99%) rename include/{ => ehs}/PRNG.h (100%) rename include/{ => ehs}/PtrData.h (100%) rename include/{ => ehs}/Quat.h (100%) rename include/{ => ehs}/Range.h (100%) rename include/{ => ehs}/Rect.h (100%) rename include/{ => ehs}/SArray.h (100%) rename include/{ => ehs}/Serializer.h (100%) rename include/{ => ehs}/ShdPtr.h (100%) rename include/{ => ehs}/Str.h (100%) rename include/{ => ehs}/Task.h (91%) rename include/{ => ehs}/Type.h (100%) rename include/{ => ehs}/Types.h (98%) rename include/{ => ehs}/URI.h (100%) rename include/{ => ehs}/UTF.h (100%) rename include/{ => ehs}/UniPtr.h (100%) rename include/{ => ehs}/Util.h (100%) rename include/{ => ehs}/Vec2.h (100%) rename include/{ => ehs}/Vec3.h (100%) rename include/{ => ehs}/Vec4.h (100%) rename include/{ => ehs}/Vector.h (97%) rename include/{ => ehs}/Version.h (100%) rename include/{ => ehs}/WkPtr.h (100%) rename include/{ => ehs}/database/DVar.h (68%) rename include/{ => ehs}/io/BaseFile.h (98%) rename include/{ => ehs}/io/BaseFileMonitor.h (94%) rename include/{ => ehs}/io/BaseWindow.h (95%) rename include/{ => ehs}/io/COM.h (97%) rename include/{ => ehs}/io/Console.h (98%) rename include/{ => ehs}/io/File.h (85%) rename include/{ => ehs}/io/FileMonitor.h (100%) rename include/{ => ehs}/io/FileMonitor_UNX.h (96%) rename include/{ => ehs}/io/FileMonitor_W32.h (96%) rename include/{ => ehs}/io/File_UNX.h (90%) rename include/{ => ehs}/io/File_W32.h (90%) rename include/{ => ehs}/io/FontAtlas.h (85%) rename include/{ => ehs}/io/Glyph.h (90%) rename include/{ => ehs}/io/RIFF.h (84%) rename include/{ => ehs}/io/RIFF_Chunk.h (85%) rename include/{ => ehs}/io/Window.h (89%) rename include/{ => ehs}/io/Window_W32.h (97%) rename include/{ => ehs}/io/Window_Way.h (100%) rename include/{ => ehs}/io/Window_XCB.h (64%) rename include/{ => ehs}/io/audio/Audio.h (96%) rename include/{ => ehs}/io/audio/AudioCodec.h (93%) rename include/{ => ehs}/io/audio/AudioDevice.h (86%) rename include/{ => ehs}/io/audio/AudioDevice_ALSA.h (97%) rename include/{ => ehs}/io/audio/AudioDevice_W32.h (98%) rename include/{ => ehs}/io/audio/BaseAudioDevice.h (94%) rename include/{ => ehs}/io/hid/Button.h (89%) rename include/{ => ehs}/io/hid/ButtonState.h (97%) rename include/{ => ehs}/io/hid/HID.h (98%) rename include/{ => ehs}/io/hid/Input.h (92%) rename include/{ => ehs}/io/hid/InputHandler.h (97%) rename include/{ => ehs}/io/hid/Keyboard.h (99%) rename include/{ => ehs}/io/hid/Mouse.h (95%) rename include/{ => ehs}/io/img/Img.h (98%) rename include/{ => ehs}/io/img/ImgCodec.h (93%) rename include/{ => ehs}/io/img/PNG.h (96%) rename include/{ => ehs}/io/img/PNG_Chunk.h (86%) rename include/{ => ehs}/io/model/AnimBone.h (93%) rename include/{ => ehs}/io/model/Animation.h (92%) rename include/{ => ehs}/io/model/Bone.h (95%) rename include/{ => ehs}/io/model/KeyFrame.h (88%) rename include/{ => ehs}/io/model/Mesh.h (90%) rename include/{ => ehs}/io/model/Model.h (94%) rename include/{ => ehs}/io/model/PropertyChange.h (94%) rename include/{ => ehs}/io/model/Vertex.h (90%) rename include/{ => ehs}/io/socket/BaseTCP.h (98%) rename include/{ => ehs}/io/socket/BaseUDP.h (95%) rename include/{ => ehs}/io/socket/Comms.h (96%) rename include/{ => ehs}/io/socket/CommsSystem.h (86%) rename include/{ => ehs}/io/socket/DNS.h (80%) rename include/{ => ehs}/io/socket/Endpoint.h (96%) rename include/{ => ehs}/io/socket/Fragments.h (92%) rename include/{ => ehs}/io/socket/Operation.h (87%) rename include/{ => ehs}/io/socket/Request.h (98%) rename include/{ => ehs}/io/socket/Response.h (97%) rename include/{ => ehs}/io/socket/SSL.h (96%) rename include/{ => ehs}/io/socket/Socket.h (100%) rename include/{ => ehs}/io/socket/TCP.h (100%) rename include/{ => ehs}/io/socket/TCP_BSD.h (98%) rename include/{ => ehs}/io/socket/TCP_W32.h (98%) rename include/{ => ehs}/io/socket/UDP.h (100%) rename include/{ => ehs}/io/socket/UDP_BSD.h (98%) rename include/{ => ehs}/io/socket/UDP_W32.h (98%) rename include/{ => ehs}/io/socket/Utils.h (94%) rename include/{ => ehs}/io/socket/rest/Spotify.h (96%) rename include/{ => ehs}/io/socket/rest/Twitch.h (87%) rename include/{ => ehs}/io/socket/rest/TwitchChat.h (90%) rename include/{ => ehs}/io/xdg-shell-client-protocol.h (100%) rename include/{ => ehs}/json/Json.h (97%) rename include/{ => ehs}/json/JsonArray.h (96%) rename include/{ => ehs}/json/JsonBase.h (89%) rename include/{ => ehs}/json/JsonBool.h (88%) rename include/{ => ehs}/json/JsonNum.h (93%) rename include/{ => ehs}/json/JsonObj.h (96%) rename include/{ => ehs}/json/JsonStr.h (91%) rename include/{ => ehs}/json/JsonVar.h (97%) rename include/{ => ehs}/system/Architecture.h (100%) rename include/{ => ehs}/system/BaseMutex.h (95%) rename include/{ => ehs}/system/BaseOpen.h (95%) rename include/{ => ehs}/system/BaseSemaphore.h (94%) rename include/{ => ehs}/system/BaseSystem.h (71%) rename include/{ => ehs}/system/CPU.h (98%) rename include/{ => ehs}/system/FileSystem.h (86%) rename include/{ => ehs}/system/Mutex.h (85%) rename include/{ => ehs}/system/Mutex_PT.h (95%) rename include/{ => ehs}/system/Mutex_W32.h (94%) rename include/{ => ehs}/system/OS.h (100%) rename include/{ => ehs}/system/Open.h (100%) rename include/{ => ehs}/system/Open_UNX.h (100%) rename include/{ => ehs}/system/Open_W32.h (100%) rename include/{ => ehs}/system/Semaphore.h (100%) rename include/{ => ehs}/system/Semaphore_P.h (94%) rename include/{ => ehs}/system/Semaphore_W32.h (93%) rename include/{ => ehs}/system/System.h (85%) rename include/{ => ehs}/system/System_LNX.h (87%) rename include/{ => ehs}/system/System_W32.h (100%) rename include/{ => ehs}/system/Thread.h (97%) rename include/{ => ehs}/system/User.h (82%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49a9708..b87f685 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,175 +39,176 @@ endif () set(CMAKE_CXX_STANDARD 20) set(EHS_SOURCES - src/EHS.cpp include/EHS.h - src/Type.cpp include/Type.h - src/BaseObj.cpp include/BaseObj.h - src/GarbageCollector.cpp include/GarbageCollector.h - src/Log.cpp include/Log.h - src/URI.cpp include/URI.h - src/Math.cpp include/Math.h - src/Color4.cpp include/Color4.h - src/Color3.cpp include/Color3.h - src/Version.cpp include/Version.h - src/Base64.cpp include/Base64.h - src/Data.cpp include/Data.h - src/Range.cpp include/Range.h - src/Util.cpp include/Util.h - src/Task.cpp include/Task.h - src/DataType.cpp include/DataType.h - src/Encryption.cpp include/Encryption.h - include/Anchor.h - include/Dock.h - include/HashMap.h - include/HRNG.h - include/Link.h - include/LinkedList.h - include/Mat2.h - include/Mat3.h - include/Mat4.h - include/PRNG.h - include/Quat.h - include/Rect.h - include/Str.h - include/Types.h - include/UTF.h - include/Vec2.h - include/Vec3.h - include/Vec4.h - include/Serializer.h - include/Array.h - include/Vector.h - include/SArray.h - src/PtrData.cpp include/PtrData.h - include/UniPtr.h - include/ShdPtr.h - include/WkPtr.h + src/EHS.cpp include/ehs/EHS.h + src/Type.cpp include/ehs/Type.h + src/BaseObj.cpp include/ehs/BaseObj.h + src/GarbageCollector.cpp include/ehs/GarbageCollector.h + src/Log.cpp include/ehs/Log.h + src/URI.cpp include/ehs/URI.h + src/Math.cpp include/ehs/Math.h + src/Color4.cpp include/ehs/Color4.h + src/Color3.cpp include/ehs/Color3.h + src/Version.cpp include/ehs/Version.h + src/Base64.cpp include/ehs/Base64.h + src/Data.cpp include/ehs/Data.h + src/Range.cpp include/ehs/Range.h + src/Util.cpp include/ehs/Util.h + src/Task.cpp include/ehs/Task.h + src/DataType.cpp include/ehs/DataType.h + src/Encryption.cpp include/ehs/Encryption.h + include/ehs/Anchor.h + include/ehs/Dock.h + include/ehs/HashMap.h + include/ehs/HRNG.h + include/ehs/Link.h + include/ehs/LinkedList.h + include/ehs/Mat2.h + include/ehs/Mat3.h + include/ehs/Mat4.h + include/ehs/PRNG.h + include/ehs/Quat.h + include/ehs/Rect.h + include/ehs/Str.h + include/ehs/Types.h + include/ehs/UTF.h + include/ehs/Vec2.h + include/ehs/Vec3.h + include/ehs/Vec4.h + include/ehs/Serializer.h + include/ehs/Array.h + include/ehs/Vector.h + include/ehs/SArray.h + src/PtrData.cpp include/ehs/PtrData.h + include/ehs/UniPtr.h + include/ehs/ShdPtr.h + include/ehs/WkPtr.h - src/database/DVar.cpp include/database/DVar.h + src/database/DVar.cpp include/ehs/database/DVar.h - src/system/CPU.cpp include/system/CPU.h - src/system/Thread.cpp include/system/Thread.h - src/system/BaseMutex.cpp include/system/BaseMutex.h - src/system/BaseSemaphore.cpp include/system/BaseSemaphore.h - src/system/BaseSystem.cpp include/system/BaseSystem.h - src/system/BaseOpen.cpp include/system/BaseOpen.h - include/system/Architecture.h - include/system/Mutex.h - include/system/Open.h - include/system/OS.h - include/system/Semaphore.h - include/system/System.h + src/system/CPU.cpp include/ehs/system/CPU.h + src/system/Thread.cpp include/ehs/system/Thread.h + src/system/BaseMutex.cpp include/ehs/system/BaseMutex.h + src/system/BaseSemaphore.cpp include/ehs/system/BaseSemaphore.h + src/system/BaseSystem.cpp include/ehs/system/BaseSystem.h + src/system/BaseOpen.cpp include/ehs/system/BaseOpen.h + include/ehs/system/Architecture.h + include/ehs/system/Mutex.h + include/ehs/system/Open.h + include/ehs/system/OS.h + include/ehs/system/Semaphore.h + include/ehs/system/System.h - src/json/Json.cpp include/json/Json.h - src/json/JsonBase.cpp include/json/JsonBase.h - src/json/JsonNum.cpp include/json/JsonNum.h - src/json/JsonBool.cpp include/json/JsonBool.h - src/json/JsonStr.cpp include/json/JsonStr.h - src/json/JsonObj.cpp include/json/JsonObj.h - src/json/JsonArray.cpp include/json/JsonArray.h - src/json/JsonVar.cpp include/json/JsonVar.h + src/json/Json.cpp include/ehs/json/Json.h + src/json/JsonBase.cpp include/ehs/json/JsonBase.h + src/json/JsonNum.cpp include/ehs/json/JsonNum.h + src/json/JsonBool.cpp include/ehs/json/JsonBool.h + src/json/JsonStr.cpp include/ehs/json/JsonStr.h + src/json/JsonObj.cpp include/ehs/json/JsonObj.h + src/json/JsonArray.cpp include/ehs/json/JsonArray.h + src/json/JsonVar.cpp include/ehs/json/JsonVar.h - src/io/Console.cpp include/io/Console.h - src/io/RIFF_Chunk.cpp include/io/RIFF_Chunk.h - src/io/RIFF.cpp include/io/RIFF.h - src/io/BaseWindow.cpp include/io/BaseWindow.h - src/io/BaseFile.cpp include/io/BaseFile.h - src/io/Glyph.cpp include/io/Glyph.h - src/io/FontAtlas.cpp include/io/FontAtlas.h - src/io/BaseFileMonitor.cpp include/io/BaseFileMonitor.h - include/io/COM.h - include/io/File.h - include/io/FileMonitor.h - include/io/Window.h + src/io/Console.cpp include/ehs/io/Console.h + src/io/RIFF_Chunk.cpp include/ehs/io/RIFF_Chunk.h + src/io/RIFF.cpp include/ehs/io/RIFF.h + src/io/BaseWindow.cpp include/ehs/io/BaseWindow.h + src/io/BaseFile.cpp include/ehs/io/BaseFile.h + src/io/Glyph.cpp include/ehs/io/Glyph.h + src/io/FontAtlas.cpp include/ehs/io/FontAtlas.h + src/io/BaseFileMonitor.cpp include/ehs/io/BaseFileMonitor.h + include/ehs/io/COM.h + include/ehs/io/File.h + include/ehs/io/FileMonitor.h + include/ehs/io/Window.h - src/io/socket/Request.cpp include/io/socket/Request.h - src/io/socket/Response.cpp include/io/socket/Response.h - src/io/socket/DNS.cpp include/io/socket/DNS.h - src/io/socket/BaseUDP.cpp include/io/socket/BaseUDP.h - src/io/socket/BaseTCP.cpp include/io/socket/BaseTCP.h - src/io/socket/Comms.cpp include/io/socket/Comms.h - src/io/socket/CommsSystem.cpp include/io/socket/CommsSystem.h - src/io/socket/Operation.cpp include/io/socket/Operation.h - src/io/socket/Fragments.cpp include/io/socket/Fragments.h - src/io/socket/Endpoint.cpp include/io/socket/Endpoint.h - src/io/socket/SSL.cpp include/io/socket/SSL.h + include/ehs/io/socket/Utils.h + src/io/socket/Request.cpp include/ehs/io/socket/Request.h + src/io/socket/Response.cpp include/ehs/io/socket/Response.h + src/io/socket/DNS.cpp include/ehs/io/socket/DNS.h + src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h + src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h + src/io/socket/Comms.cpp include/ehs/io/socket/Comms.h + src/io/socket/CommsSystem.cpp include/ehs/io/socket/CommsSystem.h + src/io/socket/Operation.cpp include/ehs/io/socket/Operation.h + src/io/socket/Fragments.cpp include/ehs/io/socket/Fragments.h + src/io/socket/Endpoint.cpp include/ehs/io/socket/Endpoint.h + src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h - src/io/socket/rest/Twitch.cpp include/io/socket/rest/Twitch.h - src/io/socket/rest/TwitchChat.cpp include/io/socket/rest/TwitchChat.h - src/io/socket/rest/Spotify.cpp include/io/socket/rest/Spotify.h - include/io/socket/Socket.h - include/io/socket/TCP.h - include/io/socket/UDP.h - include/io/socket/Utils.h + src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h + src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h + src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h + include/ehs/io/socket/Socket.h + include/ehs/io/socket/TCP.h + include/ehs/io/socket/UDP.h + include/ehs/io/socket/Utils.h - src/io/audio/Audio.cpp include/io/audio/Audio.h - src/io/audio/BaseAudioDevice.cpp include/io/audio/BaseAudioDevice.h - src/io/audio/AudioCodec.cpp include/io/audio/AudioCodec.h - include/io/audio/AudioDevice.h + src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h + src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h + src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h + include/ehs/io/audio/AudioDevice.h - src/io/img/PNG.cpp include/io/img/PNG.h - src/io/img/Img.cpp include/io/img/Img.h - src/io/img/PNG_Chunk.cpp include/io/img/PNG_Chunk.h - src/io/img/ImgCodec.cpp include/io/img/ImgCodec.h + src/io/img/PNG.cpp include/ehs/io/img/PNG.h + src/io/img/Img.cpp include/ehs/io/img/Img.h + src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h + src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h - include/io/model/Vertex.h - src/io/model/Mesh.cpp include/io/model/Mesh.h - src/io/model/Bone.cpp include/io/model/Bone.h - src/io/model/Model.cpp include/io/model/Model.h - src/io/model/Animation.cpp include/io/model/Animation.h - src/io/model/AnimBone.cpp include/io/model/AnimBone.h - src/io/model/KeyFrame.cpp include/io/model/KeyFrame.h - src/io/model/PropertyChange.cpp include/io/model/PropertyChange.h + include/ehs/io/model/Vertex.h + src/io/model/Mesh.cpp include/ehs/io/model/Mesh.h + src/io/model/Bone.cpp include/ehs/io/model/Bone.h + src/io/model/Model.cpp include/ehs/io/model/Model.h + src/io/model/Animation.cpp include/ehs/io/model/Animation.h + src/io/model/AnimBone.cpp include/ehs/io/model/AnimBone.h + src/io/model/KeyFrame.cpp include/ehs/io/model/KeyFrame.h + src/io/model/PropertyChange.cpp include/ehs/io/model/PropertyChange.h - src/io/hid/ButtonState.cpp include/io/hid/ButtonState.h - src/io/hid/Button.cpp include/io/hid/Button.h - src/io/hid/Mouse.cpp include/io/hid/Mouse.h - src/io/hid/Keyboard.cpp include/io/hid/Keyboard.h - src/io/hid/HID.cpp include/io/hid/HID.h - src/io/hid/InputHandler.cpp include/io/hid/InputHandler.h - src/io/hid/Input.cpp include/io/hid/Input.h + src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h + src/io/hid/Button.cpp include/ehs/io/hid/Button.h + src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h + src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h + src/io/hid/HID.cpp include/ehs/io/hid/HID.h + src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h + src/io/hid/Input.cpp include/ehs/io/hid/Input.h ) if (IS_OS_WINDOWS) list(APPEND EHS_SOURCES - src/io/socket/UDP_W32.cpp include/io/socket/UDP_W32.h - src/io/socket/TCP_W32.cpp include/io/socket/TCP_W32.h - src/system/Semaphore_W32.cpp include/system/Semaphore_W32.h - src/system/System_W32.cpp include/system/System_W32.h - src/system/Mutex_W32.cpp include/system/Mutex_W32.h - src/system/Open_W32.cpp include/system/Open_W32.h - src/io/audio/audioDevice_W32.cpp include/io/audio/audioDevice_W32.h - src/io/MsgBox.cpp include/io/MsgBox.h - src/io/File_W32.cpp include/io/File_W32.h - src/io/FileMonitor_W32.cpp include/io/FileMonitor_W32.h - src/io/Window_W32.cpp include/io/Window_W32.h - src/io/COM.cpp include/io/COM.h + src/io/socket/UDP_W32.cpp include/ehs/io/socket/UDP_W32.h + src/io/socket/TCP_W32.cpp include/ehs/io/socket/TCP_W32.h + src/system/Semaphore_W32.cpp include/ehs/system/Semaphore_W32.h + src/system/System_W32.cpp include/ehs/system/System_W32.h + src/system/Mutex_W32.cpp include/ehs/system/Mutex_W32.h + src/system/Open_W32.cpp include/ehs/system/Open_W32.h + src/io/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h + src/io/MsgBox.cpp include/ehs/io/MsgBox.h + src/io/File_W32.cpp include/ehs/io/File_W32.h + src/io/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h + src/io/Window_W32.cpp include/ehs/io/Window_W32.h + src/io/COM.cpp include/ehs/io/COM.h src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm ) elseif (IS_OS_LINUX) list(APPEND EHS_SOURCES - src/io/socket/UDP_BSD.cpp include/io/socket/UDP_BSD.h - src/io/socket/TCP_BSD.cpp include/io/socket/TCP_BSD.h - src/system/Semaphore_P.cpp include/system/Semaphore_P.h - src/system/System_LNX.cpp include/system/System_LNX.h - src/system/Open_UNX.cpp include/system/Open_UNX.h - src/io/File_UNX.cpp include/io/File_UNX.h - src/io/FileMonitor_UNX.cpp include/io/FileMonitor_UNX.h - src/system/Mutex_PT.cpp include/system/Mutex_PT.h - src/io/audio/AudioDevice_ALSA.cpp include/io/audio/AudioDevice_ALSA.h - src/system/FileSystem.cpp include/system/FileSystem.h - src/system/User.cpp include/system/User.h + src/io/socket/UDP_BSD.cpp include/ehs/io/socket/UDP_BSD.h + src/io/socket/TCP_BSD.cpp include/ehs/io/socket/TCP_BSD.h + src/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.h + src/system/System_LNX.cpp include/ehs/system/System_LNX.h + src/system/Open_UNX.cpp include/ehs/system/Open_UNX.h + src/io/File_UNX.cpp include/ehs/io/File_UNX.h + src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_UNX.h + src/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h + src/io/audio/AudioDevice_ALSA.cpp include/ehs/io/audio/AudioDevice_ALSA.h + src/system/FileSystem.cpp include/ehs/system/FileSystem.h + src/system/User.cpp include/ehs/system/User.h ) set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System") if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland") add_compile_definitions(EHS_WS_WAYLAND) - list(APPEND EHS_SOURCES src/io/xdg-shell-protocol.c include/io/xdg-shell-client-protocol.h src/io/Window_Way.cpp include/io/Window_Way.h) + list(APPEND EHS_SOURCES src/io/xdg-shell-protocol.c include/ehs/io/xdg-shell-client-protocol.h src/io/Window_Way.cpp include/ehs/io/Window_Way.h) message("Building for Wayland.") elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB") add_compile_definitions(EHS_WS_XCB) - list(APPEND EHS_SOURCES src/io/Window_XCB.cpp include/io/Window_XCB.h) + list(APPEND EHS_SOURCES src/io/Window_XCB.cpp include/ehs/io/Window_XCB.h) message("Building for XCB.") endif () @@ -230,7 +231,7 @@ add_executable(StrToHash src/StrToHash.cpp) set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/Libraries/EHS") install(TARGETS EHS DESTINATION lib) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/ehs) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) install(TARGETS StrToHash DESTINATION bin) diff --git a/include/Dock.h b/include/Dock.h deleted file mode 100644 index a293ff9..0000000 --- a/include/Dock.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -enum class Dock -{ - NONE, - FILL -}; \ No newline at end of file diff --git a/include/Anchor.h b/include/ehs/Anchor.h similarity index 100% rename from include/Anchor.h rename to include/ehs/Anchor.h diff --git a/include/Array.h b/include/ehs/Array.h similarity index 95% rename from include/Array.h rename to include/ehs/Array.h index f8bdfe3..72f38b4 100644 --- a/include/Array.h +++ b/include/ehs/Array.h @@ -355,18 +355,34 @@ namespace ehs { T* result = new T[--size]; - T value = std::move(data[size]); + T popped = (T&&)data[size]; for (N i = 0; i < size; ++i) - result[i] = std::move(data[i]); + result[i] = (T&&)data[i]; delete[] data; data = result; - return value; + return popped; } + /// Will swap the value at the given index with the value at the end of the array and pops it. + /// @param [in] index The index of the value to swap with. + /// @returns The removed value. + T Pop(const N index) + { + if (!size) + return {}; + + N lastIndex = size - 1; + + if (index < lastIndex) + Swap(index, lastIndex); + + return Pop(); + } + void Clear() { if (!data) diff --git a/include/Base64.h b/include/ehs/Base64.h similarity index 100% rename from include/Base64.h rename to include/ehs/Base64.h diff --git a/include/BaseObj.h b/include/ehs/BaseObj.h similarity index 100% rename from include/BaseObj.h rename to include/ehs/BaseObj.h diff --git a/include/Color3.h b/include/ehs/Color3.h similarity index 100% rename from include/Color3.h rename to include/ehs/Color3.h diff --git a/include/Color4.h b/include/ehs/Color4.h similarity index 100% rename from include/Color4.h rename to include/ehs/Color4.h diff --git a/include/Data.h b/include/ehs/Data.h similarity index 100% rename from include/Data.h rename to include/ehs/Data.h diff --git a/include/DataType.h b/include/ehs/DataType.h similarity index 100% rename from include/DataType.h rename to include/ehs/DataType.h diff --git a/include/ehs/Dock.h b/include/ehs/Dock.h new file mode 100644 index 0000000..925bf22 --- /dev/null +++ b/include/ehs/Dock.h @@ -0,0 +1,10 @@ +#pragma once + +namespace ehs +{ + enum class Dock + { + NONE, + FILL + }; +} \ No newline at end of file diff --git a/include/EHS.h b/include/ehs/EHS.h similarity index 98% rename from include/EHS.h rename to include/ehs/EHS.h index 78c109c..0f5ecce 100644 --- a/include/EHS.h +++ b/include/ehs/EHS.h @@ -7,7 +7,7 @@ #endif #include "Types.h" -#include "system/OS.h" +#include "ehs/system/OS.h" #include "Version.h" #include "Str.h" diff --git a/include/Encryption.h b/include/ehs/Encryption.h similarity index 100% rename from include/Encryption.h rename to include/ehs/Encryption.h diff --git a/include/GarbageCollector.h b/include/ehs/GarbageCollector.h similarity index 95% rename from include/GarbageCollector.h rename to include/ehs/GarbageCollector.h index 1aeafe5..d0dfbd7 100644 --- a/include/GarbageCollector.h +++ b/include/ehs/GarbageCollector.h @@ -3,8 +3,8 @@ #include "EHS.h" #include "Vector.h" #include "BaseObj.h" -#include "system/Mutex.h" -#include "system/Thread.h" +#include "ehs/system/Mutex.h" +#include "ehs/system/Thread.h" namespace ehs { diff --git a/include/HRNG.h b/include/ehs/HRNG.h similarity index 100% rename from include/HRNG.h rename to include/ehs/HRNG.h diff --git a/include/HashMap.h b/include/ehs/HashMap.h similarity index 100% rename from include/HashMap.h rename to include/ehs/HashMap.h diff --git a/include/Link.h b/include/ehs/Link.h similarity index 100% rename from include/Link.h rename to include/ehs/Link.h diff --git a/include/LinkedList.h b/include/ehs/LinkedList.h similarity index 100% rename from include/LinkedList.h rename to include/ehs/LinkedList.h diff --git a/include/Log.h b/include/ehs/Log.h similarity index 100% rename from include/Log.h rename to include/ehs/Log.h diff --git a/include/Mat2.h b/include/ehs/Mat2.h similarity index 100% rename from include/Mat2.h rename to include/ehs/Mat2.h diff --git a/include/Mat3.h b/include/ehs/Mat3.h similarity index 100% rename from include/Mat3.h rename to include/ehs/Mat3.h diff --git a/include/Mat4.h b/include/ehs/Mat4.h similarity index 100% rename from include/Mat4.h rename to include/ehs/Mat4.h diff --git a/include/Math.h b/include/ehs/Math.h similarity index 99% rename from include/Math.h rename to include/ehs/Math.h index ce323e2..2f7bbbb 100644 --- a/include/Math.h +++ b/include/ehs/Math.h @@ -1,6 +1,6 @@ #pragma once -#include "system/CPU.h" +#include "ehs/system/CPU.h" #define EHS_LOW_WORD(x) *((int*)&x) + 1 diff --git a/include/PRNG.h b/include/ehs/PRNG.h similarity index 100% rename from include/PRNG.h rename to include/ehs/PRNG.h diff --git a/include/PtrData.h b/include/ehs/PtrData.h similarity index 100% rename from include/PtrData.h rename to include/ehs/PtrData.h diff --git a/include/Quat.h b/include/ehs/Quat.h similarity index 100% rename from include/Quat.h rename to include/ehs/Quat.h diff --git a/include/Range.h b/include/ehs/Range.h similarity index 100% rename from include/Range.h rename to include/ehs/Range.h diff --git a/include/Rect.h b/include/ehs/Rect.h similarity index 100% rename from include/Rect.h rename to include/ehs/Rect.h diff --git a/include/SArray.h b/include/ehs/SArray.h similarity index 100% rename from include/SArray.h rename to include/ehs/SArray.h diff --git a/include/Serializer.h b/include/ehs/Serializer.h similarity index 100% rename from include/Serializer.h rename to include/ehs/Serializer.h diff --git a/include/ShdPtr.h b/include/ehs/ShdPtr.h similarity index 100% rename from include/ShdPtr.h rename to include/ehs/ShdPtr.h diff --git a/include/Str.h b/include/ehs/Str.h similarity index 100% rename from include/Str.h rename to include/ehs/Str.h diff --git a/include/Task.h b/include/ehs/Task.h similarity index 91% rename from include/Task.h rename to include/ehs/Task.h index d18e23f..47d5d03 100644 --- a/include/Task.h +++ b/include/ehs/Task.h @@ -2,8 +2,8 @@ #include "EHS.h" #include "BaseObj.h" -#include "system/Thread.h" -#include "system/Semaphore.h" +#include "ehs/system/Thread.h" +#include "ehs/system/Semaphore.h" namespace ehs { diff --git a/include/Type.h b/include/ehs/Type.h similarity index 100% rename from include/Type.h rename to include/ehs/Type.h diff --git a/include/Types.h b/include/ehs/Types.h similarity index 98% rename from include/Types.h rename to include/ehs/Types.h index a67bda1..0371795 100644 --- a/include/Types.h +++ b/include/ehs/Types.h @@ -1,6 +1,6 @@ #pragma once -#include "system/OS.h" +#include "ehs/system/OS.h" #define EHS_MAX_PATH 0x104 #define EHS_UINT_8_MAX 0xFF diff --git a/include/URI.h b/include/ehs/URI.h similarity index 100% rename from include/URI.h rename to include/ehs/URI.h diff --git a/include/UTF.h b/include/ehs/UTF.h similarity index 100% rename from include/UTF.h rename to include/ehs/UTF.h diff --git a/include/UniPtr.h b/include/ehs/UniPtr.h similarity index 100% rename from include/UniPtr.h rename to include/ehs/UniPtr.h diff --git a/include/Util.h b/include/ehs/Util.h similarity index 100% rename from include/Util.h rename to include/ehs/Util.h diff --git a/include/Vec2.h b/include/ehs/Vec2.h similarity index 100% rename from include/Vec2.h rename to include/ehs/Vec2.h diff --git a/include/Vec3.h b/include/ehs/Vec3.h similarity index 100% rename from include/Vec3.h rename to include/ehs/Vec3.h diff --git a/include/Vec4.h b/include/ehs/Vec4.h similarity index 100% rename from include/Vec4.h rename to include/ehs/Vec4.h diff --git a/include/Vector.h b/include/ehs/Vector.h similarity index 97% rename from include/Vector.h rename to include/ehs/Vector.h index 80b9e83..946bc70 100644 --- a/include/Vector.h +++ b/include/ehs/Vector.h @@ -510,7 +510,7 @@ namespace ehs } /// Much like the stack it pops a value at the end of the vector. - /// @returns The removed data. + /// @returns The removed value. T Pop() { T popped = {}; @@ -546,6 +546,22 @@ namespace ehs return popped; } + /// Will swap the value at the given index with the value at the end of the vector and pops it. + /// @param [in] index The index of the value to swap with. + /// @returns The removed value. + T Pop(const N index) + { + if (!size) + return {}; + + N lastIndex = size - 1; + + if (index < lastIndex) + Swap(index, lastIndex); + + return Pop(); + } + /// Resizes the vector while keeping its alignment. /// @param [in] newSize The size to change to. void Resize(const N newSize) diff --git a/include/Version.h b/include/ehs/Version.h similarity index 100% rename from include/Version.h rename to include/ehs/Version.h diff --git a/include/WkPtr.h b/include/ehs/WkPtr.h similarity index 100% rename from include/WkPtr.h rename to include/ehs/WkPtr.h diff --git a/include/database/DVar.h b/include/ehs/database/DVar.h similarity index 68% rename from include/database/DVar.h rename to include/ehs/database/DVar.h index 8d0b30d..40551cd 100644 --- a/include/database/DVar.h +++ b/include/ehs/database/DVar.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "BaseObj.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/BaseObj.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/io/BaseFile.h b/include/ehs/io/BaseFile.h similarity index 98% rename from include/io/BaseFile.h rename to include/ehs/io/BaseFile.h index 36a59a5..a79127c 100644 --- a/include/io/BaseFile.h +++ b/include/ehs/io/BaseFile.h @@ -1,10 +1,10 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Vector.h" -#include "Array.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Vector.h" +#include "ehs/Array.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/BaseFileMonitor.h b/include/ehs/io/BaseFileMonitor.h similarity index 94% rename from include/io/BaseFileMonitor.h rename to include/ehs/io/BaseFileMonitor.h index fd1ddce..d8c56c0 100644 --- a/include/io/BaseFileMonitor.h +++ b/include/ehs/io/BaseFileMonitor.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #define EHS_FE_NONE 0x00 #define EHS_FE_MODIFIED 0x01 diff --git a/include/io/BaseWindow.h b/include/ehs/io/BaseWindow.h similarity index 95% rename from include/io/BaseWindow.h rename to include/ehs/io/BaseWindow.h index f7f713e..21466a9 100644 --- a/include/io/BaseWindow.h +++ b/include/ehs/io/BaseWindow.h @@ -1,10 +1,10 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Vec2.h" -#include "Rect.h" -#include "hid/Input.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Vec2.h" +#include "ehs/Rect.h" +#include "ehs/io/hid/Input.h" namespace ehs { diff --git a/include/io/COM.h b/include/ehs/io/COM.h similarity index 97% rename from include/io/COM.h rename to include/ehs/io/COM.h index f9bd01e..eb3b15b 100644 --- a/include/io/COM.h +++ b/include/ehs/io/COM.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" namespace ehs { diff --git a/include/io/Console.h b/include/ehs/io/Console.h similarity index 98% rename from include/io/Console.h rename to include/ehs/io/Console.h index 941df17..ff4a783 100644 --- a/include/io/Console.h +++ b/include/ehs/io/Console.h @@ -1,8 +1,8 @@ #pragma once -#include "Str.h" -#include "UTF.h" -#include "Array.h" +#include "ehs/Str.h" +#include "ehs/UTF.h" +#include "ehs/Array.h" namespace ehs { diff --git a/include/io/File.h b/include/ehs/io/File.h similarity index 85% rename from include/io/File.h rename to include/ehs/io/File.h index 27a4930..d957f51 100644 --- a/include/io/File.h +++ b/include/ehs/io/File.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #if defined(EHS_OS_WINDOWS) #include "File_W32.h" diff --git a/include/io/FileMonitor.h b/include/ehs/io/FileMonitor.h similarity index 100% rename from include/io/FileMonitor.h rename to include/ehs/io/FileMonitor.h diff --git a/include/io/FileMonitor_UNX.h b/include/ehs/io/FileMonitor_UNX.h similarity index 96% rename from include/io/FileMonitor_UNX.h rename to include/ehs/io/FileMonitor_UNX.h index 9ef4f47..bcdf8eb 100644 --- a/include/io/FileMonitor_UNX.h +++ b/include/ehs/io/FileMonitor_UNX.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseFileMonitor.h" namespace ehs diff --git a/include/io/FileMonitor_W32.h b/include/ehs/io/FileMonitor_W32.h similarity index 96% rename from include/io/FileMonitor_W32.h rename to include/ehs/io/FileMonitor_W32.h index 1613c62..3d29424 100644 --- a/include/io/FileMonitor_W32.h +++ b/include/ehs/io/FileMonitor_W32.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseFileMonitor.h" namespace ehs diff --git a/include/io/File_UNX.h b/include/ehs/io/File_UNX.h similarity index 90% rename from include/io/File_UNX.h rename to include/ehs/io/File_UNX.h index 60bc495..6e10aa7 100644 --- a/include/io/File_UNX.h +++ b/include/ehs/io/File_UNX.h @@ -1,11 +1,11 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "UTF.h" -#include "Vector.h" -#include "Array.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/UTF.h" +#include "ehs/Vector.h" +#include "ehs/Array.h" +#include "ehs/Serializer.h" #include "BaseFile.h" namespace ehs diff --git a/include/io/File_W32.h b/include/ehs/io/File_W32.h similarity index 90% rename from include/io/File_W32.h rename to include/ehs/io/File_W32.h index 47bea6c..6f38812 100644 --- a/include/io/File_W32.h +++ b/include/ehs/io/File_W32.h @@ -1,11 +1,11 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "UTF.h" -#include "Vector.h" -#include "Array.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/UTF.h" +#include "ehs/Vector.h" +#include "ehs/Array.h" +#include "ehs/Serializer.h" #include "BaseFile.h" namespace ehs diff --git a/include/io/FontAtlas.h b/include/ehs/io/FontAtlas.h similarity index 85% rename from include/io/FontAtlas.h rename to include/ehs/io/FontAtlas.h index 9f7fe68..04ac4ef 100644 --- a/include/io/FontAtlas.h +++ b/include/ehs/io/FontAtlas.h @@ -1,12 +1,12 @@ #pragma once -#include "EHS.h" -#include "Array.h" +#include "ehs/EHS.h" +#include "ehs/Array.h" #include "Glyph.h" -#include "Anchor.h" -#include "img/Img.h" -#include "model/Mesh.h" +#include "ehs/Anchor.h" +#include "ehs/io/img/Img.h" +#include "ehs/io/model/Mesh.h" namespace ehs { diff --git a/include/io/Glyph.h b/include/ehs/io/Glyph.h similarity index 90% rename from include/io/Glyph.h rename to include/ehs/io/Glyph.h index ea3a230..50dec7d 100644 --- a/include/io/Glyph.h +++ b/include/ehs/io/Glyph.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Vec2.h" -#include "Rect.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Vec2.h" +#include "ehs/Rect.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/RIFF.h b/include/ehs/io/RIFF.h similarity index 84% rename from include/io/RIFF.h rename to include/ehs/io/RIFF.h index 95e4d4c..bcef57a 100644 --- a/include/io/RIFF.h +++ b/include/ehs/io/RIFF.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Vector.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Vector.h" +#include "ehs/Serializer.h" #include "RIFF_Chunk.h" namespace ehs diff --git a/include/io/RIFF_Chunk.h b/include/ehs/io/RIFF_Chunk.h similarity index 85% rename from include/io/RIFF_Chunk.h rename to include/ehs/io/RIFF_Chunk.h index 468e99f..a5eea11 100644 --- a/include/io/RIFF_Chunk.h +++ b/include/ehs/io/RIFF_Chunk.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/Window.h b/include/ehs/io/Window.h similarity index 89% rename from include/io/Window.h rename to include/ehs/io/Window.h index b8631e0..5f383ce 100644 --- a/include/io/Window.h +++ b/include/ehs/io/Window.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/system/OS.h" #if defined(EHS_OS_WINDOWS) #include "Window_W32.h" diff --git a/include/io/Window_W32.h b/include/ehs/io/Window_W32.h similarity index 97% rename from include/io/Window_W32.h rename to include/ehs/io/Window_W32.h index e28ec77..af81557 100644 --- a/include/io/Window_W32.h +++ b/include/ehs/io/Window_W32.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Array.h" -#include "Str.h" -#include "Vec4.h" +#include "ehs/EHS.h" +#include "ehs/Array.h" +#include "ehs/Str.h" +#include "ehs/Vec4.h" #include "BaseWindow.h" #include "HID/InputHandler.h" diff --git a/include/io/Window_Way.h b/include/ehs/io/Window_Way.h similarity index 100% rename from include/io/Window_Way.h rename to include/ehs/io/Window_Way.h diff --git a/include/io/Window_XCB.h b/include/ehs/io/Window_XCB.h similarity index 64% rename from include/io/Window_XCB.h rename to include/ehs/io/Window_XCB.h index 9676abc..6ce9784 100644 --- a/include/io/Window_XCB.h +++ b/include/ehs/io/Window_XCB.h @@ -22,13 +22,23 @@ namespace ehs Serializer clipboard; public: + ~Window() override; + Window(); - void Create_32(const Str_32& title, const Vec2_s32& pos, const Vec2_u32 scale) override; + Window(Window&& win) noexcept; - void Create_16(const Str_16& title, const Vec2_s32& pos, const Vec2_u32 scale) override; + Window(const Window& win); - void Create_8(const Str_8& title, const Vec2_s32& pos, const Vec2_u32 scale) override; + Window& operator=(Window&& win) noexcept; + + Window& operator=(const Window& win); + + void Create_32(const Str_32& title, const Vec2_s32& pos, Vec2_u32 scale) override; + + void Create_16(const Str_16& title, const Vec2_s32& pos, Vec2_u32 scale) override; + + void Create_8(const Str_8& title, const Vec2_s32& pos, Vec2_u32 scale) override; void Close() override; @@ -40,7 +50,7 @@ namespace ehs void ShowCursor(bool toggle) override; - void ConstrainCursor(const bool constrain) override; + void ConstrainCursor(bool constrain) override; void SetTitle_32(const Str_32& newTitle) override; @@ -66,19 +76,19 @@ namespace ehs void SetClipboard(Serializer data) override; - void SetCursorImg(const CursorImg img) override; + void SetCursorImg(CursorImg img) override; xcb_connection_t* GetServer(); private: xcb_generic_event_t* RetrieveEvent(); - xcb_atom_t RetrieveAtom(const bool create, const Str_8& name) const; + xcb_atom_t RetrieveAtom(bool create, const Str_8& name) const; - xcb_get_property_reply_t* RetrieveProp(const xcb_atom_t prop, const xcb_atom_t type) const; + xcb_get_property_reply_t* RetrieveProp(xcb_atom_t prop, xcb_atom_t type) const; void QueryPrimaryDevices(); - Str_8 QueryDeviceName(const UInt_16 id); + Str_8 QueryDeviceName(UInt_16 id); }; } diff --git a/include/io/audio/Audio.h b/include/ehs/io/audio/Audio.h similarity index 96% rename from include/io/audio/Audio.h rename to include/ehs/io/audio/Audio.h index dd6a141..84ef387 100644 --- a/include/io/audio/Audio.h +++ b/include/ehs/io/audio/Audio.h @@ -1,12 +1,12 @@ #pragma once -#include "Types.h" -#include "BaseObj.h" -#include "DataType.h" -#include "Str.h" -#include "Serializer.h" -#include "Vector.h" -#include "Array.h" +#include "ehs/Types.h" +#include "ehs/BaseObj.h" +#include "ehs/DataType.h" +#include "ehs/Str.h" +#include "ehs/Serializer.h" +#include "ehs/Vector.h" +#include "ehs/Array.h" #include "AudioCodec.h" namespace ehs diff --git a/include/io/audio/AudioCodec.h b/include/ehs/io/audio/AudioCodec.h similarity index 93% rename from include/io/audio/AudioCodec.h rename to include/ehs/io/audio/AudioCodec.h index 464dfb9..d3df153 100644 --- a/include/io/audio/AudioCodec.h +++ b/include/ehs/io/audio/AudioCodec.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "io/File.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/io/File.h" namespace ehs { diff --git a/include/io/audio/AudioDevice.h b/include/ehs/io/audio/AudioDevice.h similarity index 86% rename from include/io/audio/AudioDevice.h rename to include/ehs/io/audio/AudioDevice.h index 6827168..f570427 100644 --- a/include/io/audio/AudioDevice.h +++ b/include/ehs/io/audio/AudioDevice.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #if defined(EHS_OS_WINDOWS) #include "AudioDevice_W32.h" diff --git a/include/io/audio/AudioDevice_ALSA.h b/include/ehs/io/audio/AudioDevice_ALSA.h similarity index 97% rename from include/io/audio/AudioDevice_ALSA.h rename to include/ehs/io/audio/AudioDevice_ALSA.h index edc2a0d..6a2341e 100644 --- a/include/io/audio/AudioDevice_ALSA.h +++ b/include/ehs/io/audio/AudioDevice_ALSA.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseAudioDevice.h" #include diff --git a/include/io/audio/AudioDevice_W32.h b/include/ehs/io/audio/AudioDevice_W32.h similarity index 98% rename from include/io/audio/AudioDevice_W32.h rename to include/ehs/io/audio/AudioDevice_W32.h index cbc924f..f13c84a 100644 --- a/include/io/audio/AudioDevice_W32.h +++ b/include/ehs/io/audio/AudioDevice_W32.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseAudioDevice.h" #include diff --git a/include/io/audio/BaseAudioDevice.h b/include/ehs/io/audio/BaseAudioDevice.h similarity index 94% rename from include/io/audio/BaseAudioDevice.h rename to include/ehs/io/audio/BaseAudioDevice.h index 4e8f283..e2cde25 100644 --- a/include/io/audio/BaseAudioDevice.h +++ b/include/ehs/io/audio/BaseAudioDevice.h @@ -1,10 +1,10 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Vector.h" -#include "Array.h" -#include "DataType.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Vector.h" +#include "ehs/Array.h" +#include "ehs/DataType.h" namespace ehs { diff --git a/include/io/hid/Button.h b/include/ehs/io/hid/Button.h similarity index 89% rename from include/io/hid/Button.h rename to include/ehs/io/hid/Button.h index 13af7b4..f830837 100644 --- a/include/io/hid/Button.h +++ b/include/ehs/io/hid/Button.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/io/hid/ButtonState.h b/include/ehs/io/hid/ButtonState.h similarity index 97% rename from include/io/hid/ButtonState.h rename to include/ehs/io/hid/ButtonState.h index 0b3826c..3d07107 100644 --- a/include/io/hid/ButtonState.h +++ b/include/ehs/io/hid/ButtonState.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "Button.h" namespace ehs diff --git a/include/io/hid/HID.h b/include/ehs/io/hid/HID.h similarity index 98% rename from include/io/hid/HID.h rename to include/ehs/io/hid/HID.h index 64d79e5..68800dc 100644 --- a/include/io/hid/HID.h +++ b/include/ehs/io/hid/HID.h @@ -1,6 +1,6 @@ #pragma once -#include "Array.h" +#include "ehs/Array.h" #include "ButtonState.h" #define EHS_HID_UNKNOWN 0 diff --git a/include/io/hid/Input.h b/include/ehs/io/hid/Input.h similarity index 92% rename from include/io/hid/Input.h rename to include/ehs/io/hid/Input.h index cf25670..7d4f6da 100644 --- a/include/io/hid/Input.h +++ b/include/ehs/io/hid/Input.h @@ -1,7 +1,7 @@ #pragma once -#include "Array.h" -#include "Serializer.h" +#include "ehs/Array.h" +#include "ehs/Serializer.h" #include "InputHandler.h" namespace ehs diff --git a/include/io/hid/InputHandler.h b/include/ehs/io/hid/InputHandler.h similarity index 97% rename from include/io/hid/InputHandler.h rename to include/ehs/io/hid/InputHandler.h index 6fabc82..9a6b749 100644 --- a/include/io/hid/InputHandler.h +++ b/include/ehs/io/hid/InputHandler.h @@ -1,6 +1,6 @@ #pragma once -#include "Array.h" +#include "ehs/Array.h" #include "HID.h" namespace ehs diff --git a/include/io/hid/Keyboard.h b/include/ehs/io/hid/Keyboard.h similarity index 99% rename from include/io/hid/Keyboard.h rename to include/ehs/io/hid/Keyboard.h index d4d469e..fb15cf8 100644 --- a/include/io/hid/Keyboard.h +++ b/include/ehs/io/hid/Keyboard.h @@ -1,6 +1,6 @@ #pragma once -#include "Types.h" +#include "ehs/Types.h" #include "Button.h" #include "HID.h" diff --git a/include/io/hid/Mouse.h b/include/ehs/io/hid/Mouse.h similarity index 95% rename from include/io/hid/Mouse.h rename to include/ehs/io/hid/Mouse.h index 0681b7a..52c1f29 100644 --- a/include/io/hid/Mouse.h +++ b/include/ehs/io/hid/Mouse.h @@ -1,7 +1,7 @@ #pragma once -#include "Types.h" -#include "Vec2.h" +#include "ehs/Types.h" +#include "ehs/Vec2.h" #include "Button.h" #include "HID.h" diff --git a/include/io/img/Img.h b/include/ehs/io/img/Img.h similarity index 98% rename from include/io/img/Img.h rename to include/ehs/io/img/Img.h index 4ee6dab..2d21003 100644 --- a/include/io/img/Img.h +++ b/include/ehs/io/img/Img.h @@ -1,8 +1,8 @@ #pragma once -#include "Types.h" -#include "BaseObj.h" -#include "Str.h" +#include "ehs/Types.h" +#include "ehs/BaseObj.h" +#include "ehs/Str.h" #include "ImgCodec.h" namespace ehs diff --git a/include/io/img/ImgCodec.h b/include/ehs/io/img/ImgCodec.h similarity index 93% rename from include/io/img/ImgCodec.h rename to include/ehs/io/img/ImgCodec.h index 09fdb66..deb44b2 100644 --- a/include/io/img/ImgCodec.h +++ b/include/ehs/io/img/ImgCodec.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "io/File.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/io/File.h" namespace ehs { diff --git a/include/io/img/PNG.h b/include/ehs/io/img/PNG.h similarity index 96% rename from include/io/img/PNG.h rename to include/ehs/io/img/PNG.h index 3b4d776..6bb9912 100644 --- a/include/io/img/PNG.h +++ b/include/ehs/io/img/PNG.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Serializer.h" #include "PNG_Chunk.h" #include "Img.h" diff --git a/include/io/img/PNG_Chunk.h b/include/ehs/io/img/PNG_Chunk.h similarity index 86% rename from include/io/img/PNG_Chunk.h rename to include/ehs/io/img/PNG_Chunk.h index a50ed82..974f2ab 100644 --- a/include/io/img/PNG_Chunk.h +++ b/include/ehs/io/img/PNG_Chunk.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/model/AnimBone.h b/include/ehs/io/model/AnimBone.h similarity index 93% rename from include/io/model/AnimBone.h rename to include/ehs/io/model/AnimBone.h index 9f0f775..868a2da 100644 --- a/include/io/model/AnimBone.h +++ b/include/ehs/io/model/AnimBone.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Array.h" +#include "ehs/EHS.h" +#include "ehs/Array.h" #include "KeyFrame.h" namespace ehs diff --git a/include/io/model/Animation.h b/include/ehs/io/model/Animation.h similarity index 92% rename from include/io/model/Animation.h rename to include/ehs/io/model/Animation.h index 2df05fd..8cef9c9 100644 --- a/include/io/model/Animation.h +++ b/include/ehs/io/model/Animation.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Array.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Array.h" #include "AnimBone.h" namespace ehs diff --git a/include/io/model/Bone.h b/include/ehs/io/model/Bone.h similarity index 95% rename from include/io/model/Bone.h rename to include/ehs/io/model/Bone.h index 91cb039..da3393b 100644 --- a/include/io/model/Bone.h +++ b/include/ehs/io/model/Bone.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Quat.h" -#include "Mat4.h" +#include "ehs/EHS.h" +#include "ehs/Quat.h" +#include "ehs/Mat4.h" namespace ehs { diff --git a/include/io/model/KeyFrame.h b/include/ehs/io/model/KeyFrame.h similarity index 88% rename from include/io/model/KeyFrame.h rename to include/ehs/io/model/KeyFrame.h index ac25287..945189e 100644 --- a/include/io/model/KeyFrame.h +++ b/include/ehs/io/model/KeyFrame.h @@ -1,10 +1,10 @@ #pragma once -#include "EHS.h" -#include "Array.h" -#include "Vec3.h" -#include "Quat.h" -#include "Mat4.h" +#include "ehs/EHS.h" +#include "ehs/Array.h" +#include "ehs/Vec3.h" +#include "ehs/Quat.h" +#include "ehs/Mat4.h" #include "PropertyChange.h" namespace ehs diff --git a/include/io/model/Mesh.h b/include/ehs/io/model/Mesh.h similarity index 90% rename from include/io/model/Mesh.h rename to include/ehs/io/model/Mesh.h index 4924083..bd9a5e1 100644 --- a/include/io/model/Mesh.h +++ b/include/ehs/io/model/Mesh.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Array.h" +#include "ehs/EHS.h" +#include "ehs/Array.h" #include "Vertex.h" -#include "BaseObj.h" +#include "ehs/BaseObj.h" namespace ehs { @@ -72,7 +72,7 @@ namespace ehs void SetVertices(const Array& newVertices); - Array GetVertices() const; + const Array& GetVertices() const; Array& GetVertices(); @@ -80,7 +80,7 @@ namespace ehs bool HasIndices() const; - Array GetIndices() const; + const Array& GetIndices() const; Array& GetIndices(); diff --git a/include/io/model/Model.h b/include/ehs/io/model/Model.h similarity index 94% rename from include/io/model/Model.h rename to include/ehs/io/model/Model.h index bc64ab1..357e201 100644 --- a/include/io/model/Model.h +++ b/include/ehs/io/model/Model.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Array.h" -#include "io/File.h" +#include "ehs/EHS.h" +#include "ehs/Array.h" +#include "ehs/io/File.h" #include "Mesh.h" #include "Bone.h" #include "Animation.h" diff --git a/include/io/model/PropertyChange.h b/include/ehs/io/model/PropertyChange.h similarity index 94% rename from include/io/model/PropertyChange.h rename to include/ehs/io/model/PropertyChange.h index b4af2ef..13130a5 100644 --- a/include/io/model/PropertyChange.h +++ b/include/ehs/io/model/PropertyChange.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" namespace ehs { diff --git a/include/io/model/Vertex.h b/include/ehs/io/model/Vertex.h similarity index 90% rename from include/io/model/Vertex.h rename to include/ehs/io/model/Vertex.h index 9a68cc9..fb625bd 100644 --- a/include/io/model/Vertex.h +++ b/include/ehs/io/model/Vertex.h @@ -1,10 +1,10 @@ #pragma once -#include "EHS.h" -#include "Vec4.h" -#include "Vec3.h" -#include "Vec2.h" -#include "Color4.h" +#include "ehs/EHS.h" +#include "ehs/Vec4.h" +#include "ehs/Vec3.h" +#include "ehs/Vec2.h" +#include "ehs/Color4.h" namespace ehs { diff --git a/include/io/socket/BaseTCP.h b/include/ehs/io/socket/BaseTCP.h similarity index 98% rename from include/io/socket/BaseTCP.h rename to include/ehs/io/socket/BaseTCP.h index 324a2d6..81a7cb1 100644 --- a/include/io/socket/BaseTCP.h +++ b/include/ehs/io/socket/BaseTCP.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "Request.h" #include "Response.h" diff --git a/include/io/socket/BaseUDP.h b/include/ehs/io/socket/BaseUDP.h similarity index 95% rename from include/io/socket/BaseUDP.h rename to include/ehs/io/socket/BaseUDP.h index cf698ef..f65b926 100644 --- a/include/io/socket/BaseUDP.h +++ b/include/ehs/io/socket/BaseUDP.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "Socket.h" namespace ehs diff --git a/include/io/socket/Comms.h b/include/ehs/io/socket/Comms.h similarity index 96% rename from include/io/socket/Comms.h rename to include/ehs/io/socket/Comms.h index 142ceda..4fd46cc 100644 --- a/include/io/socket/Comms.h +++ b/include/ehs/io/socket/Comms.h @@ -1,11 +1,11 @@ #pragma once -#include "EHS.h" -#include "Log.h" -#include "BaseObj.h" -#include "Serializer.h" -#include "Vector.h" -#include "Array.h" +#include "ehs/EHS.h" +#include "ehs/Log.h" +#include "ehs/BaseObj.h" +#include "ehs/Serializer.h" +#include "ehs/Vector.h" +#include "ehs/Array.h" #include "Socket.h" #include "UDP.h" diff --git a/include/io/socket/CommsSystem.h b/include/ehs/io/socket/CommsSystem.h similarity index 86% rename from include/io/socket/CommsSystem.h rename to include/ehs/io/socket/CommsSystem.h index f140d25..1caee3c 100644 --- a/include/io/socket/CommsSystem.h +++ b/include/ehs/io/socket/CommsSystem.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Array.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Array.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/socket/DNS.h b/include/ehs/io/socket/DNS.h similarity index 80% rename from include/io/socket/DNS.h rename to include/ehs/io/socket/DNS.h index cbd1713..2e670e7 100644 --- a/include/io/socket/DNS.h +++ b/include/ehs/io/socket/DNS.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "Socket.h" namespace ehs diff --git a/include/io/socket/Endpoint.h b/include/ehs/io/socket/Endpoint.h similarity index 96% rename from include/io/socket/Endpoint.h rename to include/ehs/io/socket/Endpoint.h index bfc4c4a..75ce72c 100644 --- a/include/io/socket/Endpoint.h +++ b/include/ehs/io/socket/Endpoint.h @@ -1,11 +1,11 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "BaseObj.h" -#include "Vector.h" -#include "Serializer.h" -#include "io/socket/Socket.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/BaseObj.h" +#include "ehs/Vector.h" +#include "ehs/Serializer.h" +#include "Socket.h" #include "Utils.h" #include "Fragments.h" diff --git a/include/io/socket/Fragments.h b/include/ehs/io/socket/Fragments.h similarity index 92% rename from include/io/socket/Fragments.h rename to include/ehs/io/socket/Fragments.h index 0b793df..700b1af 100644 --- a/include/io/socket/Fragments.h +++ b/include/ehs/io/socket/Fragments.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Serializer.h" #include "Utils.h" diff --git a/include/io/socket/Operation.h b/include/ehs/io/socket/Operation.h similarity index 87% rename from include/io/socket/Operation.h rename to include/ehs/io/socket/Operation.h index 7f128c5..e5136a1 100644 --- a/include/io/socket/Operation.h +++ b/include/ehs/io/socket/Operation.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/socket/Request.h b/include/ehs/io/socket/Request.h similarity index 98% rename from include/io/socket/Request.h rename to include/ehs/io/socket/Request.h index a894609..ada9678 100644 --- a/include/io/socket/Request.h +++ b/include/ehs/io/socket/Request.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Vector.h" -#include "Str.h" -#include "json/Json.h" +#include "ehs/EHS.h" +#include "ehs/Vector.h" +#include "ehs/Str.h" +#include "ehs/json/Json.h" #include "Socket.h" namespace ehs diff --git a/include/io/socket/Response.h b/include/ehs/io/socket/Response.h similarity index 97% rename from include/io/socket/Response.h rename to include/ehs/io/socket/Response.h index 00db4fa..956ed8b 100644 --- a/include/io/socket/Response.h +++ b/include/ehs/io/socket/Response.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Vector.h" -#include "Str.h" -#include "json/Json.h" +#include "ehs/EHS.h" +#include "ehs/Vector.h" +#include "ehs/Str.h" +#include "ehs/json/Json.h" #include "Socket.h" namespace ehs diff --git a/include/io/socket/SSL.h b/include/ehs/io/socket/SSL.h similarity index 96% rename from include/io/socket/SSL.h rename to include/ehs/io/socket/SSL.h index 3bcd3e5..34827c7 100644 --- a/include/io/socket/SSL.h +++ b/include/ehs/io/socket/SSL.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "TCP.h" #include "Request.h" #include "Response.h" diff --git a/include/io/socket/Socket.h b/include/ehs/io/socket/Socket.h similarity index 100% rename from include/io/socket/Socket.h rename to include/ehs/io/socket/Socket.h diff --git a/include/io/socket/TCP.h b/include/ehs/io/socket/TCP.h similarity index 100% rename from include/io/socket/TCP.h rename to include/ehs/io/socket/TCP.h diff --git a/include/io/socket/TCP_BSD.h b/include/ehs/io/socket/TCP_BSD.h similarity index 98% rename from include/io/socket/TCP_BSD.h rename to include/ehs/io/socket/TCP_BSD.h index 161205d..f25e705 100644 --- a/include/io/socket/TCP_BSD.h +++ b/include/ehs/io/socket/TCP_BSD.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Log.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Log.h" #include "Socket.h" #include "BaseTCP.h" diff --git a/include/io/socket/TCP_W32.h b/include/ehs/io/socket/TCP_W32.h similarity index 98% rename from include/io/socket/TCP_W32.h rename to include/ehs/io/socket/TCP_W32.h index 161205d..f25e705 100644 --- a/include/io/socket/TCP_W32.h +++ b/include/ehs/io/socket/TCP_W32.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Log.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Log.h" #include "Socket.h" #include "BaseTCP.h" diff --git a/include/io/socket/UDP.h b/include/ehs/io/socket/UDP.h similarity index 100% rename from include/io/socket/UDP.h rename to include/ehs/io/socket/UDP.h diff --git a/include/io/socket/UDP_BSD.h b/include/ehs/io/socket/UDP_BSD.h similarity index 98% rename from include/io/socket/UDP_BSD.h rename to include/ehs/io/socket/UDP_BSD.h index 5acb9e0..193d635 100644 --- a/include/io/socket/UDP_BSD.h +++ b/include/ehs/io/socket/UDP_BSD.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "BaseUDP.h" namespace ehs diff --git a/include/io/socket/UDP_W32.h b/include/ehs/io/socket/UDP_W32.h similarity index 98% rename from include/io/socket/UDP_W32.h rename to include/ehs/io/socket/UDP_W32.h index 69fecf9..992efc0 100644 --- a/include/io/socket/UDP_W32.h +++ b/include/ehs/io/socket/UDP_W32.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "BaseUDP.h" namespace ehs diff --git a/include/io/socket/Utils.h b/include/ehs/io/socket/Utils.h similarity index 94% rename from include/io/socket/Utils.h rename to include/ehs/io/socket/Utils.h index 9c99c9a..6f8149c 100644 --- a/include/io/socket/Utils.h +++ b/include/ehs/io/socket/Utils.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Serializer.h" +#include "ehs/EHS.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/include/io/socket/rest/Spotify.h b/include/ehs/io/socket/rest/Spotify.h similarity index 96% rename from include/io/socket/rest/Spotify.h rename to include/ehs/io/socket/rest/Spotify.h index a019929..2ae077d 100644 --- a/include/io/socket/rest/Spotify.h +++ b/include/ehs/io/socket/rest/Spotify.h @@ -1,9 +1,9 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "Array.h" -#include "io/socket/SSL.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/Array.h" +#include "ehs/io/socket/SSL.h" namespace ehs { diff --git a/include/io/socket/rest/Twitch.h b/include/ehs/io/socket/rest/Twitch.h similarity index 87% rename from include/io/socket/rest/Twitch.h rename to include/ehs/io/socket/rest/Twitch.h index 70fa290..0d37eff 100644 --- a/include/io/socket/rest/Twitch.h +++ b/include/ehs/io/socket/rest/Twitch.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "io/socket/SSL.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/io/socket/SSL.h" namespace ehs { diff --git a/include/io/socket/rest/TwitchChat.h b/include/ehs/io/socket/rest/TwitchChat.h similarity index 90% rename from include/io/socket/rest/TwitchChat.h rename to include/ehs/io/socket/rest/TwitchChat.h index bc3bfcb..c971e44 100644 --- a/include/io/socket/rest/TwitchChat.h +++ b/include/ehs/io/socket/rest/TwitchChat.h @@ -1,8 +1,8 @@ #pragma once -#include "EHS.h" -#include "Str.h" -#include "io/socket/TCP.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/io/socket/TCP.h" namespace ehs { diff --git a/include/io/xdg-shell-client-protocol.h b/include/ehs/io/xdg-shell-client-protocol.h similarity index 100% rename from include/io/xdg-shell-client-protocol.h rename to include/ehs/io/xdg-shell-client-protocol.h diff --git a/include/json/Json.h b/include/ehs/json/Json.h similarity index 97% rename from include/json/Json.h rename to include/ehs/json/Json.h index 3497b68..d0bcdf1 100644 --- a/include/json/Json.h +++ b/include/ehs/json/Json.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "JsonBase.h" #include "JsonObj.h" #include "JsonArray.h" diff --git a/include/json/JsonArray.h b/include/ehs/json/JsonArray.h similarity index 96% rename from include/json/JsonArray.h rename to include/ehs/json/JsonArray.h index 4618832..3f56683 100644 --- a/include/json/JsonArray.h +++ b/include/ehs/json/JsonArray.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "JsonBase.h" namespace ehs diff --git a/include/json/JsonBase.h b/include/ehs/json/JsonBase.h similarity index 89% rename from include/json/JsonBase.h rename to include/ehs/json/JsonBase.h index f24fd77..7322096 100644 --- a/include/json/JsonBase.h +++ b/include/ehs/json/JsonBase.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/json/JsonBool.h b/include/ehs/json/JsonBool.h similarity index 88% rename from include/json/JsonBool.h rename to include/ehs/json/JsonBool.h index 9fec982..f0c1735 100644 --- a/include/json/JsonBool.h +++ b/include/ehs/json/JsonBool.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "JsonBase.h" diff --git a/include/json/JsonNum.h b/include/ehs/json/JsonNum.h similarity index 93% rename from include/json/JsonNum.h rename to include/ehs/json/JsonNum.h index da7f29f..bfb2695 100644 --- a/include/json/JsonNum.h +++ b/include/ehs/json/JsonNum.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "JsonBase.h" diff --git a/include/json/JsonObj.h b/include/ehs/json/JsonObj.h similarity index 96% rename from include/json/JsonObj.h rename to include/ehs/json/JsonObj.h index 4aa54d0..dfb5941 100644 --- a/include/json/JsonObj.h +++ b/include/ehs/json/JsonObj.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "JsonBase.h" diff --git a/include/json/JsonStr.h b/include/ehs/json/JsonStr.h similarity index 91% rename from include/json/JsonStr.h rename to include/ehs/json/JsonStr.h index 83ebc53..f5cc501 100644 --- a/include/json/JsonStr.h +++ b/include/ehs/json/JsonStr.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "JsonBase.h" diff --git a/include/json/JsonVar.h b/include/ehs/json/JsonVar.h similarity index 97% rename from include/json/JsonVar.h rename to include/ehs/json/JsonVar.h index 1c368d0..14210c8 100644 --- a/include/json/JsonVar.h +++ b/include/ehs/json/JsonVar.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/system/Architecture.h b/include/ehs/system/Architecture.h similarity index 100% rename from include/system/Architecture.h rename to include/ehs/system/Architecture.h diff --git a/include/system/BaseMutex.h b/include/ehs/system/BaseMutex.h similarity index 95% rename from include/system/BaseMutex.h rename to include/ehs/system/BaseMutex.h index 73e84c3..10229df 100644 --- a/include/system/BaseMutex.h +++ b/include/ehs/system/BaseMutex.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" namespace ehs { diff --git a/include/system/BaseOpen.h b/include/ehs/system/BaseOpen.h similarity index 95% rename from include/system/BaseOpen.h rename to include/ehs/system/BaseOpen.h index 95606ff..217eadb 100644 --- a/include/system/BaseOpen.h +++ b/include/ehs/system/BaseOpen.h @@ -1,6 +1,6 @@ #pragma once -#include "Str.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/system/BaseSemaphore.h b/include/ehs/system/BaseSemaphore.h similarity index 94% rename from include/system/BaseSemaphore.h rename to include/ehs/system/BaseSemaphore.h index 865d4c2..4ef1eaa 100644 --- a/include/system/BaseSemaphore.h +++ b/include/ehs/system/BaseSemaphore.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/system/BaseSystem.h b/include/ehs/system/BaseSystem.h similarity index 71% rename from include/system/BaseSystem.h rename to include/ehs/system/BaseSystem.h index f20e298..4818367 100644 --- a/include/system/BaseSystem.h +++ b/include/ehs/system/BaseSystem.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/system/CPU.h b/include/ehs/system/CPU.h similarity index 98% rename from include/system/CPU.h rename to include/ehs/system/CPU.h index ac0b7e1..e88d69d 100644 --- a/include/system/CPU.h +++ b/include/ehs/system/CPU.h @@ -1,10 +1,10 @@ #pragma once -#include "Types.h" +#include "ehs/Types.h" #include "Architecture.h" #include "OS.h" -#include "Str.h" -#include "Array.h" +#include "ehs/Str.h" +#include "ehs/Array.h" namespace ehs { diff --git a/include/system/FileSystem.h b/include/ehs/system/FileSystem.h similarity index 86% rename from include/system/FileSystem.h rename to include/ehs/system/FileSystem.h index 671790c..6f41550 100644 --- a/include/system/FileSystem.h +++ b/include/ehs/system/FileSystem.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/include/system/Mutex.h b/include/ehs/system/Mutex.h similarity index 85% rename from include/system/Mutex.h rename to include/ehs/system/Mutex.h index 10d81cc..900e4a2 100644 --- a/include/system/Mutex.h +++ b/include/ehs/system/Mutex.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #if defined(EHS_OS_WINDOWS) #include "Mutex_W32.h" diff --git a/include/system/Mutex_PT.h b/include/ehs/system/Mutex_PT.h similarity index 95% rename from include/system/Mutex_PT.h rename to include/ehs/system/Mutex_PT.h index f119c52..422b2aa 100644 --- a/include/system/Mutex_PT.h +++ b/include/ehs/system/Mutex_PT.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseMutex.h" #include diff --git a/include/system/Mutex_W32.h b/include/ehs/system/Mutex_W32.h similarity index 94% rename from include/system/Mutex_W32.h rename to include/ehs/system/Mutex_W32.h index 5de2db9..8e1a383 100644 --- a/include/system/Mutex_W32.h +++ b/include/ehs/system/Mutex_W32.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseMutex.h" namespace ehs diff --git a/include/system/OS.h b/include/ehs/system/OS.h similarity index 100% rename from include/system/OS.h rename to include/ehs/system/OS.h diff --git a/include/system/Open.h b/include/ehs/system/Open.h similarity index 100% rename from include/system/Open.h rename to include/ehs/system/Open.h diff --git a/include/system/Open_UNX.h b/include/ehs/system/Open_UNX.h similarity index 100% rename from include/system/Open_UNX.h rename to include/ehs/system/Open_UNX.h diff --git a/include/system/Open_W32.h b/include/ehs/system/Open_W32.h similarity index 100% rename from include/system/Open_W32.h rename to include/ehs/system/Open_W32.h diff --git a/include/system/Semaphore.h b/include/ehs/system/Semaphore.h similarity index 100% rename from include/system/Semaphore.h rename to include/ehs/system/Semaphore.h diff --git a/include/system/Semaphore_P.h b/include/ehs/system/Semaphore_P.h similarity index 94% rename from include/system/Semaphore_P.h rename to include/ehs/system/Semaphore_P.h index bcbc889..6ada2de 100644 --- a/include/system/Semaphore_P.h +++ b/include/ehs/system/Semaphore_P.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "BaseSemaphore.h" #include diff --git a/include/system/Semaphore_W32.h b/include/ehs/system/Semaphore_W32.h similarity index 93% rename from include/system/Semaphore_W32.h rename to include/ehs/system/Semaphore_W32.h index acf8826..8735e3c 100644 --- a/include/system/Semaphore_W32.h +++ b/include/ehs/system/Semaphore_W32.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" #include "BaseSemaphore.h" namespace ehs diff --git a/include/system/System.h b/include/ehs/system/System.h similarity index 85% rename from include/system/System.h rename to include/ehs/system/System.h index e8163a2..3be8116 100644 --- a/include/system/System.h +++ b/include/ehs/system/System.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #if defined(EHS_OS_WINDOWS) #include "System_W32.h" diff --git a/include/system/System_LNX.h b/include/ehs/system/System_LNX.h similarity index 87% rename from include/system/System_LNX.h rename to include/ehs/system/System_LNX.h index 25ac2f8..e09dbe6 100644 --- a/include/system/System_LNX.h +++ b/include/ehs/system/System_LNX.h @@ -1,6 +1,6 @@ #pragma once -#include "EHS.h" +#include "ehs/EHS.h" #include "BaseSystem.h" namespace ehs diff --git a/include/system/System_W32.h b/include/ehs/system/System_W32.h similarity index 100% rename from include/system/System_W32.h rename to include/ehs/system/System_W32.h diff --git a/include/system/Thread.h b/include/ehs/system/Thread.h similarity index 97% rename from include/system/Thread.h rename to include/ehs/system/Thread.h index 45df3b4..e73a4b7 100644 --- a/include/system/Thread.h +++ b/include/ehs/system/Thread.h @@ -1,10 +1,10 @@ #pragma once -#include "EHS.h" -#include "Serializer.h" -#include "Array.h" -#include "Log.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Serializer.h" +#include "ehs/Array.h" +#include "ehs/Log.h" +#include "ehs/Str.h" #ifdef EHS_OS_WINDOWS #include diff --git a/include/system/User.h b/include/ehs/system/User.h similarity index 82% rename from include/system/User.h rename to include/ehs/system/User.h index 3f8072f..f91b633 100644 --- a/include/system/User.h +++ b/include/ehs/system/User.h @@ -1,7 +1,7 @@ #pragma once -#include "EHS.h" -#include "Str.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" namespace ehs { diff --git a/src/Base64.cpp b/src/Base64.cpp index 2f977b8..852bfb1 100644 --- a/src/Base64.cpp +++ b/src/Base64.cpp @@ -1,4 +1,4 @@ -#include "Base64.h" +#include "ehs/Base64.h" namespace ehs { diff --git a/src/BaseObj.cpp b/src/BaseObj.cpp index f6569d6..4de18ad 100644 --- a/src/BaseObj.cpp +++ b/src/BaseObj.cpp @@ -1,4 +1,4 @@ -#include "BaseObj.h" +#include "ehs/BaseObj.h" namespace ehs { diff --git a/src/Color3.cpp b/src/Color3.cpp index 5f852d7..451375c 100644 --- a/src/Color3.cpp +++ b/src/Color3.cpp @@ -1,5 +1,5 @@ -#include "Color3.h" -#include "Math.h" +#include "ehs/Color3.h" +#include "ehs/Math.h" namespace ehs { diff --git a/src/Color4.cpp b/src/Color4.cpp index cce129a..9567a4d 100644 --- a/src/Color4.cpp +++ b/src/Color4.cpp @@ -1,5 +1,5 @@ -#include "Color4.h" -#include "Math.h" +#include "ehs/Color4.h" +#include "ehs/Math.h" namespace ehs { diff --git a/src/Data.cpp b/src/Data.cpp index f7f25aa..ffbd0b3 100644 --- a/src/Data.cpp +++ b/src/Data.cpp @@ -1,4 +1,4 @@ -#include "Data.h" +#include "ehs/Data.h" namespace ehs { diff --git a/src/DataType.cpp b/src/DataType.cpp index 0381cfd..119cfa7 100644 --- a/src/DataType.cpp +++ b/src/DataType.cpp @@ -1,4 +1,4 @@ -#include "DataType.h" +#include "ehs/DataType.h" namespace ehs { diff --git a/src/EHS.cpp b/src/EHS.cpp index 031b2c0..c8bfe1e 100644 --- a/src/EHS.cpp +++ b/src/EHS.cpp @@ -1,11 +1,11 @@ -#include "EHS.h" -#include "Log.h" -#include "Version.h" -#include "GarbageCollector.h" -#include "io/audio/Audio.h" -#include "io/img/Img.h" -#include "io/img/PNG.h" -#include "io/RIFF.h" +#include "ehs/EHS.h" +#include "ehs/Log.h" +#include "ehs/Version.h" +#include "ehs/GarbageCollector.h" +#include "ehs/io/audio/Audio.h" +#include "ehs/io/img/Img.h" +#include "ehs/io/img/PNG.h" +#include "ehs/io/RIFF.h" #include diff --git a/src/Encryption.cpp b/src/Encryption.cpp index 79f49ac..41daef0 100644 --- a/src/Encryption.cpp +++ b/src/Encryption.cpp @@ -1,5 +1,5 @@ -#include "Encryption.h" -#include "PRNG.h" +#include "ehs/Encryption.h" +#include "ehs/PRNG.h" namespace ehs { diff --git a/src/GarbageCollector.cpp b/src/GarbageCollector.cpp index 23c1a36..67be746 100644 --- a/src/GarbageCollector.cpp +++ b/src/GarbageCollector.cpp @@ -1,4 +1,4 @@ -#include "GarbageCollector.h" +#include "ehs/GarbageCollector.h" namespace ehs { diff --git a/src/HRNG_ARM64.cpp b/src/HRNG_ARM64.cpp index 7d1c0f2..2c5a066 100644 --- a/src/HRNG_ARM64.cpp +++ b/src/HRNG_ARM64.cpp @@ -1,4 +1,4 @@ -#include "HRNG.h" +#include "ehs/HRNG.h" namespace ehs { diff --git a/src/Log.cpp b/src/Log.cpp index 8dfbf2c..0b0e769 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -1,4 +1,4 @@ -#include "Log.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/Math.cpp b/src/Math.cpp index 00c505a..790a04e 100644 --- a/src/Math.cpp +++ b/src/Math.cpp @@ -1,5 +1,5 @@ -#include "Math.h" -#include "system/Architecture.h" +#include "ehs/Math.h" +#include "ehs/system/Architecture.h" namespace ehs { diff --git a/src/PtrData.cpp b/src/PtrData.cpp index 695b5a2..30b7275 100644 --- a/src/PtrData.cpp +++ b/src/PtrData.cpp @@ -1,4 +1,4 @@ -#include "PtrData.h" +#include "ehs/PtrData.h" namespace ehs { diff --git a/src/Range.cpp b/src/Range.cpp index 1bae7a6..068a265 100644 --- a/src/Range.cpp +++ b/src/Range.cpp @@ -2,4 +2,4 @@ // Created by Nelso on 3/29/2022. // -#include "Range.h" +#include "ehs/Range.h" diff --git a/src/StrToHash.cpp b/src/StrToHash.cpp index 4583a2d..0508916 100644 --- a/src/StrToHash.cpp +++ b/src/StrToHash.cpp @@ -1,6 +1,6 @@ -#include "EHS.h" -#include "Str.h" -#include "io/Console.h" +#include "ehs/EHS.h" +#include "ehs/Str.h" +#include "ehs/io/Console.h" ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer) { diff --git a/src/Task.cpp b/src/Task.cpp index 02f26f8..e7d960d 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -1,4 +1,4 @@ -#include "Task.h" +#include "ehs/Task.h" namespace ehs { diff --git a/src/Type.cpp b/src/Type.cpp index 118a438..9efdebf 100644 --- a/src/Type.cpp +++ b/src/Type.cpp @@ -1,4 +1,4 @@ -#include "Type.h" +#include "ehs/Type.h" namespace ehs { diff --git a/src/URI.cpp b/src/URI.cpp index 72e5ad4..46eaa3f 100644 --- a/src/URI.cpp +++ b/src/URI.cpp @@ -1,4 +1,4 @@ -#include "URI.h" +#include "ehs/URI.h" namespace ehs { diff --git a/src/Util.cpp b/src/Util.cpp index c0cbed8..6274956 100644 --- a/src/Util.cpp +++ b/src/Util.cpp @@ -1,4 +1,4 @@ -#include "Util.h" +#include "ehs/Util.h" namespace ehs { diff --git a/src/Version.cpp b/src/Version.cpp index ec60287..33798ab 100644 --- a/src/Version.cpp +++ b/src/Version.cpp @@ -1,4 +1,4 @@ -#include "Version.h" +#include "ehs/Version.h" namespace ehs { diff --git a/src/database/DVar.cpp b/src/database/DVar.cpp index 4e03a40..ae53a17 100644 --- a/src/database/DVar.cpp +++ b/src/database/DVar.cpp @@ -1,4 +1,4 @@ -#include "database/DVar.h" +#include "ehs/database/DVar.h" namespace ehs { diff --git a/src/io/BaseFile.cpp b/src/io/BaseFile.cpp index 59156b2..21db9ac 100644 --- a/src/io/BaseFile.cpp +++ b/src/io/BaseFile.cpp @@ -1,4 +1,4 @@ -#include "io/BaseFile.h" +#include "ehs/io/BaseFile.h" namespace ehs { diff --git a/src/io/BaseFileMonitor.cpp b/src/io/BaseFileMonitor.cpp index 622d105..81c247b 100644 --- a/src/io/BaseFileMonitor.cpp +++ b/src/io/BaseFileMonitor.cpp @@ -1,4 +1,4 @@ -#include "io/BaseFileMonitor.h" +#include "ehs/io/BaseFileMonitor.h" namespace ehs { diff --git a/src/io/BaseWindow.cpp b/src/io/BaseWindow.cpp index 42f6a4d..db0e5ec 100644 --- a/src/io/BaseWindow.cpp +++ b/src/io/BaseWindow.cpp @@ -1,4 +1,4 @@ -#include "io/BaseWindow.h" +#include "ehs/io/BaseWindow.h" namespace ehs { diff --git a/src/io/COM.cpp b/src/io/COM.cpp index 6831211..ec49844 100644 --- a/src/io/COM.cpp +++ b/src/io/COM.cpp @@ -1,6 +1,6 @@ #include "io/COM.h" -#include "Str.h" -#include "Log.h" +#include "ehs/Str.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/io/Console.cpp b/src/io/Console.cpp index c4b118d..f980b91 100644 --- a/src/io/Console.cpp +++ b/src/io/Console.cpp @@ -1,6 +1,6 @@ -#include "io/Console.h" -#include "Log.h" -#include "io/File.h" +#include "ehs/io/Console.h" +#include "ehs/Log.h" +#include "ehs/io/File.h" #if defined(EHS_OS_LINUX) #include diff --git a/src/io/FileMonitor_UNX.cpp b/src/io/FileMonitor_UNX.cpp index 7501790..f499c3a 100644 --- a/src/io/FileMonitor_UNX.cpp +++ b/src/io/FileMonitor_UNX.cpp @@ -1,5 +1,5 @@ -#include "io/FileMonitor_UNX.h" -#include "Log.h" +#include "ehs/io/FileMonitor_UNX.h" +#include "ehs/Log.h" #include #include diff --git a/src/io/FileMonitor_W32.cpp b/src/io/FileMonitor_W32.cpp index a65d59d..c3733a6 100644 --- a/src/io/FileMonitor_W32.cpp +++ b/src/io/FileMonitor_W32.cpp @@ -1,6 +1,6 @@ #include "io/FileMonitor_W32.h" -#include "Log.h" -#include "UTF.h" +#include "ehs/Log.h" +#include "ehs/UTF.h" #include diff --git a/src/io/File_UNX.cpp b/src/io/File_UNX.cpp index 51d5967..0cb1409 100644 --- a/src/io/File_UNX.cpp +++ b/src/io/File_UNX.cpp @@ -1,4 +1,4 @@ -#include "io/File_UNX.h" +#include "ehs/io/File_UNX.h" #include #include diff --git a/src/io/FontAtlas.cpp b/src/io/FontAtlas.cpp index 69b7aaa..764540a 100644 --- a/src/io/FontAtlas.cpp +++ b/src/io/FontAtlas.cpp @@ -1,6 +1,6 @@ -#include "io/FontAtlas.h" -#include "io/File.h" -#include "Serializer.h" +#include "ehs/io/FontAtlas.h" +#include "ehs/io/File.h" +#include "ehs/Serializer.h" namespace ehs { diff --git a/src/io/Glyph.cpp b/src/io/Glyph.cpp index c97a945..a5f1fae 100644 --- a/src/io/Glyph.cpp +++ b/src/io/Glyph.cpp @@ -1,4 +1,4 @@ -#include "io/Glyph.h" +#include "ehs/io/Glyph.h" namespace ehs { diff --git a/src/io/RIFF.cpp b/src/io/RIFF.cpp index 387c53a..fbf85bf 100644 --- a/src/io/RIFF.cpp +++ b/src/io/RIFF.cpp @@ -1,5 +1,5 @@ -#include "io/RIFF.h" -#include "io/File.h" +#include "ehs/io/RIFF.h" +#include "ehs/io/File.h" namespace ehs { diff --git a/src/io/RIFF_Chunk.cpp b/src/io/RIFF_Chunk.cpp index b5a6977..fdced6e 100644 --- a/src/io/RIFF_Chunk.cpp +++ b/src/io/RIFF_Chunk.cpp @@ -1,4 +1,4 @@ -#include "io/RIFF_Chunk.h" +#include "ehs/io/RIFF_Chunk.h" namespace ehs { diff --git a/src/io/Window_XCB.cpp b/src/io/Window_XCB.cpp index 8926547..52e8dff 100644 --- a/src/io/Window_XCB.cpp +++ b/src/io/Window_XCB.cpp @@ -1,9 +1,9 @@ -#include "io/Window_XCB.h" -#include "UTF.h" -#include "Vec2.h" -#include "io/hid/Keyboard.h" -#include "io/hid/Mouse.h" -#include "io/Console.h" +#include "ehs/io/Window_XCB.h" +#include "ehs/UTF.h" +#include "ehs/Vec2.h" +#include "ehs/io/hid/Keyboard.h" +#include "ehs/io/hid/Mouse.h" +#include "ehs/io/Console.h" #include #include @@ -12,11 +12,88 @@ namespace ehs { + Window::~Window() + { + if (hdl) + xcb_destroy_window(server, hdl); + + if (server) + xcb_disconnect(server); + } + Window::Window() - : server(nullptr), screen(nullptr), hdl(0), events{XCB_ATOM_NONE, XCB_ATOM_NONE}, extOpCode(0) + : server(nullptr), screen(nullptr), hdl(0), masks{}, extOpCode(0), events{XCB_ATOM_NONE, XCB_ATOM_NONE} { } + Window::Window(Window&& win) noexcept + : BaseWindow((BaseWindow&&)win), server(win.server), screen(win.screen), hdl(win.hdl), + masks{win.masks[0], win.masks[1]}, events((Vector)win.events), extOpCode(win.extOpCode), + clipboard((Serializer&&)win.clipboard) + { + win.server = nullptr; + win.screen = nullptr; + win.hdl = 0; + win.masks[0] = 0; + win.masks[1] = 0; + win.extOpCode = 0; + } + + Window::Window(const Window& win) + : BaseWindow(win), server(nullptr), screen(nullptr), hdl(0), masks{}, extOpCode(0), + events{XCB_ATOM_NONE, XCB_ATOM_NONE} + { + } + + Window& Window::operator=(Window&& win) noexcept + { + if (this == &win) + return *this; + + Close(); + + BaseWindow::operator=((BaseWindow&&)win); + + server = win.server; + screen = win.screen; + hdl = win.hdl; + masks[0] = win.masks[0]; + masks[1] = win.masks[1]; + extOpCode = win.extOpCode; + events = (Vector&&)win.events; + clipboard = (Serializer&&)win.clipboard; + + win.server = nullptr; + win.screen = nullptr; + win.hdl = 0; + win.masks[0] = 0; + win.masks[1] = 0; + win.extOpCode = 0; + + return *this; + } + + Window& Window::operator=(const Window& win) + { + if (this == &win) + return *this; + + Close(); + + BaseWindow::operator=(win); + + server = nullptr; + screen = nullptr; + hdl = 0; + masks[0] = 0; + masks[1] = 0; + extOpCode = 0; + events = {}; + clipboard = {}; + + return *this; + } + void Window::Create_32(const Str_32 &title, const Vec2_s32 &pos, const Vec2_u32 scale) { Create_8(UTF::To_8(title), pos, scale); diff --git a/src/io/audio/Audio.cpp b/src/io/audio/Audio.cpp index 28e1116..d67f5c8 100644 --- a/src/io/audio/Audio.cpp +++ b/src/io/audio/Audio.cpp @@ -1,6 +1,6 @@ -#include "io/audio/Audio.h" -#include "io/File.h" -#include "io/RIFF.h" +#include "ehs/io/audio/Audio.h" +#include "ehs/io/File.h" +#include "ehs/io/RIFF.h" namespace ehs { diff --git a/src/io/audio/AudioCodec.cpp b/src/io/audio/AudioCodec.cpp index 79e6c08..5d92381 100644 --- a/src/io/audio/AudioCodec.cpp +++ b/src/io/audio/AudioCodec.cpp @@ -1,4 +1,4 @@ -#include "io/audio/AudioCodec.h" +#include "ehs/io/audio/AudioCodec.h" namespace ehs { diff --git a/src/io/audio/AudioDevice_ALSA.cpp b/src/io/audio/AudioDevice_ALSA.cpp index b9eb19d..764436b 100644 --- a/src/io/audio/AudioDevice_ALSA.cpp +++ b/src/io/audio/AudioDevice_ALSA.cpp @@ -1,6 +1,6 @@ -#include "io/audio/AudioDevice_ALSA.h" -#include "EHS.h" -#include "Log.h" +#include "ehs/io/audio/AudioDevice_ALSA.h" +#include "ehs/EHS.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/io/audio/AudioDevice_W32.cpp b/src/io/audio/AudioDevice_W32.cpp index 87962e1..8c71ff2 100644 --- a/src/io/audio/AudioDevice_W32.cpp +++ b/src/io/audio/AudioDevice_W32.cpp @@ -1,5 +1,5 @@ #include "io/audio/AudioDevice_W32.h" -#include "Log.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/io/audio/BaseAudioDevice.cpp b/src/io/audio/BaseAudioDevice.cpp index 578dd0c..adc36ff 100644 --- a/src/io/audio/BaseAudioDevice.cpp +++ b/src/io/audio/BaseAudioDevice.cpp @@ -1,4 +1,4 @@ -#include "io/audio/BaseAudioDevice.h" +#include "ehs/io/audio/BaseAudioDevice.h" namespace ehs { diff --git a/src/io/hid/Button.cpp b/src/io/hid/Button.cpp index d11b524..bf47426 100644 --- a/src/io/hid/Button.cpp +++ b/src/io/hid/Button.cpp @@ -1,4 +1,4 @@ -#include "io/hid/Button.h" +#include "ehs/io/hid/Button.h" namespace ehs { diff --git a/src/io/hid/ButtonState.cpp b/src/io/hid/ButtonState.cpp index 4720ffc..881afae 100644 --- a/src/io/hid/ButtonState.cpp +++ b/src/io/hid/ButtonState.cpp @@ -1,4 +1,4 @@ -#include "io/hid/ButtonState.h" +#include "ehs/io/hid/ButtonState.h" namespace ehs { diff --git a/src/io/hid/HID.cpp b/src/io/hid/HID.cpp index 312479d..756f093 100644 --- a/src/io/hid/HID.cpp +++ b/src/io/hid/HID.cpp @@ -1,4 +1,4 @@ -#include "io/hid/HID.h" +#include "ehs/io/hid/HID.h" namespace ehs { diff --git a/src/io/hid/Input.cpp b/src/io/hid/Input.cpp index 1d2f4a4..d55106c 100644 --- a/src/io/hid/Input.cpp +++ b/src/io/hid/Input.cpp @@ -1,4 +1,4 @@ -#include "io/hid/Input.h" +#include "ehs/io/hid/Input.h" namespace ehs { diff --git a/src/io/hid/InputHandler.cpp b/src/io/hid/InputHandler.cpp index bc92029..4b52eda 100644 --- a/src/io/hid/InputHandler.cpp +++ b/src/io/hid/InputHandler.cpp @@ -1,4 +1,4 @@ -#include "io/hid/InputHandler.h" +#include "ehs/io/hid/InputHandler.h" namespace ehs { diff --git a/src/io/hid/Keyboard.cpp b/src/io/hid/Keyboard.cpp index f034553..125400c 100644 --- a/src/io/hid/Keyboard.cpp +++ b/src/io/hid/Keyboard.cpp @@ -1,4 +1,4 @@ -#include "io/hid/Keyboard.h" +#include "ehs/io/hid/Keyboard.h" namespace ehs { diff --git a/src/io/hid/Mouse.cpp b/src/io/hid/Mouse.cpp index ea114b1..d983c55 100644 --- a/src/io/hid/Mouse.cpp +++ b/src/io/hid/Mouse.cpp @@ -1,4 +1,4 @@ -#include "io/hid/Mouse.h" +#include "ehs/io/hid/Mouse.h" namespace ehs { diff --git a/src/io/img/Img.cpp b/src/io/img/Img.cpp index e8614d1..34b60f1 100644 --- a/src/io/img/Img.cpp +++ b/src/io/img/Img.cpp @@ -1,4 +1,4 @@ -#include "io/img/Img.h" +#include "ehs/io/img/Img.h" namespace ehs { diff --git a/src/io/img/ImgCodec.cpp b/src/io/img/ImgCodec.cpp index 7f61d5c..0281a26 100644 --- a/src/io/img/ImgCodec.cpp +++ b/src/io/img/ImgCodec.cpp @@ -1,5 +1,5 @@ -#include "io/img/ImgCodec.h" -#include "io/img/Img.h" +#include "ehs/io/img/ImgCodec.h" +#include "ehs/io/img/Img.h" namespace ehs { diff --git a/src/io/img/PNG.cpp b/src/io/img/PNG.cpp index 832cb80..2f64cd0 100644 --- a/src/io/img/PNG.cpp +++ b/src/io/img/PNG.cpp @@ -1,4 +1,4 @@ -#include "io/img/PNG.h" +#include "ehs/io/img/PNG.h" namespace ehs { diff --git a/src/io/img/PNG_Chunk.cpp b/src/io/img/PNG_Chunk.cpp index b85144b..fff8096 100644 --- a/src/io/img/PNG_Chunk.cpp +++ b/src/io/img/PNG_Chunk.cpp @@ -1,4 +1,4 @@ -#include "io/img/PNG_Chunk.h" +#include "ehs/io/img/PNG_Chunk.h" namespace ehs { diff --git a/src/io/model/AnimBone.cpp b/src/io/model/AnimBone.cpp index f20d4d8..0e973c7 100644 --- a/src/io/model/AnimBone.cpp +++ b/src/io/model/AnimBone.cpp @@ -1,4 +1,4 @@ -#include "io/model/AnimBone.h" +#include "ehs/io/model/AnimBone.h" #include diff --git a/src/io/model/Animation.cpp b/src/io/model/Animation.cpp index 689bb92..21c1de8 100644 --- a/src/io/model/Animation.cpp +++ b/src/io/model/Animation.cpp @@ -1,4 +1,4 @@ -#include "io/model/Animation.h" +#include "ehs/io/model/Animation.h" namespace ehs { diff --git a/src/io/model/Bone.cpp b/src/io/model/Bone.cpp index bfe855d..1cae5c2 100644 --- a/src/io/model/Bone.cpp +++ b/src/io/model/Bone.cpp @@ -1,4 +1,4 @@ -#include "io/model/Bone.h" +#include "ehs/io/model/Bone.h" namespace ehs { diff --git a/src/io/model/KeyFrame.cpp b/src/io/model/KeyFrame.cpp index 30cc542..525b940 100644 --- a/src/io/model/KeyFrame.cpp +++ b/src/io/model/KeyFrame.cpp @@ -1,4 +1,4 @@ -#include "io/model/KeyFrame.h" +#include "ehs/io/model/KeyFrame.h" #include diff --git a/src/io/model/Mesh.cpp b/src/io/model/Mesh.cpp index bd46dfb..d22eb7d 100644 --- a/src/io/model/Mesh.cpp +++ b/src/io/model/Mesh.cpp @@ -1,4 +1,4 @@ -#include "io/model/Mesh.h" +#include "ehs/io/model/Mesh.h" namespace ehs { @@ -92,7 +92,7 @@ namespace ehs vertices = newVertices; } - Array Mesh::GetVertices() const + const Array& Mesh::GetVertices() const { return vertices; } @@ -112,7 +112,7 @@ namespace ehs return indices.Size(); } - Array Mesh::GetIndices() const + const Array& Mesh::GetIndices() const { return indices; } diff --git a/src/io/model/Model.cpp b/src/io/model/Model.cpp index 8ae1f47..a46600f 100644 --- a/src/io/model/Model.cpp +++ b/src/io/model/Model.cpp @@ -1,4 +1,4 @@ -#include "io/model/Model.h" +#include "ehs/io/model/Model.h" namespace ehs { diff --git a/src/io/model/PropertyChange.cpp b/src/io/model/PropertyChange.cpp index 92c1f1a..5606e5f 100644 --- a/src/io/model/PropertyChange.cpp +++ b/src/io/model/PropertyChange.cpp @@ -1,4 +1,4 @@ -#include "io/model/PropertyChange.h" +#include "ehs/io/model/PropertyChange.h" namespace ehs { diff --git a/src/io/socket/BaseTCP.cpp b/src/io/socket/BaseTCP.cpp index 5195aef..959aa31 100644 --- a/src/io/socket/BaseTCP.cpp +++ b/src/io/socket/BaseTCP.cpp @@ -1,5 +1,5 @@ -#include "io/socket/BaseTCP.h" -#include "Log.h" +#include "ehs/io/socket/BaseTCP.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/io/socket/BaseUDP.cpp b/src/io/socket/BaseUDP.cpp index f1a8a5e..6af17a9 100644 --- a/src/io/socket/BaseUDP.cpp +++ b/src/io/socket/BaseUDP.cpp @@ -1,4 +1,4 @@ -#include "io/socket/BaseUDP.h" +#include "ehs/io/socket/BaseUDP.h" namespace ehs { diff --git a/src/io/socket/Comms.cpp b/src/io/socket/Comms.cpp index 14e3ce0..554dcdf 100644 --- a/src/io/socket/Comms.cpp +++ b/src/io/socket/Comms.cpp @@ -1,7 +1,7 @@ -#include "io/socket/Comms.h" -#include "io/socket/CommsSystem.h" -#include "io/socket/Endpoint.h" -#include "Encryption.h" +#include "ehs/io/socket/Comms.h" +#include "ehs/io/socket/CommsSystem.h" +#include "ehs/io/socket/Endpoint.h" +#include "ehs/Encryption.h" namespace ehs { diff --git a/src/io/socket/CommsSystem.cpp b/src/io/socket/CommsSystem.cpp index 860913d..831bddf 100644 --- a/src/io/socket/CommsSystem.cpp +++ b/src/io/socket/CommsSystem.cpp @@ -1,7 +1,7 @@ -#include "io/socket/CommsSystem.h" -#include "io/socket/Comms.h" -#include "io/socket/Endpoint.h" -#include "io/socket/Operation.h" +#include "ehs/io/socket/CommsSystem.h" +#include "ehs/io/socket/Comms.h" +#include "ehs/io/socket/Endpoint.h" +#include "ehs/io/socket/Operation.h" namespace ehs { diff --git a/src/io/socket/DNS.cpp b/src/io/socket/DNS.cpp index 64160cc..d54d521 100644 --- a/src/io/socket/DNS.cpp +++ b/src/io/socket/DNS.cpp @@ -1,5 +1,5 @@ -#include "io/socket/DNS.h" -#include "Log.h" +#include "ehs/io/socket/DNS.h" +#include "ehs/Log.h" #if defined(EHS_OS_WINDOWS) #include diff --git a/src/io/socket/Endpoint.cpp b/src/io/socket/Endpoint.cpp index 6a45771..5659d67 100644 --- a/src/io/socket/Endpoint.cpp +++ b/src/io/socket/Endpoint.cpp @@ -1,7 +1,7 @@ -#include "io/socket/Endpoint.h" -#include "io/socket/Comms.h" -#include "Encryption.h" -#include "system/CPU.h" +#include "ehs/io/socket/Endpoint.h" +#include "ehs/io/socket/Comms.h" +#include "ehs/Encryption.h" +#include "ehs/system/CPU.h" namespace ehs { diff --git a/src/io/socket/Fragments.cpp b/src/io/socket/Fragments.cpp index 71d3f49..21737d4 100644 --- a/src/io/socket/Fragments.cpp +++ b/src/io/socket/Fragments.cpp @@ -1,4 +1,4 @@ -#include "io/socket/Fragments.h" +#include "ehs/io/socket/Fragments.h" namespace ehs { diff --git a/src/io/socket/Operation.cpp b/src/io/socket/Operation.cpp index 675786c..b193e7d 100644 --- a/src/io/socket/Operation.cpp +++ b/src/io/socket/Operation.cpp @@ -1,7 +1,7 @@ -#include "io/socket/Operation.h" -#include "io/socket/CommsSystem.h" -#include "io/socket/Comms.h" -#include "io/socket/Endpoint.h" +#include "ehs/io/socket/Operation.h" +#include "ehs/io/socket/CommsSystem.h" +#include "ehs/io/socket/Comms.h" +#include "ehs/io/socket/Endpoint.h" namespace ehs { diff --git a/src/io/socket/Request.cpp b/src/io/socket/Request.cpp index 7cef3fe..c61c7eb 100644 --- a/src/io/socket/Request.cpp +++ b/src/io/socket/Request.cpp @@ -1,5 +1,5 @@ -#include "io/socket/Request.h" -#include "Base64.h" +#include "ehs/io/socket/Request.h" +#include "ehs/Base64.h" namespace ehs { diff --git a/src/io/socket/Response.cpp b/src/io/socket/Response.cpp index 1f40cc1..c5065dd 100644 --- a/src/io/socket/Response.cpp +++ b/src/io/socket/Response.cpp @@ -1,4 +1,4 @@ -#include "io/socket/Response.h" +#include "ehs/io/socket/Response.h" namespace ehs { diff --git a/src/io/socket/SSL.cpp b/src/io/socket/SSL.cpp index 276097b..a0764e1 100644 --- a/src/io/socket/SSL.cpp +++ b/src/io/socket/SSL.cpp @@ -1,4 +1,4 @@ -#include "io/socket/SSL.h" +#include "ehs/io/socket/SSL.h" #include #include diff --git a/src/io/socket/Socket.cpp b/src/io/socket/Socket.cpp index 1bc795b..a871291 100644 --- a/src/io/socket/Socket.cpp +++ b/src/io/socket/Socket.cpp @@ -1,7 +1,7 @@ #include "io/socket/Socket.h" #include "io/socket/Endpoint.h" #include "system/System.h" -#include "Encryption.h" +#include "ehs/Encryption.h" #if defined(EHS_OS_WINDOWS) #include diff --git a/src/io/socket/TCP_BSD.cpp b/src/io/socket/TCP_BSD.cpp index cbeb021..ebdf889 100644 --- a/src/io/socket/TCP_BSD.cpp +++ b/src/io/socket/TCP_BSD.cpp @@ -1,5 +1,5 @@ -#include "io/socket/TCP_BSD.h" -#include "io/socket/DNS.h" +#include "ehs/io/socket/TCP_BSD.h" +#include "ehs/io/socket/DNS.h" #include #include diff --git a/src/io/socket/UDP_BSD.cpp b/src/io/socket/UDP_BSD.cpp index 262a9d1..479bbfe 100644 --- a/src/io/socket/UDP_BSD.cpp +++ b/src/io/socket/UDP_BSD.cpp @@ -1,5 +1,5 @@ -#include "io/socket/UDP_BSD.h" -#include "Log.h" +#include "ehs/io/socket/UDP_BSD.h" +#include "ehs/Log.h" #include #include diff --git a/src/io/socket/UDP_W32.cpp b/src/io/socket/UDP_W32.cpp index fdca270..96d799a 100644 --- a/src/io/socket/UDP_W32.cpp +++ b/src/io/socket/UDP_W32.cpp @@ -1,5 +1,5 @@ #include "io/socket/UDP_W32.h" -#include "Log.h" +#include "ehs/Log.h" #include #include diff --git a/src/io/socket/rest/Spotify.cpp b/src/io/socket/rest/Spotify.cpp index 1b75c73..044c503 100644 --- a/src/io/socket/rest/Spotify.cpp +++ b/src/io/socket/rest/Spotify.cpp @@ -1,7 +1,7 @@ -#include "io/socket/rest/Spotify.h" -#include "io/socket/DNS.h" -#include "system/System.h" -#include "URI.h" +#include "ehs/io/socket/rest/Spotify.h" +#include "ehs/io/socket/DNS.h" +#include "ehs/system/System.h" +#include "ehs/URI.h" namespace ehs { diff --git a/src/io/socket/rest/Twitch.cpp b/src/io/socket/rest/Twitch.cpp index 6ffbee4..9145f75 100644 --- a/src/io/socket/rest/Twitch.cpp +++ b/src/io/socket/rest/Twitch.cpp @@ -1,7 +1,7 @@ -#include "io/socket/rest/Twitch.h" -#include "io/socket/DNS.h" -#include "system/System.h" -#include "URI.h" +#include "ehs/io/socket/rest/Twitch.h" +#include "ehs/io/socket/DNS.h" +#include "ehs/system/System.h" +#include "ehs/URI.h" namespace ehs { diff --git a/src/io/socket/rest/TwitchChat.cpp b/src/io/socket/rest/TwitchChat.cpp index 00f25f6..49aa3e2 100644 --- a/src/io/socket/rest/TwitchChat.cpp +++ b/src/io/socket/rest/TwitchChat.cpp @@ -1,6 +1,6 @@ -#include "io/socket/rest/TwitchChat.h" -#include "io/socket/DNS.h" -#include "io/Console.h" +#include "ehs/io/socket/rest/TwitchChat.h" +#include "ehs/io/socket/DNS.h" +#include "ehs/io/Console.h" namespace ehs { diff --git a/src/json/Json.cpp b/src/json/Json.cpp index d86b81e..c355106 100644 --- a/src/json/Json.cpp +++ b/src/json/Json.cpp @@ -1,5 +1,5 @@ -#include "json/Json.h" -#include "Log.h" +#include "ehs/json/Json.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/json/JsonArray.cpp b/src/json/JsonArray.cpp index 43c6106..3bf60f8 100644 --- a/src/json/JsonArray.cpp +++ b/src/json/JsonArray.cpp @@ -1,8 +1,8 @@ -#include "json/JsonArray.h" -#include "json/JsonObj.h" -#include "json/JsonBool.h" -#include "json/JsonNum.h" -#include "json/JsonStr.h" +#include "ehs/json/JsonArray.h" +#include "ehs/json/JsonObj.h" +#include "ehs/json/JsonBool.h" +#include "ehs/json/JsonNum.h" +#include "ehs/json/JsonStr.h" namespace ehs { diff --git a/src/json/JsonBase.cpp b/src/json/JsonBase.cpp index 7be9874..0204e5a 100644 --- a/src/json/JsonBase.cpp +++ b/src/json/JsonBase.cpp @@ -1,4 +1,4 @@ -#include "json/JsonBase.h" +#include "ehs/json/JsonBase.h" namespace ehs { diff --git a/src/json/JsonBool.cpp b/src/json/JsonBool.cpp index 0b30d33..9f67930 100644 --- a/src/json/JsonBool.cpp +++ b/src/json/JsonBool.cpp @@ -1,4 +1,4 @@ -#include "json/JsonBool.h" +#include "ehs/json/JsonBool.h" namespace ehs { diff --git a/src/json/JsonNum.cpp b/src/json/JsonNum.cpp index 23f5997..ab8ca1f 100644 --- a/src/json/JsonNum.cpp +++ b/src/json/JsonNum.cpp @@ -1,4 +1,4 @@ -#include "json/JsonNum.h" +#include "ehs/json/JsonNum.h" namespace ehs { diff --git a/src/json/JsonObj.cpp b/src/json/JsonObj.cpp index f532ebb..c7bcd6c 100644 --- a/src/json/JsonObj.cpp +++ b/src/json/JsonObj.cpp @@ -1,5 +1,5 @@ -#include "json/JsonObj.h" -#include "json/JsonVar.h" +#include "ehs/json/JsonObj.h" +#include "ehs/json/JsonVar.h" namespace ehs { diff --git a/src/json/JsonStr.cpp b/src/json/JsonStr.cpp index 5eaadcb..9839b90 100644 --- a/src/json/JsonStr.cpp +++ b/src/json/JsonStr.cpp @@ -1,4 +1,4 @@ -#include "json/JsonStr.h" +#include "ehs/json/JsonStr.h" namespace ehs { diff --git a/src/json/JsonVar.cpp b/src/json/JsonVar.cpp index 9a92939..9e17324 100644 --- a/src/json/JsonVar.cpp +++ b/src/json/JsonVar.cpp @@ -1,10 +1,10 @@ -#include "json/JsonVar.h" -#include "json/JsonBase.h" -#include "json/JsonObj.h" -#include "json/JsonArray.h" -#include "json/JsonBool.h" -#include "json/JsonNum.h" -#include "json/JsonStr.h" +#include "ehs/json/JsonVar.h" +#include "ehs/json/JsonBase.h" +#include "ehs/json/JsonObj.h" +#include "ehs/json/JsonArray.h" +#include "ehs/json/JsonBool.h" +#include "ehs/json/JsonNum.h" +#include "ehs/json/JsonStr.h" namespace ehs { diff --git a/src/system/BaseMutex.cpp b/src/system/BaseMutex.cpp index dba691d..ac0d85a 100644 --- a/src/system/BaseMutex.cpp +++ b/src/system/BaseMutex.cpp @@ -1,4 +1,4 @@ -#include "system/BaseMutex.h" +#include "ehs/system/BaseMutex.h" namespace ehs { diff --git a/src/system/BaseOpen.cpp b/src/system/BaseOpen.cpp index dc9524b..4ba6a5f 100644 --- a/src/system/BaseOpen.cpp +++ b/src/system/BaseOpen.cpp @@ -1,4 +1,4 @@ -#include "system/BaseOpen.h" +#include "ehs/system/BaseOpen.h" namespace ehs { diff --git a/src/system/BaseSemaphore.cpp b/src/system/BaseSemaphore.cpp index 2bf0756..99ca636 100644 --- a/src/system/BaseSemaphore.cpp +++ b/src/system/BaseSemaphore.cpp @@ -1,4 +1,4 @@ -#include "system/BaseSemaphore.h" +#include "ehs/system/BaseSemaphore.h" namespace ehs { diff --git a/src/system/BaseSystem.cpp b/src/system/BaseSystem.cpp index f7f0d83..a874d1d 100644 --- a/src/system/BaseSystem.cpp +++ b/src/system/BaseSystem.cpp @@ -1,4 +1,4 @@ -#include "system/BaseSystem.h" +#include "ehs/system/BaseSystem.h" namespace ehs { diff --git a/src/system/CPU.cpp b/src/system/CPU.cpp index c14280e..ccab72e 100644 --- a/src/system/CPU.cpp +++ b/src/system/CPU.cpp @@ -1,8 +1,8 @@ -#include "system/CPU.h" -#include "Log.h" -#include "io/File.h" -#include "json/Json.h" -#include "system/Thread.h" +#include "ehs/system/CPU.h" +#include "ehs/Log.h" +#include "ehs/io/File.h" +#include "ehs/json/Json.h" +#include "ehs/system/Thread.h" namespace ehs { diff --git a/src/system/FileSystem.cpp b/src/system/FileSystem.cpp index 1824eb3..aee552e 100644 --- a/src/system/FileSystem.cpp +++ b/src/system/FileSystem.cpp @@ -1,5 +1,5 @@ -#include "system/FileSystem.h" -#include "Log.h" +#include "ehs/system/FileSystem.h" +#include "ehs/Log.h" #include #include diff --git a/src/system/Mutex_PT.cpp b/src/system/Mutex_PT.cpp index 7ff8779..82ec5b5 100644 --- a/src/system/Mutex_PT.cpp +++ b/src/system/Mutex_PT.cpp @@ -1,4 +1,4 @@ -#include "system/Mutex_PT.h" +#include "ehs/system/Mutex_PT.h" namespace ehs { diff --git a/src/system/Mutex_W32.cpp b/src/system/Mutex_W32.cpp index 99cc63a..2d28131 100644 --- a/src/system/Mutex_W32.cpp +++ b/src/system/Mutex_W32.cpp @@ -1,6 +1,6 @@ #include "system/Mutex_W32.h" -#include "Str.h" -#include "Log.h" +#include "ehs/Str.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/system/Open_UNX.cpp b/src/system/Open_UNX.cpp index d8f5f8f..cd4f805 100644 --- a/src/system/Open_UNX.cpp +++ b/src/system/Open_UNX.cpp @@ -1,5 +1,5 @@ -#include "system/Open_UNX.h" -#include "Log.h" +#include "ehs/system/Open_UNX.h" +#include "ehs/Log.h" #include diff --git a/src/system/Semaphore_P.cpp b/src/system/Semaphore_P.cpp index f0f0e66..2841e0b 100644 --- a/src/system/Semaphore_P.cpp +++ b/src/system/Semaphore_P.cpp @@ -1,5 +1,5 @@ -#include "system/Semaphore_P.h" -#include "Log.h" +#include "ehs/system/Semaphore_P.h" +#include "ehs/Log.h" #include #include diff --git a/src/system/Semaphore_W32.cpp b/src/system/Semaphore_W32.cpp index 4cba541..5f001b2 100644 --- a/src/system/Semaphore_W32.cpp +++ b/src/system/Semaphore_W32.cpp @@ -1,6 +1,6 @@ #include "system/Semaphore_W32.h" -#include "UTF.h" -#include "Log.h" +#include "ehs/UTF.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/system/System_LNX.cpp b/src/system/System_LNX.cpp index 9820f7e..49e3c98 100644 --- a/src/system/System_LNX.cpp +++ b/src/system/System_LNX.cpp @@ -1,6 +1,6 @@ -#include "system/System_LNX.h" -#include "system/Thread.h" -#include "Log.h" +#include "ehs/system/System_LNX.h" +#include "ehs/system/Thread.h" +#include "ehs/Log.h" namespace ehs { diff --git a/src/system/Thread.cpp b/src/system/Thread.cpp index 43cedf0..5b902ad 100644 --- a/src/system/Thread.cpp +++ b/src/system/Thread.cpp @@ -1,5 +1,5 @@ -#include "system/Thread.h" -#include "system/CPU.h" +#include "ehs/system/Thread.h" +#include "ehs/system/CPU.h" #if defined(EHS_OS_WINDOWS) #include diff --git a/src/system/User.cpp b/src/system/User.cpp index 8a05ce2..9065cb1 100644 --- a/src/system/User.cpp +++ b/src/system/User.cpp @@ -1,5 +1,5 @@ -#include "system/User.h" -#include "Log.h" +#include "ehs/system/User.h" +#include "ehs/Log.h" #include #include