Changed project structure.
This commit is contained in:
parent
7dcd903140
commit
039ab8cc0f
287
CMakeLists.txt
287
CMakeLists.txt
@ -39,175 +39,176 @@ endif ()
|
|||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
set(EHS_SOURCES
|
set(EHS_SOURCES
|
||||||
src/EHS.cpp include/EHS.h
|
src/EHS.cpp include/ehs/EHS.h
|
||||||
src/Type.cpp include/Type.h
|
src/Type.cpp include/ehs/Type.h
|
||||||
src/BaseObj.cpp include/BaseObj.h
|
src/BaseObj.cpp include/ehs/BaseObj.h
|
||||||
src/GarbageCollector.cpp include/GarbageCollector.h
|
src/GarbageCollector.cpp include/ehs/GarbageCollector.h
|
||||||
src/Log.cpp include/Log.h
|
src/Log.cpp include/ehs/Log.h
|
||||||
src/URI.cpp include/URI.h
|
src/URI.cpp include/ehs/URI.h
|
||||||
src/Math.cpp include/Math.h
|
src/Math.cpp include/ehs/Math.h
|
||||||
src/Color4.cpp include/Color4.h
|
src/Color4.cpp include/ehs/Color4.h
|
||||||
src/Color3.cpp include/Color3.h
|
src/Color3.cpp include/ehs/Color3.h
|
||||||
src/Version.cpp include/Version.h
|
src/Version.cpp include/ehs/Version.h
|
||||||
src/Base64.cpp include/Base64.h
|
src/Base64.cpp include/ehs/Base64.h
|
||||||
src/Data.cpp include/Data.h
|
src/Data.cpp include/ehs/Data.h
|
||||||
src/Range.cpp include/Range.h
|
src/Range.cpp include/ehs/Range.h
|
||||||
src/Util.cpp include/Util.h
|
src/Util.cpp include/ehs/Util.h
|
||||||
src/Task.cpp include/Task.h
|
src/Task.cpp include/ehs/Task.h
|
||||||
src/DataType.cpp include/DataType.h
|
src/DataType.cpp include/ehs/DataType.h
|
||||||
src/Encryption.cpp include/Encryption.h
|
src/Encryption.cpp include/ehs/Encryption.h
|
||||||
include/Anchor.h
|
include/ehs/Anchor.h
|
||||||
include/Dock.h
|
include/ehs/Dock.h
|
||||||
include/HashMap.h
|
include/ehs/HashMap.h
|
||||||
include/HRNG.h
|
include/ehs/HRNG.h
|
||||||
include/Link.h
|
include/ehs/Link.h
|
||||||
include/LinkedList.h
|
include/ehs/LinkedList.h
|
||||||
include/Mat2.h
|
include/ehs/Mat2.h
|
||||||
include/Mat3.h
|
include/ehs/Mat3.h
|
||||||
include/Mat4.h
|
include/ehs/Mat4.h
|
||||||
include/PRNG.h
|
include/ehs/PRNG.h
|
||||||
include/Quat.h
|
include/ehs/Quat.h
|
||||||
include/Rect.h
|
include/ehs/Rect.h
|
||||||
include/Str.h
|
include/ehs/Str.h
|
||||||
include/Types.h
|
include/ehs/Types.h
|
||||||
include/UTF.h
|
include/ehs/UTF.h
|
||||||
include/Vec2.h
|
include/ehs/Vec2.h
|
||||||
include/Vec3.h
|
include/ehs/Vec3.h
|
||||||
include/Vec4.h
|
include/ehs/Vec4.h
|
||||||
include/Serializer.h
|
include/ehs/Serializer.h
|
||||||
include/Array.h
|
include/ehs/Array.h
|
||||||
include/Vector.h
|
include/ehs/Vector.h
|
||||||
include/SArray.h
|
include/ehs/SArray.h
|
||||||
src/PtrData.cpp include/PtrData.h
|
src/PtrData.cpp include/ehs/PtrData.h
|
||||||
include/UniPtr.h
|
include/ehs/UniPtr.h
|
||||||
include/ShdPtr.h
|
include/ehs/ShdPtr.h
|
||||||
include/WkPtr.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/CPU.cpp include/ehs/system/CPU.h
|
||||||
src/system/Thread.cpp include/system/Thread.h
|
src/system/Thread.cpp include/ehs/system/Thread.h
|
||||||
src/system/BaseMutex.cpp include/system/BaseMutex.h
|
src/system/BaseMutex.cpp include/ehs/system/BaseMutex.h
|
||||||
src/system/BaseSemaphore.cpp include/system/BaseSemaphore.h
|
src/system/BaseSemaphore.cpp include/ehs/system/BaseSemaphore.h
|
||||||
src/system/BaseSystem.cpp include/system/BaseSystem.h
|
src/system/BaseSystem.cpp include/ehs/system/BaseSystem.h
|
||||||
src/system/BaseOpen.cpp include/system/BaseOpen.h
|
src/system/BaseOpen.cpp include/ehs/system/BaseOpen.h
|
||||||
include/system/Architecture.h
|
include/ehs/system/Architecture.h
|
||||||
include/system/Mutex.h
|
include/ehs/system/Mutex.h
|
||||||
include/system/Open.h
|
include/ehs/system/Open.h
|
||||||
include/system/OS.h
|
include/ehs/system/OS.h
|
||||||
include/system/Semaphore.h
|
include/ehs/system/Semaphore.h
|
||||||
include/system/System.h
|
include/ehs/system/System.h
|
||||||
|
|
||||||
src/json/Json.cpp include/json/Json.h
|
src/json/Json.cpp include/ehs/json/Json.h
|
||||||
src/json/JsonBase.cpp include/json/JsonBase.h
|
src/json/JsonBase.cpp include/ehs/json/JsonBase.h
|
||||||
src/json/JsonNum.cpp include/json/JsonNum.h
|
src/json/JsonNum.cpp include/ehs/json/JsonNum.h
|
||||||
src/json/JsonBool.cpp include/json/JsonBool.h
|
src/json/JsonBool.cpp include/ehs/json/JsonBool.h
|
||||||
src/json/JsonStr.cpp include/json/JsonStr.h
|
src/json/JsonStr.cpp include/ehs/json/JsonStr.h
|
||||||
src/json/JsonObj.cpp include/json/JsonObj.h
|
src/json/JsonObj.cpp include/ehs/json/JsonObj.h
|
||||||
src/json/JsonArray.cpp include/json/JsonArray.h
|
src/json/JsonArray.cpp include/ehs/json/JsonArray.h
|
||||||
src/json/JsonVar.cpp include/json/JsonVar.h
|
src/json/JsonVar.cpp include/ehs/json/JsonVar.h
|
||||||
|
|
||||||
src/io/Console.cpp include/io/Console.h
|
src/io/Console.cpp include/ehs/io/Console.h
|
||||||
src/io/RIFF_Chunk.cpp include/io/RIFF_Chunk.h
|
src/io/RIFF_Chunk.cpp include/ehs/io/RIFF_Chunk.h
|
||||||
src/io/RIFF.cpp include/io/RIFF.h
|
src/io/RIFF.cpp include/ehs/io/RIFF.h
|
||||||
src/io/BaseWindow.cpp include/io/BaseWindow.h
|
src/io/BaseWindow.cpp include/ehs/io/BaseWindow.h
|
||||||
src/io/BaseFile.cpp include/io/BaseFile.h
|
src/io/BaseFile.cpp include/ehs/io/BaseFile.h
|
||||||
src/io/Glyph.cpp include/io/Glyph.h
|
src/io/Glyph.cpp include/ehs/io/Glyph.h
|
||||||
src/io/FontAtlas.cpp include/io/FontAtlas.h
|
src/io/FontAtlas.cpp include/ehs/io/FontAtlas.h
|
||||||
src/io/BaseFileMonitor.cpp include/io/BaseFileMonitor.h
|
src/io/BaseFileMonitor.cpp include/ehs/io/BaseFileMonitor.h
|
||||||
include/io/COM.h
|
include/ehs/io/COM.h
|
||||||
include/io/File.h
|
include/ehs/io/File.h
|
||||||
include/io/FileMonitor.h
|
include/ehs/io/FileMonitor.h
|
||||||
include/io/Window.h
|
include/ehs/io/Window.h
|
||||||
|
|
||||||
src/io/socket/Request.cpp include/io/socket/Request.h
|
include/ehs/io/socket/Utils.h
|
||||||
src/io/socket/Response.cpp include/io/socket/Response.h
|
src/io/socket/Request.cpp include/ehs/io/socket/Request.h
|
||||||
src/io/socket/DNS.cpp include/io/socket/DNS.h
|
src/io/socket/Response.cpp include/ehs/io/socket/Response.h
|
||||||
src/io/socket/BaseUDP.cpp include/io/socket/BaseUDP.h
|
src/io/socket/DNS.cpp include/ehs/io/socket/DNS.h
|
||||||
src/io/socket/BaseTCP.cpp include/io/socket/BaseTCP.h
|
src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h
|
||||||
src/io/socket/Comms.cpp include/io/socket/Comms.h
|
src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h
|
||||||
src/io/socket/CommsSystem.cpp include/io/socket/CommsSystem.h
|
src/io/socket/Comms.cpp include/ehs/io/socket/Comms.h
|
||||||
src/io/socket/Operation.cpp include/io/socket/Operation.h
|
src/io/socket/CommsSystem.cpp include/ehs/io/socket/CommsSystem.h
|
||||||
src/io/socket/Fragments.cpp include/io/socket/Fragments.h
|
src/io/socket/Operation.cpp include/ehs/io/socket/Operation.h
|
||||||
src/io/socket/Endpoint.cpp include/io/socket/Endpoint.h
|
src/io/socket/Fragments.cpp include/ehs/io/socket/Fragments.h
|
||||||
src/io/socket/SSL.cpp include/io/socket/SSL.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/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
|
||||||
src/io/socket/rest/TwitchChat.cpp include/io/socket/rest/TwitchChat.h
|
src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
|
||||||
src/io/socket/rest/Spotify.cpp include/io/socket/rest/Spotify.h
|
src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h
|
||||||
include/io/socket/Socket.h
|
include/ehs/io/socket/Socket.h
|
||||||
include/io/socket/TCP.h
|
include/ehs/io/socket/TCP.h
|
||||||
include/io/socket/UDP.h
|
include/ehs/io/socket/UDP.h
|
||||||
include/io/socket/Utils.h
|
include/ehs/io/socket/Utils.h
|
||||||
|
|
||||||
src/io/audio/Audio.cpp include/io/audio/Audio.h
|
src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h
|
||||||
src/io/audio/BaseAudioDevice.cpp include/io/audio/BaseAudioDevice.h
|
src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h
|
||||||
src/io/audio/AudioCodec.cpp include/io/audio/AudioCodec.h
|
src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h
|
||||||
include/io/audio/AudioDevice.h
|
include/ehs/io/audio/AudioDevice.h
|
||||||
|
|
||||||
src/io/img/PNG.cpp include/io/img/PNG.h
|
src/io/img/PNG.cpp include/ehs/io/img/PNG.h
|
||||||
src/io/img/Img.cpp include/io/img/Img.h
|
src/io/img/Img.cpp include/ehs/io/img/Img.h
|
||||||
src/io/img/PNG_Chunk.cpp include/io/img/PNG_Chunk.h
|
src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h
|
||||||
src/io/img/ImgCodec.cpp include/io/img/ImgCodec.h
|
src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h
|
||||||
|
|
||||||
include/io/model/Vertex.h
|
include/ehs/io/model/Vertex.h
|
||||||
src/io/model/Mesh.cpp include/io/model/Mesh.h
|
src/io/model/Mesh.cpp include/ehs/io/model/Mesh.h
|
||||||
src/io/model/Bone.cpp include/io/model/Bone.h
|
src/io/model/Bone.cpp include/ehs/io/model/Bone.h
|
||||||
src/io/model/Model.cpp include/io/model/Model.h
|
src/io/model/Model.cpp include/ehs/io/model/Model.h
|
||||||
src/io/model/Animation.cpp include/io/model/Animation.h
|
src/io/model/Animation.cpp include/ehs/io/model/Animation.h
|
||||||
src/io/model/AnimBone.cpp include/io/model/AnimBone.h
|
src/io/model/AnimBone.cpp include/ehs/io/model/AnimBone.h
|
||||||
src/io/model/KeyFrame.cpp include/io/model/KeyFrame.h
|
src/io/model/KeyFrame.cpp include/ehs/io/model/KeyFrame.h
|
||||||
src/io/model/PropertyChange.cpp include/io/model/PropertyChange.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/ButtonState.cpp include/ehs/io/hid/ButtonState.h
|
||||||
src/io/hid/Button.cpp include/io/hid/Button.h
|
src/io/hid/Button.cpp include/ehs/io/hid/Button.h
|
||||||
src/io/hid/Mouse.cpp include/io/hid/Mouse.h
|
src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h
|
||||||
src/io/hid/Keyboard.cpp include/io/hid/Keyboard.h
|
src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h
|
||||||
src/io/hid/HID.cpp include/io/hid/HID.h
|
src/io/hid/HID.cpp include/ehs/io/hid/HID.h
|
||||||
src/io/hid/InputHandler.cpp include/io/hid/InputHandler.h
|
src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h
|
||||||
src/io/hid/Input.cpp include/io/hid/Input.h
|
src/io/hid/Input.cpp include/ehs/io/hid/Input.h
|
||||||
)
|
)
|
||||||
|
|
||||||
if (IS_OS_WINDOWS)
|
if (IS_OS_WINDOWS)
|
||||||
list(APPEND EHS_SOURCES
|
list(APPEND EHS_SOURCES
|
||||||
src/io/socket/UDP_W32.cpp include/io/socket/UDP_W32.h
|
src/io/socket/UDP_W32.cpp include/ehs/io/socket/UDP_W32.h
|
||||||
src/io/socket/TCP_W32.cpp include/io/socket/TCP_W32.h
|
src/io/socket/TCP_W32.cpp include/ehs/io/socket/TCP_W32.h
|
||||||
src/system/Semaphore_W32.cpp include/system/Semaphore_W32.h
|
src/system/Semaphore_W32.cpp include/ehs/system/Semaphore_W32.h
|
||||||
src/system/System_W32.cpp include/system/System_W32.h
|
src/system/System_W32.cpp include/ehs/system/System_W32.h
|
||||||
src/system/Mutex_W32.cpp include/system/Mutex_W32.h
|
src/system/Mutex_W32.cpp include/ehs/system/Mutex_W32.h
|
||||||
src/system/Open_W32.cpp include/system/Open_W32.h
|
src/system/Open_W32.cpp include/ehs/system/Open_W32.h
|
||||||
src/io/audio/audioDevice_W32.cpp include/io/audio/audioDevice_W32.h
|
src/io/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h
|
||||||
src/io/MsgBox.cpp include/io/MsgBox.h
|
src/io/MsgBox.cpp include/ehs/io/MsgBox.h
|
||||||
src/io/File_W32.cpp include/io/File_W32.h
|
src/io/File_W32.cpp include/ehs/io/File_W32.h
|
||||||
src/io/FileMonitor_W32.cpp include/io/FileMonitor_W32.h
|
src/io/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h
|
||||||
src/io/Window_W32.cpp include/io/Window_W32.h
|
src/io/Window_W32.cpp include/ehs/io/Window_W32.h
|
||||||
src/io/COM.cpp include/io/COM.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
|
src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm
|
||||||
)
|
)
|
||||||
elseif (IS_OS_LINUX)
|
elseif (IS_OS_LINUX)
|
||||||
list(APPEND EHS_SOURCES
|
list(APPEND EHS_SOURCES
|
||||||
src/io/socket/UDP_BSD.cpp include/io/socket/UDP_BSD.h
|
src/io/socket/UDP_BSD.cpp include/ehs/io/socket/UDP_BSD.h
|
||||||
src/io/socket/TCP_BSD.cpp include/io/socket/TCP_BSD.h
|
src/io/socket/TCP_BSD.cpp include/ehs/io/socket/TCP_BSD.h
|
||||||
src/system/Semaphore_P.cpp include/system/Semaphore_P.h
|
src/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.h
|
||||||
src/system/System_LNX.cpp include/system/System_LNX.h
|
src/system/System_LNX.cpp include/ehs/system/System_LNX.h
|
||||||
src/system/Open_UNX.cpp include/system/Open_UNX.h
|
src/system/Open_UNX.cpp include/ehs/system/Open_UNX.h
|
||||||
src/io/File_UNX.cpp include/io/File_UNX.h
|
src/io/File_UNX.cpp include/ehs/io/File_UNX.h
|
||||||
src/io/FileMonitor_UNX.cpp include/io/FileMonitor_UNX.h
|
src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_UNX.h
|
||||||
src/system/Mutex_PT.cpp include/system/Mutex_PT.h
|
src/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h
|
||||||
src/io/audio/AudioDevice_ALSA.cpp include/io/audio/AudioDevice_ALSA.h
|
src/io/audio/AudioDevice_ALSA.cpp include/ehs/io/audio/AudioDevice_ALSA.h
|
||||||
src/system/FileSystem.cpp include/system/FileSystem.h
|
src/system/FileSystem.cpp include/ehs/system/FileSystem.h
|
||||||
src/system/User.cpp include/system/User.h
|
src/system/User.cpp include/ehs/system/User.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System")
|
set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System")
|
||||||
|
|
||||||
if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
|
if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
|
||||||
add_compile_definitions(EHS_WS_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.")
|
message("Building for Wayland.")
|
||||||
elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB")
|
elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB")
|
||||||
add_compile_definitions(EHS_WS_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.")
|
message("Building for XCB.")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
@ -230,7 +231,7 @@ add_executable(StrToHash src/StrToHash.cpp)
|
|||||||
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/Libraries/EHS")
|
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/Libraries/EHS")
|
||||||
install(TARGETS EHS DESTINATION lib)
|
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)
|
install(TARGETS StrToHash DESTINATION bin)
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
enum class Dock
|
|
||||||
{
|
|
||||||
NONE,
|
|
||||||
FILL
|
|
||||||
};
|
|
||||||
@ -355,16 +355,32 @@ namespace ehs
|
|||||||
{
|
{
|
||||||
T* result = new T[--size];
|
T* result = new T[--size];
|
||||||
|
|
||||||
T value = std::move(data[size]);
|
T popped = (T&&)data[size];
|
||||||
|
|
||||||
for (N i = 0; i < size; ++i)
|
for (N i = 0; i < size; ++i)
|
||||||
result[i] = std::move(data[i]);
|
result[i] = (T&&)data[i];
|
||||||
|
|
||||||
delete[] data;
|
delete[] data;
|
||||||
|
|
||||||
data = result;
|
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()
|
void Clear()
|
||||||
10
include/ehs/Dock.h
Normal file
10
include/ehs/Dock.h
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ehs
|
||||||
|
{
|
||||||
|
enum class Dock
|
||||||
|
{
|
||||||
|
NONE,
|
||||||
|
FILL
|
||||||
|
};
|
||||||
|
}
|
||||||
@ -7,7 +7,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Types.h"
|
#include "Types.h"
|
||||||
#include "system/OS.h"
|
#include "ehs/system/OS.h"
|
||||||
#include "Version.h"
|
#include "Version.h"
|
||||||
#include "Str.h"
|
#include "Str.h"
|
||||||
|
|
||||||
@ -3,8 +3,8 @@
|
|||||||
#include "EHS.h"
|
#include "EHS.h"
|
||||||
#include "Vector.h"
|
#include "Vector.h"
|
||||||
#include "BaseObj.h"
|
#include "BaseObj.h"
|
||||||
#include "system/Mutex.h"
|
#include "ehs/system/Mutex.h"
|
||||||
#include "system/Thread.h"
|
#include "ehs/system/Thread.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "system/CPU.h"
|
#include "ehs/system/CPU.h"
|
||||||
|
|
||||||
#define EHS_LOW_WORD(x) *((int*)&x) + 1
|
#define EHS_LOW_WORD(x) *((int*)&x) + 1
|
||||||
|
|
||||||
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
#include "EHS.h"
|
#include "EHS.h"
|
||||||
#include "BaseObj.h"
|
#include "BaseObj.h"
|
||||||
#include "system/Thread.h"
|
#include "ehs/system/Thread.h"
|
||||||
#include "system/Semaphore.h"
|
#include "ehs/system/Semaphore.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "system/OS.h"
|
#include "ehs/system/OS.h"
|
||||||
|
|
||||||
#define EHS_MAX_PATH 0x104
|
#define EHS_MAX_PATH 0x104
|
||||||
#define EHS_UINT_8_MAX 0xFF
|
#define EHS_UINT_8_MAX 0xFF
|
||||||
@ -510,7 +510,7 @@ namespace ehs
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Much like the stack it pops a value at the end of the vector.
|
/// 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 Pop()
|
||||||
{
|
{
|
||||||
T popped = {};
|
T popped = {};
|
||||||
@ -546,6 +546,22 @@ namespace ehs
|
|||||||
return popped;
|
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.
|
/// Resizes the vector while keeping its alignment.
|
||||||
/// @param [in] newSize The size to change to.
|
/// @param [in] newSize The size to change to.
|
||||||
void Resize(const N newSize)
|
void Resize(const N newSize)
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "BaseObj.h"
|
#include "ehs/BaseObj.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
|
|
||||||
#define EHS_FE_NONE 0x00
|
#define EHS_FE_NONE 0x00
|
||||||
#define EHS_FE_MODIFIED 0x01
|
#define EHS_FE_MODIFIED 0x01
|
||||||
@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Vec2.h"
|
#include "ehs/Vec2.h"
|
||||||
#include "Rect.h"
|
#include "ehs/Rect.h"
|
||||||
#include "hid/Input.h"
|
#include "ehs/io/hid/Input.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "UTF.h"
|
#include "ehs/UTF.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
|
|
||||||
#if defined(EHS_OS_WINDOWS)
|
#if defined(EHS_OS_WINDOWS)
|
||||||
#include "File_W32.h"
|
#include "File_W32.h"
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "BaseFileMonitor.h"
|
#include "BaseFileMonitor.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "BaseFileMonitor.h"
|
#include "BaseFileMonitor.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "UTF.h"
|
#include "ehs/UTF.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "BaseFile.h"
|
#include "BaseFile.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "UTF.h"
|
#include "ehs/UTF.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "BaseFile.h"
|
#include "BaseFile.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,12 +1,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
|
|
||||||
#include "Glyph.h"
|
#include "Glyph.h"
|
||||||
#include "Anchor.h"
|
#include "ehs/Anchor.h"
|
||||||
#include "img/Img.h"
|
#include "ehs/io/img/Img.h"
|
||||||
#include "model/Mesh.h"
|
#include "ehs/io/model/Mesh.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Vec2.h"
|
#include "ehs/Vec2.h"
|
||||||
#include "Rect.h"
|
#include "ehs/Rect.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "RIFF_Chunk.h"
|
#include "RIFF_Chunk.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/system/OS.h"
|
||||||
|
|
||||||
#if defined(EHS_OS_WINDOWS)
|
#if defined(EHS_OS_WINDOWS)
|
||||||
#include "Window_W32.h"
|
#include "Window_W32.h"
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Vec4.h"
|
#include "ehs/Vec4.h"
|
||||||
#include "BaseWindow.h"
|
#include "BaseWindow.h"
|
||||||
#include "HID/InputHandler.h"
|
#include "HID/InputHandler.h"
|
||||||
|
|
||||||
@ -22,13 +22,23 @@ namespace ehs
|
|||||||
Serializer<UInt_64> clipboard;
|
Serializer<UInt_64> clipboard;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
~Window() override;
|
||||||
|
|
||||||
Window();
|
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;
|
void Close() override;
|
||||||
|
|
||||||
@ -40,7 +50,7 @@ namespace ehs
|
|||||||
|
|
||||||
void ShowCursor(bool toggle) override;
|
void ShowCursor(bool toggle) override;
|
||||||
|
|
||||||
void ConstrainCursor(const bool constrain) override;
|
void ConstrainCursor(bool constrain) override;
|
||||||
|
|
||||||
void SetTitle_32(const Str_32& newTitle) override;
|
void SetTitle_32(const Str_32& newTitle) override;
|
||||||
|
|
||||||
@ -66,19 +76,19 @@ namespace ehs
|
|||||||
|
|
||||||
void SetClipboard(Serializer<UInt_64> data) override;
|
void SetClipboard(Serializer<UInt_64> data) override;
|
||||||
|
|
||||||
void SetCursorImg(const CursorImg img) override;
|
void SetCursorImg(CursorImg img) override;
|
||||||
|
|
||||||
xcb_connection_t* GetServer();
|
xcb_connection_t* GetServer();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
xcb_generic_event_t* RetrieveEvent();
|
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();
|
void QueryPrimaryDevices();
|
||||||
|
|
||||||
Str_8 QueryDeviceName(const UInt_16 id);
|
Str_8 QueryDeviceName(UInt_16 id);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -1,12 +1,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Types.h"
|
#include "ehs/Types.h"
|
||||||
#include "BaseObj.h"
|
#include "ehs/BaseObj.h"
|
||||||
#include "DataType.h"
|
#include "ehs/DataType.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "AudioCodec.h"
|
#include "AudioCodec.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "io/File.h"
|
#include "ehs/io/File.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
|
|
||||||
#if defined(EHS_OS_WINDOWS)
|
#if defined(EHS_OS_WINDOWS)
|
||||||
#include "AudioDevice_W32.h"
|
#include "AudioDevice_W32.h"
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "BaseAudioDevice.h"
|
#include "BaseAudioDevice.h"
|
||||||
|
|
||||||
#include <alsa/asoundlib.h>
|
#include <alsa/asoundlib.h>
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "BaseAudioDevice.h"
|
#include "BaseAudioDevice.h"
|
||||||
|
|
||||||
#include <initguid.h>
|
#include <initguid.h>
|
||||||
@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "DataType.h"
|
#include "ehs/DataType.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Button.h"
|
#include "Button.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "ButtonState.h"
|
#include "ButtonState.h"
|
||||||
|
|
||||||
#define EHS_HID_UNKNOWN 0
|
#define EHS_HID_UNKNOWN 0
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "InputHandler.h"
|
#include "InputHandler.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "HID.h"
|
#include "HID.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Types.h"
|
#include "ehs/Types.h"
|
||||||
#include "Button.h"
|
#include "Button.h"
|
||||||
#include "HID.h"
|
#include "HID.h"
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Types.h"
|
#include "ehs/Types.h"
|
||||||
#include "Vec2.h"
|
#include "ehs/Vec2.h"
|
||||||
#include "Button.h"
|
#include "Button.h"
|
||||||
#include "HID.h"
|
#include "HID.h"
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Types.h"
|
#include "ehs/Types.h"
|
||||||
#include "BaseObj.h"
|
#include "ehs/BaseObj.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "ImgCodec.h"
|
#include "ImgCodec.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "io/File.h"
|
#include "ehs/io/File.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "PNG_Chunk.h"
|
#include "PNG_Chunk.h"
|
||||||
#include "Img.h"
|
#include "Img.h"
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "KeyFrame.h"
|
#include "KeyFrame.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "AnimBone.h"
|
#include "AnimBone.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Quat.h"
|
#include "ehs/Quat.h"
|
||||||
#include "Mat4.h"
|
#include "ehs/Mat4.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Vec3.h"
|
#include "ehs/Vec3.h"
|
||||||
#include "Quat.h"
|
#include "ehs/Quat.h"
|
||||||
#include "Mat4.h"
|
#include "ehs/Mat4.h"
|
||||||
#include "PropertyChange.h"
|
#include "PropertyChange.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Vertex.h"
|
#include "Vertex.h"
|
||||||
#include "BaseObj.h"
|
#include "ehs/BaseObj.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -72,7 +72,7 @@ namespace ehs
|
|||||||
|
|
||||||
void SetVertices(const Array<Vertex_f>& newVertices);
|
void SetVertices(const Array<Vertex_f>& newVertices);
|
||||||
|
|
||||||
Array<Vertex_f> GetVertices() const;
|
const Array<Vertex_f>& GetVertices() const;
|
||||||
|
|
||||||
Array<Vertex_f>& GetVertices();
|
Array<Vertex_f>& GetVertices();
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ namespace ehs
|
|||||||
|
|
||||||
bool HasIndices() const;
|
bool HasIndices() const;
|
||||||
|
|
||||||
Array<UInt_32> GetIndices() const;
|
const Array<UInt_32>& GetIndices() const;
|
||||||
|
|
||||||
Array<UInt_32>& GetIndices();
|
Array<UInt_32>& GetIndices();
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "io/File.h"
|
#include "ehs/io/File.h"
|
||||||
#include "Mesh.h"
|
#include "Mesh.h"
|
||||||
#include "Bone.h"
|
#include "Bone.h"
|
||||||
#include "Animation.h"
|
#include "Animation.h"
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Vec4.h"
|
#include "ehs/Vec4.h"
|
||||||
#include "Vec3.h"
|
#include "ehs/Vec3.h"
|
||||||
#include "Vec2.h"
|
#include "ehs/Vec2.h"
|
||||||
#include "Color4.h"
|
#include "ehs/Color4.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Request.h"
|
#include "Request.h"
|
||||||
#include "Response.h"
|
#include "Response.h"
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Socket.h"
|
#include "Socket.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Log.h"
|
#include "ehs/Log.h"
|
||||||
#include "BaseObj.h"
|
#include "ehs/BaseObj.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Socket.h"
|
#include "Socket.h"
|
||||||
#include "UDP.h"
|
#include "UDP.h"
|
||||||
|
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Array.h"
|
#include "ehs/Array.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Socket.h"
|
#include "Socket.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "BaseObj.h"
|
#include "ehs/BaseObj.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
#include "io/socket/Socket.h"
|
#include "Socket.h"
|
||||||
|
|
||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
#include "Fragments.h"
|
#include "Fragments.h"
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
|
|
||||||
@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "Serializer.h"
|
#include "ehs/Serializer.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
{
|
{
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "json/Json.h"
|
#include "ehs/json/Json.h"
|
||||||
#include "Socket.h"
|
#include "Socket.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "EHS.h"
|
#include "ehs/EHS.h"
|
||||||
#include "Vector.h"
|
#include "ehs/Vector.h"
|
||||||
#include "Str.h"
|
#include "ehs/Str.h"
|
||||||
#include "json/Json.h"
|
#include "ehs/json/Json.h"
|
||||||
#include "Socket.h"
|
#include "Socket.h"
|
||||||
|
|
||||||
namespace ehs
|
namespace ehs
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user