EventHorizonStudio/EHS
EventHorizonStudio/EHS
3
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 1 Releases 7 Wiki Activity

Compare commits

base: EventHorizonStudio:main
Branches Tags
EventHorizonStudio:main
EventHorizonStudio:test
EventHorizonStudio:v1.3.0
EventHorizonStudio:v1.2.3
EventHorizonStudio:v1.2.2
EventHorizonStudio:v1.2.1
EventHorizonStudio:v1.2.0
EventHorizonStudio:v1.1.0
EventHorizonStudio:v1.0.0
..
compare: EventHorizonStudio:v1.2.1
Branches Tags
EventHorizonStudio:test
EventHorizonStudio:main
EventHorizonStudio:v1.3.0
EventHorizonStudio:v1.2.3
EventHorizonStudio:v1.2.2
EventHorizonStudio:v1.2.1
EventHorizonStudio:v1.2.0
EventHorizonStudio:v1.1.0
EventHorizonStudio:v1.0.0

No commits in common. "main" and "v1.2.1" have entirely different histories.
main ... v1.2.1

175 changed files with 1613 additions and 5860 deletions
Show Stats Expand all files Collapse all files

23
.gitea/workflows/BuildRelease.yaml
View File

@ -8,9 +8,6 @@ on:
jobs: jobs:
Windows-AMD64-Build: Windows-AMD64-Build:
runs-on: windows-x86_64 runs-on: windows-x86_64
defaults:
run:
shell: powershell
steps: steps:
- name: Check out repository code - name: Check out repository code
uses: actions/checkout@v3 uses: actions/checkout@v3
@ -22,10 +19,8 @@ jobs:
- name: Building/Compiling/Installing Project - name: Building/Compiling/Installing Project
run: | run: |
cd ${{ gitea.workspace }} cd ${{ gitea.workspace }}
vcpkg install cmake -A x64 -DCMAKE_BUILD_TYPE=Release --preset=default .
mkdir build
cd build cd build
cmake -A x64 -DCMAKE_BUILD_TYPE=Release ..
cmake --build . --config Release cmake --build . --config Release
cmake --install . cmake --install .
@ -33,12 +28,10 @@ jobs:
run: | run: |
cd ${{ gitea.workspace }} cd ${{ gitea.workspace }}
mkdir bin mkdir bin
mv build/Release/EHS_Dyn.dll bin
mv build/Release/StrToHash.exe bin mv build/Release/StrToHash.exe bin
mv build/Release/zlib1.dll bin mv build/Release/zlib1.dll bin
mkdir lib mkdir lib
mv build/Release/EHS_Stc.lib lib mv build/Release/EHS.lib lib
mv build/Release/EHS_Dyn.lib lib
- name: Zipping Binaries - name: Zipping Binaries
run: | run: |
@ -65,7 +58,7 @@ jobs:
- name: Installing Dependencies - name: Installing Dependencies
run: | run: |
sudo pacman -S --noconfirm doxygen zip alsa-lib libxcb xcb-util-cursor pipewire sudo pacman -S --noconfirm doxygen zip alsa-lib libxcb xcb-util-cursor
- name: Generating Documentation - name: Generating Documentation
run: | run: |
@ -80,12 +73,10 @@ jobs:
- name: Creating Appropriate Directories - name: Creating Appropriate Directories
run: | run: |
cd ${{ gitea.workspace }}
mkdir bin mkdir bin
mv libEHS_Dyn.so bin
mv StrToHash bin mv StrToHash bin
mkdir lib mkdir lib
mv libEHS_Stc.a lib mv libEHS.a lib
- name: Zipping Binaries - name: Zipping Binaries
run: zip -r ehs-linux-amd64.zip include bin lib docs LICENSE RADME.md run: zip -r ehs-linux-amd64.zip include bin lib docs LICENSE RADME.md
@ -109,7 +100,7 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Installing Dependencies - name: Installing Dependencies
run: sudo apt install -y doxygen zip libasound2-dev libxcb1-dev libxcb-xinput-dev libxcb-cursor-dev libpipewire-0.3-dev run: sudo apt install -y doxygen zip libasound2-dev libxcb1-dev libxcb-xinput-dev libxcb-cursor-dev
- name: Generating Documentation - name: Generating Documentation
run: | run: |
@ -124,12 +115,10 @@ jobs:
- name: Creating Appropriate Directories - name: Creating Appropriate Directories
run: | run: |
cd ${{ gitea.workspace }}
mkdir bin mkdir bin
mv libEHS_Dyn.so bin
mv StrToHash bin mv StrToHash bin
mkdir lib mkdir lib
mv libEHS_Stc.a lib mv libEHS.a lib
- name: Zipping Binaries - name: Zipping Binaries
run: zip -r ehs-linux-aarch64.zip include bin lib docs LICENSE README.md run: zip -r ehs-linux-aarch64.zip include bin lib docs LICENSE README.md

368
CMakeLists.txt
View File

@ -13,8 +13,7 @@ project(EHS CXX C)
if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
set(IS_OS_WINDOWS TRUE) set(IS_OS_WINDOWS TRUE)
set(USER_HOME_DIRECTORY "$ENV{USERPROFILE}") set(USER_HOME_DIRECTORY $ENV{USERPROFILE})
string(REPLACE "\\" "/" USER_HOME_DIRECTORY "${USER_HOME_DIRECTORY}")
message("Building for the Windows operating system.") message("Building for the Windows operating system.")
elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
set(IS_OS_LINUX TRUE) set(IS_OS_LINUX TRUE)
@ -40,198 +39,183 @@ endif ()
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(EHS_SOURCES set(EHS_SOURCES
src/EHS.cpp include/ehs/EHS.h src/EHS.cpp include/ehs/EHS.h
src/Type.cpp include/ehs/Type.h src/Type.cpp include/ehs/Type.h
src/BaseObj.cpp include/ehs/BaseObj.h src/BaseObj.cpp include/ehs/BaseObj.h
src/GC.cpp include/ehs/GC.h src/GC.cpp include/ehs/GC.h
src/Log.cpp include/ehs/Log.h src/Log.cpp include/ehs/Log.h
src/URI.cpp include/ehs/URI.h src/URI.cpp include/ehs/URI.h
src/Math.cpp include/ehs/Math.h src/Math.cpp include/ehs/Math.h
src/Color4.cpp include/ehs/Color4.h src/Color4.cpp include/ehs/Color4.h
src/Color3.cpp include/ehs/Color3.h src/Color3.cpp include/ehs/Color3.h
src/Version.cpp include/ehs/Version.h src/Version.cpp include/ehs/Version.h
src/Base64.cpp include/ehs/Base64.h src/Base64.cpp include/ehs/Base64.h
src/Data.cpp include/ehs/Data.h src/Data.cpp include/ehs/Data.h
src/Range.cpp include/ehs/Range.h src/Range.cpp include/ehs/Range.h
src/Util.cpp include/ehs/Util.h src/Util.cpp include/ehs/Util.h
src/Task.cpp include/ehs/Task.h src/Task.cpp include/ehs/Task.h
src/DataType.cpp include/ehs/DataType.h src/DataType.cpp include/ehs/DataType.h
include/ehs/Anchor.h include/ehs/Anchor.h
include/ehs/Dock.h include/ehs/Dock.h
include/ehs/HashMap.h include/ehs/HashMap.h
include/ehs/HRNG.h include/ehs/HRNG.h
include/ehs/Link.h include/ehs/Link.h
include/ehs/LinkedList.h include/ehs/LinkedList.h
include/ehs/Mat2.h include/ehs/Mat2.h
include/ehs/Mat3.h include/ehs/Mat3.h
include/ehs/Mat4.h include/ehs/Mat4.h
include/ehs/PRNG.h include/ehs/PRNG.h
include/ehs/Quat.h include/ehs/Quat.h
include/ehs/Rect.h include/ehs/Rect.h
include/ehs/Str.h include/ehs/Str.h
include/ehs/Types.h include/ehs/Types.h
include/ehs/UTF.h include/ehs/UTF.h
include/ehs/Vec2.h include/ehs/Vec2.h
include/ehs/Vec3.h include/ehs/Vec3.h
include/ehs/Vec4.h include/ehs/Vec4.h
include/ehs/Serializer.h include/ehs/Serializer.h
include/ehs/Array.h include/ehs/Array.h
include/ehs/Vector.h include/ehs/Vector.h
include/ehs/SArray.h include/ehs/SArray.h
src/PtrData.cpp include/ehs/PtrData.h src/PtrData.cpp include/ehs/PtrData.h
include/ehs/UniPtr.h include/ehs/UniPtr.h
include/ehs/ShdPtr.h include/ehs/ShdPtr.h
include/ehs/WkPtr.h include/ehs/WkPtr.h
src/db/DbVarTmpl.cpp include/ehs/db/DbVarTmpl.h src/db/DbVarTmpl.cpp include/ehs/db/DbVarTmpl.h
src/system/CPU.cpp include/ehs/system/CPU.h src/system/CPU.cpp include/ehs/system/CPU.h
src/system/Thread.cpp include/ehs/system/Thread.h src/system/Thread.cpp include/ehs/system/Thread.h
src/system/BaseMutex.cpp include/ehs/system/BaseMutex.h src/system/BaseMutex.cpp include/ehs/system/BaseMutex.h
src/system/BaseSemaphore.cpp include/ehs/system/BaseSemaphore.h src/system/BaseSemaphore.cpp include/ehs/system/BaseSemaphore.h
src/system/BaseSystem.cpp include/ehs/system/BaseSystem.h src/system/BaseSystem.cpp include/ehs/system/BaseSystem.h
src/system/BaseOpen.cpp include/ehs/system/BaseOpen.h src/system/BaseOpen.cpp include/ehs/system/BaseOpen.h
include/ehs/system/Architecture.h include/ehs/system/Architecture.h
include/ehs/system/Mutex.h include/ehs/system/Mutex.h
include/ehs/system/Open.h include/ehs/system/Open.h
include/ehs/system/OS.h include/ehs/system/OS.h
include/ehs/system/Semaphore.h include/ehs/system/Semaphore.h
include/ehs/system/System.h include/ehs/system/System.h
src/json/Json.cpp include/ehs/json/Json.h src/json/Json.cpp include/ehs/json/Json.h
src/json/JsonBase.cpp include/ehs/json/JsonBase.h src/json/JsonBase.cpp include/ehs/json/JsonBase.h
src/json/JsonNum.cpp include/ehs/json/JsonNum.h src/json/JsonNum.cpp include/ehs/json/JsonNum.h
src/json/JsonBool.cpp include/ehs/json/JsonBool.h src/json/JsonBool.cpp include/ehs/json/JsonBool.h
src/json/JsonStr.cpp include/ehs/json/JsonStr.h src/json/JsonStr.cpp include/ehs/json/JsonStr.h
src/json/JsonObj.cpp include/ehs/json/JsonObj.h src/json/JsonObj.cpp include/ehs/json/JsonObj.h
src/json/JsonArray.cpp include/ehs/json/JsonArray.h src/json/JsonArray.cpp include/ehs/json/JsonArray.h
src/json/JsonVar.cpp include/ehs/json/JsonVar.h src/json/JsonVar.cpp include/ehs/json/JsonVar.h
src/io/Resource.cpp include/ehs/io/Resource.h src/io/Resource.cpp include/ehs/io/Resource.h
src/io/Console.cpp include/ehs/io/Console.h src/io/Console.cpp include/ehs/io/Console.h
src/io/RIFF_Chunk.cpp include/ehs/io/RIFF_Chunk.h src/io/RIFF_Chunk.cpp include/ehs/io/RIFF_Chunk.h
src/io/RIFF.cpp include/ehs/io/RIFF.h src/io/RIFF.cpp include/ehs/io/RIFF.h
src/io/BaseWindow.cpp include/ehs/io/BaseWindow.h src/io/BaseWindow.cpp include/ehs/io/BaseWindow.h
src/io/BaseFile.cpp include/ehs/io/BaseFile.h src/io/BaseFile.cpp include/ehs/io/BaseFile.h
src/io/Glyph.cpp include/ehs/io/Glyph.h src/io/Glyph.cpp include/ehs/io/Glyph.h
src/io/FontAtlas.cpp include/ehs/io/FontAtlas.h src/io/FontAtlas.cpp include/ehs/io/FontAtlas.h
src/io/BaseFileMonitor.cpp include/ehs/io/BaseFileMonitor.h src/io/BaseFileMonitor.cpp include/ehs/io/BaseFileMonitor.h
include/ehs/io/COM.h include/ehs/io/COM.h
include/ehs/io/File.h include/ehs/io/File.h
include/ehs/io/FileMonitor.h include/ehs/io/FileMonitor.h
include/ehs/io/Window.h include/ehs/io/Window.h
include/ehs/io/socket/Socket.h src/io/socket/Request.cpp include/ehs/io/socket/Request.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/Response.cpp include/ehs/io/socket/Response.h src/io/socket/DNS.cpp include/ehs/io/socket/DNS.h
src/io/socket/BaseDNS.cpp include/ehs/io/socket/BaseDNS.h src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h
include/ehs/io/socket/DNS.h src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h
src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h
include/ehs/io/socket/UDP.h
src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h
include/ehs/io/socket/TCP.h
src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h
include/ehs/io/socket/ehc/NetUtils.h src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
src/io/socket/EHC.cpp include/ehs/io/socket/EHC.h src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
src/io/socket/ehc/NetFrags.cpp include/ehs/io/socket/ehc/NetFrags.h src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h
src/io/socket/ehc/NetEnd.cpp include/ehs/io/socket/ehc/NetEnd.h include/ehs/io/socket/Socket.h
src/io/socket/ehc/NetSys.cpp include/ehs/io/socket/ehc/NetSys.h include/ehs/io/socket/TCP.h
src/io/socket/ehc/NetOp.cpp include/ehs/io/socket/ehc/NetOp.h include/ehs/io/socket/UDP.h
src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h
src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h
src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h
include/ehs/io/audio/AudioDevice.h
src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h src/io/img/PNG.cpp include/ehs/io/img/PNG.h
src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h src/io/img/Img.cpp include/ehs/io/img/Img.h
src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h
include/ehs/io/audio/AudioDevice.h src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h
src/io/img/PNG.cpp include/ehs/io/img/PNG.h include/ehs/io/mdl/Vertex.h
src/io/img/Img.cpp include/ehs/io/img/Img.h src/io/model/Mesh.cpp include/ehs/io/mdl/Mesh.h
src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h src/io/model/Bone.cpp include/ehs/io/mdl/Bone.h
src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h src/io/model/Mdl.cpp include/ehs/io/mdl/Mdl.h
src/io/model/Animation.cpp include/ehs/io/mdl/Animation.h
src/io/model/AnimBone.cpp include/ehs/io/mdl/AnimBone.h
src/io/model/KeyFrame.cpp include/ehs/io/mdl/KeyFrame.h
src/io/model/PropertyChange.cpp include/ehs/io/mdl/PropertyChange.h
include/ehs/io/mdl/Vertex.h src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h
src/io/model/Mesh.cpp include/ehs/io/mdl/Mesh.h src/io/hid/Button.cpp include/ehs/io/hid/Button.h
src/io/model/Bone.cpp include/ehs/io/mdl/Bone.h src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h
src/io/model/Mdl.cpp include/ehs/io/mdl/Mdl.h src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h
src/io/model/Animation.cpp include/ehs/io/mdl/Animation.h src/io/hid/HID.cpp include/ehs/io/hid/HID.h
src/io/model/AnimBone.cpp include/ehs/io/mdl/AnimBone.h src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h
src/io/model/KeyFrame.cpp include/ehs/io/mdl/KeyFrame.h src/io/hid/Input.cpp include/ehs/io/hid/Input.h
src/io/model/PropertyChange.cpp include/ehs/io/mdl/PropertyChange.h src/io/model/MdlCodec.cpp
include/ehs/io/mdl/MdlCodec.h
src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h include/ehs/io/UsbBase.h
src/io/hid/Button.cpp include/ehs/io/hid/Button.h src/io/UsbBase.cpp
src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h include/ehs/db/DbTable.h
src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h include/ehs/db/DbObject.h
src/io/hid/HID.cpp include/ehs/io/hid/HID.h include/ehs/db/DbVar.h
src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h src/db/DbVar.cpp
src/io/hid/Input.cpp include/ehs/io/hid/Input.h include/ehs/db/Database.h
src/io/model/MdlCodec.cpp src/db/DbObject.cpp
include/ehs/io/mdl/MdlCodec.h src/db/Database.cpp
include/ehs/io/UsbBase.h src/db/Database.cpp
src/io/UsbBase.cpp src/db/DbTable.cpp
include/ehs/db/DbTable.h include/ehs/io/BaseDirectory.h
include/ehs/db/DbObject.h src/io/BaseDirectory.cpp
include/ehs/db/DbVar.h include/ehs/io/Directory.h
src/db/DbVar.cpp
include/ehs/db/Database.h
src/db/DbObject.cpp
src/db/Database.cpp
src/db/Database.cpp
src/db/DbTable.cpp
include/ehs/io/BaseDirectory.h
src/io/BaseDirectory.cpp
include/ehs/io/Directory.h
include/ehs/io/socket/ehc/NetEnc.h
src/io/socket/ehc/NetEnc.cpp
) )
if (IS_OS_WINDOWS) if (IS_OS_WINDOWS)
list(APPEND EHS_SOURCES list(APPEND EHS_SOURCES
src/io/socket/UDP_W32.cpp include/ehs/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/ehs/io/socket/TCP_W32.h src/io/socket/TCP_W32.cpp include/ehs/io/socket/TCP_W32.h
src/io/socket/DNS_W32.cpp include/ehs/io/socket/DNS_W32.h src/system/Semaphore_W32.cpp include/ehs/system/Semaphore_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/System_W32.cpp include/ehs/system/System_W32.h src/system/Mutex_W32.cpp include/ehs/system/Mutex_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/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/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h src/io/File_W32.cpp include/ehs/io/File_W32.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/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h src/io/Window_W32.cpp include/ehs/io/Window_W32.h
src/io/Window_W32.cpp include/ehs/io/Window_W32.h src/io/COM.cpp include/ehs/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 src/io/Directory_W32.cpp include/ehs/io/Directory_W32.h
src/io/Directory_W32.cpp include/ehs/io/Directory_W32.h
) )
elseif (IS_OS_LINUX) elseif (IS_OS_LINUX)
list(APPEND EHS_SOURCES list(APPEND EHS_SOURCES
src/io/socket/UDP_BSD.cpp include/ehs/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/ehs/io/socket/TCP_BSD.h src/io/socket/TCP_BSD.cpp include/ehs/io/socket/TCP_BSD.h
src/io/socket/DNS_LNX.cpp include/ehs/io/socket/DNS_LNX.h src/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.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/System_LNX.cpp include/ehs/system/System_LNX.h src/system/Open_UNX.cpp include/ehs/system/Open_UNX.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/File_UNX.cpp include/ehs/io/File_UNX.h src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_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/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h src/io/audio/AudioDevice_ALSA.cpp include/ehs/io/audio/AudioDevice_ALSA.h
src/io/audio/AudioDevice_PW.cpp include/ehs/io/audio/AudioDevice_PW.h src/system/FileSystem.cpp include/ehs/system/FileSystem.h
src/system/FileSystem.cpp include/ehs/system/FileSystem.h src/system/User.cpp include/ehs/system/User.h
src/system/User.cpp include/ehs/system/User.h src/io/Directory_LNX.cpp include/ehs/io/Directory_LNX.h
src/io/Directory_LNX.cpp include/ehs/io/Directory_LNX.h src/io/Usb_LNX.cpp include/ehs/io/Usb_LNX.h
src/io/Usb_LNX.cpp include/ehs/io/Usb_LNX.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 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)
src/io/xdg-shell-protocol.c include/ehs/io/xdg-shell-client-protocol.h
src/io/xdg-decoration.c include/ehs/io/xdg-decoration.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)
@ -249,37 +233,23 @@ endif()
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
#message("${CMAKE_CXX_FLAGS}") #message("${CMAKE_CXX_FLAGS}")
add_library(EHS_Stc STATIC ${EHS_SOURCES}) add_library(EHS ${EHS_SOURCES})
add_library(EHS_Dyn SHARED ${EHS_SOURCES})
add_executable(StrToHash src/StrToHash.cpp) add_executable(StrToHash src/StrToHash.cpp)
target_compile_definitions(EHS_Dyn PRIVATE EHS_LIB_EXPORT) target_include_directories(EHS PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_include_directories(EHS_Stc PUBLIC ${PROJECT_SOURCE_DIR}/include)
target_include_directories(EHS_Dyn PUBLIC ${PROJECT_SOURCE_DIR}/include)
if (IS_OS_LINUX) if (IS_OS_LINUX)
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/.local") set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/.local")
install(TARGETS EHS_Dyn LIBRARY DESTINATION "bin")
find_package(PkgConfig REQUIRED)
pkg_check_modules(PIPEWIRE REQUIRED libpipewire-0.3)
target_include_directories(EHS_Stc PRIVATE ${PIPEWIRE_INCLUDE_DIRS})
target_include_directories(EHS_Dyn PRIVATE ${PIPEWIRE_INCLUDE_DIRS})
elseif (IS_OS_WINDOWS) elseif (IS_OS_WINDOWS)
set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS") set(CMAKE_INSTALL_PREFIX "${USER_HOME_DIRECTORY}/EHS")
install(TARGETS EHS_Dyn LIBRARY DESTINATION "lib")
install(TARGETS EHS_Dyn RUNTIME DESTINATION "bin")
file(GLOB DLL_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.dll")
install(FILES ${DLL_FILES} DESTINATION "bin")
endif () endif ()
install(TARGETS EHS_Stc DESTINATION "lib") install(TARGETS EHS DESTINATION lib)
install(TARGETS StrToHash DESTINATION "bin")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "include") install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
install(TARGETS StrToHash DESTINATION bin)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
if (ZLIB_FOUND) if (ZLIB_FOUND)
@ -295,22 +265,16 @@ else ()
message(STATUS "OpenSSL was not found.") message(STATUS "OpenSSL was not found.")
endif () endif ()
target_link_libraries(EHS_Stc OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB) target_link_libraries(EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
target_link_libraries(EHS_Dyn OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
target_link_libraries(StrToHash OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
if (IS_OS_WINDOWS) if (IS_OS_WINDOWS)
target_link_libraries(EHS_Dyn avrt ws2_32) target_link_libraries(StrToHash ws2_32 avrt EHS)
target_link_libraries(StrToHash ws2_32 avrt EHS_Stc)
elseif (IS_OS_LINUX) elseif (IS_OS_LINUX)
if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland") if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
target_link_libraries(EHS_Dyn wayland-client)
target_link_libraries(StrToHash wayland-client) target_link_libraries(StrToHash wayland-client)
elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB") elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB")
target_link_libraries(EHS_Dyn xcb xcb-cursor xcb-xfixes xcb-xinput)
target_link_libraries(StrToHash xcb xcb-cursor xcb-xfixes xcb-xinput) target_link_libraries(StrToHash xcb xcb-cursor xcb-xfixes xcb-xinput)
endif () endif ()
target_link_libraries(EHS_Dyn z asound pipewire-0.3) target_link_libraries(StrToHash z asound EHS)
target_link_libraries(StrToHash z asound EHS_Stc)
endif () endif ()

12
CMakePresets.json Normal file
View File

@ -0,0 +1,12 @@
{
"version": 3,
"configurePresets": [
{
"name": "default",
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
}
}
]
}

20
README.md
View File

@ -8,7 +8,6 @@ This project does not fully follow the C++ standard.
### Features ### Features
- Audio IO/Processing/Manipulation - Audio IO/Processing/Manipulation
- Image Processing/Manipulation - Image Processing/Manipulation
- Databases
- 3D Model & Mesh Processing/Manipulation - 3D Model & Mesh Processing/Manipulation
- File IO - File IO
- Basic File Monitoring - Basic File Monitoring
@ -21,7 +20,7 @@ This project does not fully follow the C++ standard.
- Mutexes - Mutexes
- Semaphores - Semaphores
- CPU information and features at runtime - CPU information and features at runtime
- HTTP(S) Socket Layer - HTTP(S) Sockets
- TCP Socket - TCP Socket
- UDP Socket - UDP Socket
- COM (Serial) IO - COM (Serial) IO
@ -30,13 +29,12 @@ This project does not fully follow the C++ standard.
- Twitch Integration - Twitch Integration
- Json Parsing/Writing - Json Parsing/Writing
- User Friendly HID Input - User Friendly HID Input
- Heap Garbage Collector - Basic Garbage Collector
- Linked List - Linked List
- Array - Array
- Vector - Vector
- Asynchronous Task System - Asynchronous Task System
- URI Parsing - URI Parsing
- USB (WIP)
### Supported Architectures ### Supported Architectures
- AMD64 - AMD64
@ -73,10 +71,8 @@ Wayland Window System. Wayland support is currently not fully supported yet, use
- [CMake](https://cmake.org/) - [CMake](https://cmake.org/)
- [vcpkg](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started?pivots=shell-cmd) - [vcpkg](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started?pivots=shell-cmd)
`vcpkg install` - Use this command in the directory where `vcpkg.json` is located to download/install dependencies.
### Building ### Building
`cmake -A x64 -DCMAKE_BUILD_TYPE=Release /path/to/source` `cmake -A x64 -DCMAKE_BUILD_TYPE=Release --preset=default /path/to/source`
### Compiling ### Compiling
`cmake --build /path/to/build --config Release` `cmake --build /path/to/build --config Release`
@ -91,10 +87,12 @@ This will require the terminal to be running in administrator mode.
#include <ehs/EHS.h> #include <ehs/EHS.h>
#include <ehs/io/Console.h> #include <ehs/io/Console.h>
int main() ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer)
{ {
// Simple identifying meta-data for the logger. // Simple identifying meta-data for the logger.
ehs::Initialize("Simple Example App", "Release", {1, 0, 0}); *appName = "Simple Example App"; // The application's name
*appVerId = "Release"; // The app's version prefix; i.e. Alpha, Beta or Release as an example.
*appVer = {1, 0, 0}; // The app's version major, minor and patch number.
ehs::Console::Write_8("How old are you?"); // Write to the console in UTF_8 character encoding. ehs::Console::Write_8("How old are you?"); // Write to the console in UTF_8 character encoding.
@ -103,15 +101,13 @@ int main()
if (!response.IsNum()) if (!response.IsNum())
{ {
ehs::Console::Clear(); // Clear the console's buffer. ehs::Console::Clear(); // Clear the console's buffer.
return main(); // Repeat process if given response is not a number. return Main(appName, appVerId, appVer); // Repeat process if given response is not a number.
} }
ehs::UInt_8 age = response.ToDecimal<ehs::UInt_8>(); // Converts the string number into a number based primitive. ehs::UInt_8 age = response.ToDecimal<ehs::UInt_8>(); // Converts the string number into a number based primitive.
ehs::Console::Write("Your age is " + ehs::Str_8::FromNum(age) + "."); // Write the console with the age converted back to string. ehs::Console::Write("Your age is " + ehs::Str_8::FromNum(age) + "."); // Write the console with the age converted back to string.
ehs::Uninitialize();
return 0; return 0;
} }
``` ```

10
include/ehs/Base64.h
View File

@ -5,20 +5,20 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Base64 class Base64
{ {
private: private:
static const char ascii[]; static const char ascii[];
public: public:
static Str_8 Encode(const Str_8 &input); static Str_8 Encode(const Str_8 input);
static Str_8 Decode(const Str_8 &input); static Str_8 Decode(const Str_8 input);
private: private:
static char Find(char c); static char Find(const char c);
static bool IsBase64(char c); static bool IsBase64(const char c);
}; };
} }

2
include/ehs/BaseObj.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO BaseObj class BaseObj
{ {
private: private:
Type* hierarchy; Type* hierarchy;

12
include/ehs/Color3.h
View File

@ -4,7 +4,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Color3 class Color3
{ {
public: public:
float r; float r;
@ -13,13 +13,13 @@ namespace ehs
Color3(); Color3();
Color3(float scalar); Color3(const float scalar);
Color3(float r, float g, float b); Color3(const float r, const float g, const float b);
Color3(const Color3& color); Color3(const Color3& color);
Color3& operator=(float scalar); Color3& operator=(const float scalar);
Color3& operator=(const Color3& color); Color3& operator=(const Color3& color);
@ -27,9 +27,9 @@ namespace ehs
bool operator!=(const Color3& color) const; bool operator!=(const Color3& color) const;
float operator[](UInt_64 i) const; float operator[](const UInt_64 i) const;
float& operator[](UInt_64 i); float& operator[](const UInt_64 i);
Color3& operator*=(const Color3& color); Color3& operator*=(const Color3& color);

12
include/ehs/Color4.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Color4 class Color4
{ {
public: public:
float r; float r;
@ -15,15 +15,15 @@ namespace ehs
Color4(); Color4();
Color4(float scalar); Color4(const float scalar);
explicit Color4(const Color3& color); explicit Color4(const Color3& color);
Color4(float r, float g, float b, float a = 1.0f); Color4(const float r, const float g, const float b, const float a = 1.0f);
Color4(const Color4& color); Color4(const Color4& color);
Color4& operator=(float scalar); Color4& operator=(const float scalar);
Color4& operator=(const Color3& color); Color4& operator=(const Color3& color);
@ -33,9 +33,9 @@ namespace ehs
bool operator!=(const Color4& color) const; bool operator!=(const Color4& color) const;
float operator[](UInt_64 i) const; float operator[](const UInt_64 i) const;
float& operator[](UInt_64 i); float& operator[](const UInt_64 i);
Color4& operator*=(const Color4& color); Color4& operator*=(const Color4& color);

2
include/ehs/Data.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Data class Data
{ {
public: public:
template<typename T> template<typename T>

6
include/ehs/DataType.h
View File

@ -21,9 +21,9 @@ namespace ehs
UINT_8 UINT_8
}; };
EHS_LIB_IO DataType FromAudioBitDepth(UInt_16 bitDepth); DataType FromAudioBitDepth(UInt_16 bitDepth);
EHS_LIB_IO UInt_8 ToByteDepth(DataType type); UInt_8 ToByteDepth(DataType type);
EHS_LIB_IO UInt_8 ToBitDepth(DataType type); UInt_8 ToBitDepth(DataType type);
} }

36
include/ehs/EHS.h
View File

@ -13,53 +13,51 @@
namespace ehs namespace ehs
{ {
enum class MemoryPattern enum class MemoryPattern
{ {
SPEED, SPEED,
SIZE SIZE
}; };
EHS_LIB_IO void Initialize(Str_8 appName, Str_8 appVerId, const Version &appVer);
EHS_LIB_IO void Uninitialize();
/// Retrieves the UTF32 C-style string as "Event Horizon Standard" /// Retrieves the UTF32 C-style string as "Event Horizon Standard"
/// @returns The result. /// @returns The result.
EHS_LIB_IO const Char_32* GetName_32(); const Char_32* GetName_32();
/// Retrieves the UTF16 C-style string as "Event Horizon Standard" /// Retrieves the UTF16 C-style string as "Event Horizon Standard"
/// @returns The result. /// @returns The result.
EHS_LIB_IO const Char_16* GetName_16(); const Char_16* GetName_16();
/// Retrieves the UTF8 C-style string as "Event Horizon Standard" /// Retrieves the UTF8 C-style string as "Event Horizon Standard"
/// @returns The result. /// @returns The result.
EHS_LIB_IO const Char_8* GetName_8(); const Char_8* GetName_8();
EHS_LIB_IO Str_8 GetAppName_8(); Str_8 GetAppName_8();
EHS_LIB_IO const Char_32* GetAcronym_32(); const Char_32* GetAcronym_32();
EHS_LIB_IO const Char_16* GetAcronym_16(); const Char_16* GetAcronym_16();
EHS_LIB_IO const Char_8* GetAcronym_8(); const Char_8* GetAcronym_8();
/// Retrieves the version identifier in UTF32. /// Retrieves the version identifier in UTF32.
/// @returns The result. /// @returns The result.
EHS_LIB_IO const Char_32* GetVersionId_32(); const Char_32* GetVersionId_32();
/// Retrieves the version identifier in UTF16. /// Retrieves the version identifier in UTF16.
/// @returns The result. /// @returns The result.
EHS_LIB_IO const Char_16* GetVersionId_16(); const Char_16* GetVersionId_16();
/// Retrieves the version identifier in UTF8. /// Retrieves the version identifier in UTF8.
/// @returns The result. /// @returns The result.
EHS_LIB_IO const Char_8* GetVersionId_8(); const Char_8* GetVersionId_8();
EHS_LIB_IO Str_8 GetAppVersionId_8(); Str_8 GetAppVersionId_8();
/// Retrieves the current Event Horizon Standard version. /// Retrieves the current Event Horizon Standard version.
/// @returns The result. /// @returns The result.
EHS_LIB_IO Version GetVersion(); Version GetVersion();
EHS_LIB_IO Version GetAppVersion(); Version GetAppVersion();
}; };
extern ehs::SInt_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer);

6
include/ehs/GC.h
View File

@ -9,7 +9,7 @@ namespace ehs
{ {
typedef bool (*GcLogic)(BaseObj*); typedef bool (*GcLogic)(BaseObj*);
class EHS_LIB_IO GC class GC
{ {
private: private:
static Array<GcLogic> logic; static Array<GcLogic> logic;
@ -36,7 +36,7 @@ namespace ehs
/// Sets the maximum amount of garbage to delete per poll. /// Sets the maximum amount of garbage to delete per poll.
/// @param[in] newMax The new maximum. /// @param[in] newMax The new maximum.
static void SetMax(UInt_64 newMax); static void SetMax(const UInt_64 newMax);
/// Gets the maximum amount of garbage to delete per poll. /// Gets the maximum amount of garbage to delete per poll.
/// @returns The maximum. /// @returns The maximum.
@ -44,7 +44,7 @@ namespace ehs
/// Sets a new amount for memory pre-allocation to save on memory operations. /// Sets a new amount for memory pre-allocation to save on memory operations.
/// @param[in] newStride The stride to pre-allocate. /// @param[in] newStride The stride to pre-allocate.
static void SetStride(UInt_64 newStride); static void SetStride(const UInt_64 newStride);
/// The amount of data pre-allocated to save on memory operations. /// The amount of data pre-allocated to save on memory operations.
/// @returns The stride. /// @returns The stride.

2
include/ehs/HRNG.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO HRNG class HRNG
{ {
public: public:
static UInt_64 GenerateSeed_u64(); static UInt_64 GenerateSeed_u64();

2
include/ehs/Log.h
View File

@ -25,7 +25,7 @@ namespace ehs
/// A helper class for holding error information and handling them. /// A helper class for holding error information and handling them.
/// @tparam T The character data type to use. /// @tparam T The character data type to use.
/// @tparam N The number data type to use. /// @tparam N The number data type to use.
class EHS_LIB_IO Log class Log
{ {
private: private:
static void DefaultRaisedCb(const Log &log); static void DefaultRaisedCb(const Log &log);

9
include/ehs/Mat2.h
View File

@ -120,7 +120,7 @@ namespace ehs
Mat2<T> GetMinor() const Mat2<T> GetMinor() const
{ {
Mat2<T> result; Mat2<T> result(0);
result.data[0] = data[3]; result.data[0] = data[3];
result.data[1] = data[2]; result.data[1] = data[2];
result.data[2] = data[1]; result.data[2] = data[1];
@ -187,7 +187,7 @@ namespace ehs
Mat2<T> GetInverse() const Mat2<T> GetInverse() const
{ {
T det = GetDeterminant(); T det = GetDeterminant();
if (Math::ComCmp(det, 0)) if (Math::ComCmp(det, 0.0f))
return {}; return {};
return GetAdjugate() * (1 / det); return GetAdjugate() * (1 / det);
@ -196,7 +196,7 @@ namespace ehs
void Inverse() void Inverse()
{ {
T det = GetDeterminant(); T det = GetDeterminant();
if (Math::ComCmp(det, 0)) if (Math::ComCmp(det, 0.0f))
return; return;
Adjugate(); Adjugate();
@ -212,9 +212,6 @@ namespace ehs
} }
}; };
template class EHS_LIB_IO Mat2<float>;
template class EHS_LIB_IO Mat2<double>;
typedef Mat2<float> Mat2_f; typedef Mat2<float> Mat2_f;
typedef Mat2<double> Mat2_d; typedef Mat2<double> Mat2_d;
} }

9
include/ehs/Mat3.h
View File

@ -50,7 +50,7 @@ namespace ehs
Mat2<T> result; Mat2<T> result;
for (UInt_8 i = 0; i < 4; ++i) for (UInt_8 i = 0; i < 4; ++i)
result[i] = data[i / 2 * 4 + i % 2]; result.data[i] = data[i / 2 * 4 + i % 2];
return result; return result;
} }
@ -234,7 +234,7 @@ namespace ehs
Mat3<T> GetInverse() const Mat3<T> GetInverse() const
{ {
T det = GetDeterminant(); T det = GetDeterminant();
if (Math::ComCmp(det, 0)) if (Math::ComCmp(det, 0.0f))
return {}; return {};
return GetAdjugate() * (1 / det); return GetAdjugate() * (1 / det);
@ -243,7 +243,7 @@ namespace ehs
void Inverse() void Inverse()
{ {
T det = GetDeterminant(); T det = GetDeterminant();
if (Math::ComCmp(det, 0)) if (Math::ComCmp(det, 0.0f))
return; return;
Adjugate(); Adjugate();
@ -317,9 +317,6 @@ namespace ehs
} }
}; };
template class EHS_LIB_IO Mat3<float>;
template class EHS_LIB_IO Mat3<double>;
typedef Mat3<float> Mat3_f; typedef Mat3<float> Mat3_f;
typedef Mat3<double> Mat3_d; typedef Mat3<double> Mat3_d;
} }

23
include/ehs/Mat4.h
View File

@ -268,7 +268,7 @@ namespace ehs
Mat4<T> GetInverse() const Mat4<T> GetInverse() const
{ {
T det = GetDeterminant(); T det = GetDeterminant();
if (Math::ComCmp(det, 0)) if (Math::ComCmp(det, 0.0f))
return {}; return {};
return GetAdjugate() * (1 / det); return GetAdjugate() * (1 / det);
@ -277,7 +277,7 @@ namespace ehs
void Inverse() void Inverse()
{ {
T det = GetDeterminant(); T det = GetDeterminant();
if (Math::ComCmp(det, 0)) if (Math::ComCmp(det, 0.0f))
return; return;
Adjugate(); Adjugate();
@ -332,14 +332,14 @@ namespace ehs
static Mat4<T> YawRotate(const T angle) static Mat4<T> YawRotate(const T angle)
{ {
T radians = Math::Rads<T>(angle); T radians = Math::Rads(angle);
Mat4<T> result; Mat4<T> result;
result.data[0] = Math::Cos<T>(radians); result.data[0] = Math::Cos(radians);
result.data[2] = -Math::Sin<T>(radians); result.data[2] = -Math::Sin(radians);
result.data[5] = 1; result.data[5] = 1;
result.data[8] = Math::Sin<T>(radians); result.data[8] = Math::Sin(radians);
result.data[10] = Math::Cos<T>(radians); result.data[10] = Math::Cos(radians);
result.data[15] = 1; result.data[15] = 1;
return result; return result;
@ -347,7 +347,7 @@ namespace ehs
static Mat4<T> RollRotate(const T angle) static Mat4<T> RollRotate(const T angle)
{ {
T radians = Math::Rads<T>(angle); T radians = Math::Rads(angle);
Mat4<T> result; Mat4<T> result;
result.data[0] = Math::Cos(radians); result.data[0] = Math::Cos(radians);
@ -367,7 +367,7 @@ namespace ehs
static Mat4<T> RH_Perspective(const T fov, const T aspect, const T zNear, const T zFar) static Mat4<T> RH_Perspective(const T fov, const T aspect, const T zNear, const T zFar)
{ {
const T tanHalfFovy = Math::Tan<T>(Math::Rads(fov) / 2.0f); const float tanHalfFovy = tan(Math::Rads(fov) / 2.0f);
Mat4<T> result; Mat4<T> result;
result[0] = 1.0f / (aspect * tanHalfFovy); result[0] = 1.0f / (aspect * tanHalfFovy);
@ -380,7 +380,7 @@ namespace ehs
static Mat4<T> LH_Perspective(const T fov, const T aspect, const T zNear, const T zFar) static Mat4<T> LH_Perspective(const T fov, const T aspect, const T zNear, const T zFar)
{ {
const T tanHalfFovy = Math::Tan<T>(Math::Rads(fov) / 2.0f); const float tanHalfFovy = Math::Tan(Math::Rads(fov) / 2.0f);
Mat4<T> result; Mat4<T> result;
result[0] = 1.0f / (aspect * tanHalfFovy); result[0] = 1.0f / (aspect * tanHalfFovy);
@ -421,9 +421,6 @@ namespace ehs
} }
}; };
template class EHS_LIB_IO Mat4<float>;
template class EHS_LIB_IO Mat4<double>;
typedef Mat4<float> Mat4_f; typedef Mat4<float> Mat4_f;
typedef Mat4<double> Mat4_d; typedef Mat4<double> Mat4_d;
} }

14
include/ehs/Math.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Math class Math
{ {
private: private:
static float Sqrt_AVX(const float from); static float Sqrt_AVX(const float from);
@ -26,22 +26,22 @@ namespace ehs
constexpr static double dblEpsilon = 1e-16; constexpr static double dblEpsilon = 1e-16;
/// Absolute tolerance comparison for single precision floats. /// Absolute tolerance comparison for single precision floats.
static bool AbsCmp(float a, float b); static bool AbsCmp(const float a, const float b);
/// Absolute tolerance comparison for double precision floats. /// Absolute tolerance comparison for double precision floats.
static bool AbsCmp(double a, double b); static bool AbsCmp(const double a, const double b);
/// Relative tolerance comparison for single precision floats. /// Relative tolerance comparison for single precision floats.
static bool RelCmp(float a, float b); static bool RelCmp(const float a, const float b);
/// Relative tolerance comparison for double precision floats. /// Relative tolerance comparison for double precision floats.
static bool RelCmp(double a, double b); static bool RelCmp(const double a, const double b);
/// Combined absolute and relative tolerance comparison for single precision floats. /// Combined absolute and relative tolerance comparison for single precision floats.
static bool ComCmp(float a, float b); static bool ComCmp(const float a, const float b);
/// Combined absolute and relative tolerance comparison for double precision floats. /// Combined absolute and relative tolerance comparison for double precision floats.
static bool ComCmp(double a, double b); static bool ComCmp(const double a, const double b);
template<typename T = float> template<typename T = float>
static T Max(const T a, const T b) static T Max(const T a, const T b)

6
include/ehs/PtrData.h
View File

@ -10,9 +10,9 @@ namespace ehs
void* data; void* data;
}; };
EHS_LIB_IO bool HasPtrData(void* data); bool HasPtrData(void* data);
EHS_LIB_IO void AddPtrData(void* data); void AddPtrData(void* data);
EHS_LIB_IO bool RemovePtrData(void* data); bool RemovePtrData(void* data);
} }

50
include/ehs/Str.h
View File

@ -564,7 +564,7 @@ namespace ehs
return; return;
} }
Util::Copy(&data[dstOffset], src, src.Size(true)); Util::Copy(data[dstOffset], src, src.Size(true));
} }
/// Copies a C-style string to the referenced string object. /// Copies a C-style string to the referenced string object.
@ -580,7 +580,7 @@ namespace ehs
return; return;
} }
Util::Copy(&data[dstOffset], src, srcSize * sizeof(T)); Util::Copy(data[dstOffset], src, srcSize * sizeof(T));
} }
/// Copies a C-style string to the referenced string object. /// Copies a C-style string to the referenced string object.
@ -595,7 +595,7 @@ namespace ehs
return; return;
} }
Util::Copy(&data[dstOffset], src, srcSize * sizeof(T)); Util::Copy(data[dstOffset], src, srcSize * sizeof(T));
} }
/// Inserts a string at a specified index. /// Inserts a string at a specified index.
@ -747,7 +747,7 @@ namespace ehs
T* result = new T[size + inSize + 1]; T* result = new T[size + inSize + 1];
Util::Copy(result, data, Size(true)); Util::Copy(result, data, Size(true));
Util::Copy(&result[size], value, inSize * sizeof(T)); Util::Copy(result[size], value, inSize * sizeof(T));
result[size + inSize] = 0; result[size + inSize] = 0;
@ -1027,7 +1027,7 @@ namespace ehs
/// @param [in] pattern The search pattern for optimization. /// @param [in] pattern The search pattern for optimization.
/// @param [in] result What index to return where the first instance is found. /// @param [in] result What index to return where the first instance is found.
/// @returns The index where the instance was found with the result varying from the result parameter. /// @returns The index where the instance was found with the result varying from the result parameter.
bool Find(const Str<T, N> &ide, N* const index = nullptr, const SearchPattern pattern = SearchPattern::LEFT_RIGHT, const IndexResult result = IndexResult::BEGINNING) const bool Find(const Str<T, N>& ide, N* const index = nullptr, const SearchPattern pattern = SearchPattern::LEFT_RIGHT, const IndexResult result = IndexResult::BEGINNING) const
{ {
if (pattern == SearchPattern::LEFT_RIGHT) if (pattern == SearchPattern::LEFT_RIGHT)
{ {
@ -1271,11 +1271,8 @@ namespace ehs
/// @note Use "IsNum" before this if the string object is not guaranteed to be a number. /// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
float ToFloat() const float ToFloat() const
{ {
Str<T, N> ide;
ide.Push(46);
N decPoint = size; N decPoint = size;
Find(ide, &decPoint); Find(".", &decPoint);
float result = 0.0f; float result = 0.0f;
float fraction = 0.0f; float fraction = 0.0f;
@ -1300,11 +1297,8 @@ namespace ehs
/// @note Use "IsNum" before this if the string object is not guaranteed to be a number. /// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
double ToDouble() const double ToDouble() const
{ {
Str<T, N> ide;
ide.Push(46);
N decPoint = size; N decPoint = size;
Find(ide, &decPoint); Find(".", &decPoint);
double result = 0.0f; double result = 0.0f;
double fraction = 0.0f; double fraction = 0.0f;
@ -1329,11 +1323,8 @@ namespace ehs
/// @note Use "IsNum" before this if the string object is not guaranteed to be a number. /// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
long double ToLDouble() const long double ToLDouble() const
{ {
Str<T, N> ide;
ide.Push(46);
N decPoint = size; N decPoint = size;
Find(ide, &decPoint); Find(".", &decPoint);
long double result = 0.0f; long double result = 0.0f;
long double fraction = 0.0f; long double fraction = 0.0f;
@ -1688,7 +1679,7 @@ namespace ehs
Str<T, N> result; Str<T, N> result;
if (whole < 0) if (whole < 0)
result.Push(45); result += "-";
result += Str<T, N>::FromNum(whole); result += Str<T, N>::FromNum(whole);
@ -1700,7 +1691,7 @@ namespace ehs
if (!fraction) if (!fraction)
return result; return result;
result.Push(46); result += ".";
Str<T, N> fResult(maxDecimals); Str<T, N> fResult(maxDecimals);
N i = 0; N i = 0;
@ -1730,7 +1721,7 @@ namespace ehs
Str<T, N> result; Str<T, N> result;
if (whole < 0) if (whole < 0)
result.Push(45); result += "-";
result += Str<T, N>::FromNum(whole); result += Str<T, N>::FromNum(whole);
@ -1742,7 +1733,7 @@ namespace ehs
if (!fraction) if (!fraction)
return result; return result;
result.Push(46); result += ".";
Str<T, N> fResult(maxDecimals); Str<T, N> fResult(maxDecimals);
N i = 0; N i = 0;
@ -1772,7 +1763,7 @@ namespace ehs
Str<T, N> result; Str<T, N> result;
if (whole < 0) if (whole < 0)
result.Push(45); result += "-";
result += Str<T, N>::FromNum(whole); result += Str<T, N>::FromNum(whole);
@ -1784,7 +1775,7 @@ namespace ehs
if (!fraction) if (!fraction)
return result; return result;
result.Push(46); result += ".";
Str<T, N> fResult(maxDecimals); Str<T, N> fResult(maxDecimals);
N i = 0; N i = 0;
@ -1879,9 +1870,6 @@ namespace ehs
/// @returns The character count. /// @returns The character count.
static N Len(const T* const str) static N Len(const T* const str)
{ {
if (!str)
return 0;
N count = 0; N count = 0;
while (str[count]) while (str[count])
++count; ++count;
@ -1900,14 +1888,14 @@ namespace ehs
if (aSize != bSize) if (aSize != bSize)
return false; return false;
return Util::Compare(a, b, aSize); for (UInt_64 i = 0; i < aSize; ++i)
if (a[i] != b[i])
return false;
return true;
} }
}; };
template class EHS_LIB_IO Str<Char_32, UInt_64>;
template class EHS_LIB_IO Str<Char_16, UInt_64>;
template class EHS_LIB_IO Str<Char_8, UInt_64>;
typedef Str<Char_32, UInt_64> Str_32; typedef Str<Char_32, UInt_64> Str_32;
typedef Str<Char_16, UInt_64> Str_16; typedef Str<Char_16, UInt_64> Str_16;
typedef Str<Char_8, UInt_64> Str_8; typedef Str<Char_8, UInt_64> Str_8;

2
include/ehs/Task.h
View File

@ -9,7 +9,7 @@ namespace ehs
{ {
typedef void (*TaskCb)(Serializer<UInt_64>*); typedef void (*TaskCb)(Serializer<UInt_64>*);
class EHS_LIB_IO Task class Task
{ {
private: private:
bool working; bool working;

2
include/ehs/Type.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Type class Type
{ {
private: private:
friend class BaseObj; friend class BaseObj;

2
include/ehs/URI.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO URI class URI
{ {
public: public:
/// Encodes specialized characters in the URI. /// Encodes specialized characters in the URI.

2
include/ehs/UTF.h
View File

@ -13,7 +13,7 @@ namespace ehs
}; };
/// A helper class for converting between UTF8, 16 and 32. /// A helper class for converting between UTF8, 16 and 32.
class EHS_LIB_IO UTF class UTF
{ {
public: public:
/// Converts the given UTF16 C-style string into UTF32. /// Converts the given UTF16 C-style string into UTF32.

2
include/ehs/Util.h
View File

@ -4,7 +4,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Util class Util
{ {
public: public:
static bool Compare(const void* a, const void* b, UInt_64 size); static bool Compare(const void* a, const void* b, UInt_64 size);

2
include/ehs/Version.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
/// A helper class for storing version major, minor and patch. /// A helper class for storing version major, minor and patch.
class EHS_LIB_IO Version class Version
{ {
public: public:
UInt_32 major; UInt_32 major;

2
include/ehs/db/Database.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Database class Database
{ {
private: private:
UInt_64 hashId; UInt_64 hashId;

2
include/ehs/db/DbObject.h
View File

@ -7,7 +7,7 @@ namespace ehs
{ {
class DbTable; class DbTable;
class EHS_LIB_IO DbObject class DbObject
{ {
private: private:
friend class DbTable; friend class DbTable;

2
include/ehs/db/DbTable.h
View File

@ -10,7 +10,7 @@ namespace ehs
{ {
class Database; class Database;
class EHS_LIB_IO DbTable class DbTable
{ {
private: private:
friend class Database; friend class Database;

2
include/ehs/db/DbVar.h
View File

@ -8,7 +8,7 @@ namespace ehs
class DbVarTmpl; class DbVarTmpl;
class DbObject; class DbObject;
class EHS_LIB_IO DbVar class DbVar
{ {
private: private:
friend class DbObject; friend class DbObject;

2
include/ehs/db/DbVarTmpl.h
View File

@ -8,7 +8,7 @@ namespace ehs
{ {
class DbVar; class DbVar;
class EHS_LIB_IO DbVarTmpl class DbVarTmpl
{ {
private: private:
friend class DbTable; friend class DbTable;

2
include/ehs/io/BaseDirectory.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO BaseDirectory class BaseDirectory
{ {
public: public:
static Array<Str_8> GetAllFiles(const Str_8 &dir); static Array<Str_8> GetAllFiles(const Str_8 &dir);

2
include/ehs/io/BaseFile.h
View File

@ -25,7 +25,7 @@ namespace ehs
}; };
/// A cross-platform wrapper class that handles native file input/output. /// A cross-platform wrapper class that handles native file input/output.
class EHS_LIB_IO BaseFile class BaseFile
{ {
protected: protected:
Str_8 path; Str_8 path;

2
include/ehs/io/BaseFileMonitor.h
View File

@ -11,7 +11,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO BaseFileMonitor class BaseFileMonitor
{ {
protected: protected:
Str_8 filePath; Str_8 filePath;

8
include/ehs/io/BaseWindow.h
View File

@ -1,7 +1,9 @@
#pragma once #pragma once
#include "ehs/EHS.h"
#include "ehs/Str.h" #include "ehs/Str.h"
#include "ehs/Vec2.h" #include "ehs/Vec2.h"
#include "ehs/Rect.h"
#include "ehs/io/hid/Input.h" #include "ehs/io/hid/Input.h"
namespace ehs namespace ehs
@ -18,7 +20,7 @@ namespace ehs
I_BEAM I_BEAM
}; };
class EHS_LIB_IO BaseWindow class BaseWindow
{ {
protected: protected:
bool created; bool created;
@ -58,6 +60,10 @@ namespace ehs
bool HasFocus() const; bool HasFocus() const;
void EnableResizing(bool enable);
bool IsResizable() const;
/// Gets the cursors position on the desktop in pixels. /// Gets the cursors position on the desktop in pixels.
/// @param [in] relative Whether the position should be relative to the windows client. /// @param [in] relative Whether the position should be relative to the windows client.
/// @returns The current value. /// @returns The current value.

2
include/ehs/io/COM.h
View File

@ -20,7 +20,7 @@ namespace ehs
TWO TWO
}; };
class EHS_LIB_IO COM class COM
{ {
private: private:
UInt_8 port; UInt_8 port;

2
include/ehs/io/Console.h
View File

@ -12,7 +12,7 @@ namespace ehs
typedef int ConsoleHdl; typedef int ConsoleHdl;
#endif #endif
class EHS_LIB_IO Console class Console
{ {
private: private:
static ConsoleHdl hdlOut; static ConsoleHdl hdlOut;

2
include/ehs/io/Directory_LNX.h
View File

@ -4,7 +4,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Directory : public BaseDirectory class Directory : public BaseDirectory
{ {
public: public:
static Array<Str_8> GetAllFiles(const Str_8 &dir); static Array<Str_8> GetAllFiles(const Str_8 &dir);

2
include/ehs/io/Directory_W32.h
View File

@ -4,7 +4,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Directory : public BaseDirectory class Directory : public BaseDirectory
{ {
public: public:
static Array<Str_8> GetAllFiles(const Str_8 &dir); static Array<Str_8> GetAllFiles(const Str_8 &dir);

2
include/ehs/io/FileMonitor_UNX.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO FileMonitor : public BaseFileMonitor class FileMonitor : public BaseFileMonitor
{ {
private: private:
int hdl; int hdl;

2
include/ehs/io/FileMonitor_W32.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO FileMonitor final : public BaseFileMonitor class FileMonitor final : public BaseFileMonitor
{ {
private: private:
Handle hdl; Handle hdl;

2
include/ehs/io/File_UNX.h
View File

@ -10,7 +10,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO File : public BaseFile class File : public BaseFile
{ {
private: private:
int hdl; int hdl;

2
include/ehs/io/File_W32.h
View File

@ -10,7 +10,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO File : public BaseFile class File : public BaseFile
{ {
private: private:
HANDLE hdl; HANDLE hdl;

2
include/ehs/io/FontAtlas.h
View File

@ -10,7 +10,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO FontAtlas : public BaseObj class FontAtlas : public BaseObj
{ {
private: private:
UInt_64 hashId; UInt_64 hashId;

2
include/ehs/io/Glyph.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Glyph class Glyph
{ {
private: private:
Char_32 code; Char_32 code;

2
include/ehs/io/RIFF.h
View File

@ -8,7 +8,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO RIFF class RIFF
{ {
private: private:
Str_8 type; Str_8 type;

2
include/ehs/io/RIFF_Chunk.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO RIFF_Chunk class RIFF_Chunk
{ {
private: private:
Str_8 id; Str_8 id;

2
include/ehs/io/Resource.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Resource : public BaseObj class Resource : public BaseObj
{ {
private: private:
ehs::UInt_64 hashId; ehs::UInt_64 hashId;

2
include/ehs/io/UsbBase.h
View File

@ -4,7 +4,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO UsbBase class UsbBase
{ {
private: private:
UInt_32 bus; UInt_32 bus;

2
include/ehs/io/Usb_LNX.h
View File

@ -5,7 +5,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Usb final : public UsbBase class Usb final : public UsbBase
{ {
private: private:
int hdl; int hdl;

9
include/ehs/io/Window_W32.h
View File

@ -14,7 +14,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Window : public BaseWindow class Window : public BaseWindow
{ {
private: private:
UInt_32 owner; UInt_32 owner;
@ -71,6 +71,13 @@ namespace ehs
void SetIcon(const Str_8& filePath); void SetIcon(const Str_8& filePath);
/// Sets the windows client scale.
/// @param [in] w The width in pixels.
/// @param [in] h The height in pixels.
void SetClientSize(const Vec2<UInt_32>& size);
Vec2<UInt_32> GetClientSize();
/// Gets the windows native handle for the operating system or other native tasks. /// Gets the windows native handle for the operating system or other native tasks.
/// @returns The window's native handle. /// @returns The window's native handle.
HWND GetHdl() const; HWND GetHdl() const;

40
include/ehs/io/Window_Way.h
View File

@ -4,27 +4,21 @@
#include <wayland-client.h> #include <wayland-client.h>
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "xdg-decoration.h"
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Window : public BaseWindow class Window : public BaseWindow
{ {
protected: private:
wl_display *display; wl_display* display;
wl_registry *registry; wl_registry *registry;
wl_compositor *compositor; wl_compositor* compositor;
wl_surface *wlSurface; wl_surface* surface;
xdg_wm_base *xdgShell; xdg_wm_base *xdgShell;
xdg_surface *xdgSurface; xdg_surface *xdgSurface;
xdg_toplevel *xdgToplevel; xdg_toplevel *xdgToplevel;
zxdg_decoration_manager_v1 *decManager;
zxdg_toplevel_decoration_v1 *dec;
wl_seat *seat;
wl_pointer *pointer;
Vec2_u32 scale;
static void SurfaceConfigEvent(void *data, xdg_surface *xdg_surface, UInt_32 serial); static void SurfaceConfigure(void *data, xdg_surface *xdg_surface, UInt_32 serial);
static void ShellPing(void *data, xdg_wm_base *shell, UInt_32 serial); static void ShellPing(void *data, xdg_wm_base *shell, UInt_32 serial);
@ -32,32 +26,16 @@ namespace ehs
static void RegistryRemoved(void *data, wl_registry *registry, UInt_32 id); static void RegistryRemoved(void *data, wl_registry *registry, UInt_32 id);
static void ResizeEvent(void *data, xdg_toplevel *xdg_toplevel, Int_32 width, Int_32 height, wl_array *states);
static void CloseEvent(void *data, xdg_toplevel *xdg_toplevel);
static void SeatCapabilitiesEvent(void *data, wl_seat *seat, UInt_32 capabilities);
static void PointerMotionEvent(void *data, wl_pointer *pointer, UInt_32 time, wl_fixed_t sx, wl_fixed_t sy);
public: public:
~Window() override; ~Window() override;
Window(); Window();
Window(Window &&win) noexcept; void Create_32(const Str_32& title, const Vec2_s32& pos, const Vec2_u32 scale) override;
Window(const Window &win); void Create_16(const Str_16& title, const Vec2_s32& pos, const Vec2_u32 scale) override;
Window &operator=(Window &&win) noexcept; void Create_8(const Str_8& title, const Vec2_s32& pos, const Vec2_u32 scale) override;
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 OnCreated() override; void OnCreated() override;

2
include/ehs/io/Window_XCB.h
View File

@ -8,7 +8,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Window : public BaseWindow class Window : public BaseWindow
{ {
protected: protected:
friend class Input; friend class Input;

6
include/ehs/io/audio/Audio.h
View File

@ -11,7 +11,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Audio : public Resource class Audio : public Resource
{ {
private: private:
static Array<AudioCodec> codecs; static Array<AudioCodec> codecs;
@ -81,14 +81,10 @@ namespace ehs
UInt_64 GetSampleCount() const; UInt_64 GetSampleCount() const;
UInt_8 GetFrameSize() const;
UInt_64 GetSize() const; UInt_64 GetSize() const;
float GetLength() const; float GetLength() const;
Byte* GetFrame(UInt_64 frameIndex) const;
Array<Byte> FrameAsMono(UInt_64 frameIndex) const; Array<Byte> FrameAsMono(UInt_64 frameIndex) const;
Array<Byte> FrameAsStereo(UInt_64 frameIndex) const; Array<Byte> FrameAsStereo(UInt_64 frameIndex) const;

2
include/ehs/io/audio/AudioCodec.h
View File

@ -8,7 +8,7 @@ namespace ehs
{ {
class Audio; class Audio;
class EHS_LIB_IO AudioCodec class AudioCodec
{ {
private: private:
Str_8 id; Str_8 id;

4
include/ehs/io/audio/AudioDevice.h
View File

@ -5,5 +5,5 @@
#if defined(EHS_OS_WINDOWS) #if defined(EHS_OS_WINDOWS)
#include "AudioDevice_W32.h" #include "AudioDevice_W32.h"
#elif defined(EHS_OS_LINUX) #elif defined(EHS_OS_LINUX)
#include "AudioDevice_PW.h" #include "AudioDevice_ALSA.h"
#endif #endif

46
include/ehs/io/audio/AudioDevice_ALSA.h Normal file
View File

@ -0,0 +1,46 @@
#pragma once
#include "ehs/EHS.h"
#include "BaseAudioDevice.h"
#include <alsa/asoundlib.h>
namespace ehs
{
class AudioDevice : public BaseAudioDevice
{
private:
snd_pcm_t* hdl;
public:
~AudioDevice() override;
AudioDevice();
AudioDevice(AudioDevice&& device) noexcept;
AudioDevice(const AudioDevice& device);
AudioDevice& operator=(AudioDevice&& device) noexcept;
AudioDevice& operator=(const AudioDevice& device);
void Release() override;
void OpenStream() override;
void CloseStream() override;
UInt_64 GetAvailFrames() const override;
Byte* Map(UInt_64* offset, UInt_64* frames) override;
void UnMap(const UInt_64 offset, const UInt_64 frames) override;
bool IsValid() const override;
static AudioDevice GetDefault(const AudioDeviceType type);
static Array<AudioDevice> Get(const AudioDeviceType type, const AudioDeviceState state);
};
}

67
include/ehs/io/audio/AudioDevice_PW.h
View File

@ -1,67 +0,0 @@
#pragma once
#include "ehs/EHS.h"
#include "BaseAudioDevice.h"
#include <pipewire/pipewire.h>
#include <pipewire/loop.h>
#include <pipewire/context.h>
#include <pipewire/stream.h>
#include <spa/param/audio/format-utils.h>
namespace ehs
{
class EHS_LIB_IO AudioDevice final : public BaseAudioDevice
{
private:
static Array<AudioDevice> devices;
static AudioDevice defOut;
static AudioDevice defIn;
UInt_32 id;
Str_8 name;
pw_loop *loop;
pw_context *context;
pw_core *core;
pw_stream *input;
pw_stream *output;
static void RegistryEventGlobal(void *data, UInt_32 id, UInt_32 permissions, const char *type, UInt_32 version, const spa_dict *props);
static void RegistryEventGlobalRemove(void *data, UInt_32 id);
static void OnParamChanged(void *data, UInt_32 id, const spa_pod *param);
public:
~AudioDevice() override;
AudioDevice();
AudioDevice(AudioDevice&& device) noexcept;
AudioDevice(const AudioDevice& device);
AudioDevice& operator=(AudioDevice&& device) noexcept;
AudioDevice& operator=(const AudioDevice& device);
void OpenStream() override;
void CloseStream() override;
UInt_64 SendStream(const void *data, UInt_64 size) override;
UInt_64 ReceiveStream(void *data, UInt_64 size) override;
bool IsStreaming() const override;
bool IsValid() const override;
static AudioDevice GetDefault(AudioDeviceType type);
static Array<AudioDevice> Get(AudioDeviceType type, AudioDeviceState state);
private:
Str_8 GetCategory() const;
};
}

16
include/ehs/io/audio/AudioDevice_W32.h
View File

@ -12,7 +12,7 @@ struct IMMDevice;
namespace ehs namespace ehs
{ {
class EHS_LIB_IO AudioDevice final : public BaseAudioDevice class AudioDevice : public BaseAudioDevice
{ {
private: private:
IMMDevice* hdl; IMMDevice* hdl;
@ -33,13 +33,17 @@ namespace ehs
AudioDevice& operator=(const AudioDevice& device); AudioDevice& operator=(const AudioDevice& device);
void Release() override;
void OpenStream() override; void OpenStream() override;
void CloseStream() override; void CloseStream() override;
UInt_64 SendStream(const void *data, UInt_64 outFrameSize) override; UInt_64 GetAvailFrames() const override;
UInt_64 ReceiveStream(void *data, UInt_64 inFrameSize) override; Byte* Map(UInt_64* offset, UInt_64* frames) override;
void UnMap(const UInt_64 offset, const UInt_64 frames) override;
Str_32 GetInterfaceName_32() const; Str_32 GetInterfaceName_32() const;
@ -53,12 +57,10 @@ namespace ehs
Str_8 GetName_8() const; Str_8 GetName_8() const;
bool IsStreaming() const override;
bool IsValid() const override; bool IsValid() const override;
static AudioDevice GetDefault(AudioDeviceType type); static AudioDevice GetDefault(const AudioDeviceType type);
static Array<AudioDevice> Get(AudioDeviceType type, AudioDeviceState state); static Array<AudioDevice> Get(const AudioDeviceType type, const AudioDeviceState state);
}; };
} }

33
include/ehs/io/audio/BaseAudioDevice.h
View File

@ -10,8 +10,8 @@ namespace ehs
{ {
enum class AudioDeviceType enum class AudioDeviceType
{ {
INPUT = 0x1,
OUTPUT = 0x0, OUTPUT = 0x0,
INPUT = 0x1,
ALL = 0x2 ALL = 0x2
}; };
@ -23,17 +23,18 @@ namespace ehs
UNPLUGGED = 0x8 UNPLUGGED = 0x8
}; };
class EHS_LIB_IO BaseAudioDevice class BaseAudioDevice
{ {
protected: protected:
AudioDeviceType type; AudioDeviceType type;
DataType dataType; DataType dataType;
UInt_16 byteDepth; UInt_16 bitDepth;
UInt_32 sampleRate; UInt_32 sampleRate;
UInt_32 channels; UInt_32 channels;
UInt_32 period; UInt_32 period;
UInt_32 latency; UInt_32 latency;
UInt_64 maxFrames; UInt_64 maxFrames;
bool streaming;
public: public:
virtual ~BaseAudioDevice() = default; virtual ~BaseAudioDevice() = default;
@ -44,21 +45,21 @@ namespace ehs
BaseAudioDevice& operator=(const BaseAudioDevice& device); BaseAudioDevice& operator=(const BaseAudioDevice& device);
virtual void Release();
virtual void OpenStream(); virtual void OpenStream();
virtual void CloseStream(); virtual void CloseStream();
virtual UInt_64 SendStream(const void *data, UInt_64 size); virtual UInt_64 GetAvailFrames() const;
virtual UInt_64 ReceiveStream(void *data, UInt_64 size); virtual Byte* Map(UInt_64* offset, UInt_64* frames);
void BridgeStreams(BaseAudioDevice *input, UInt_64 frameBufferSize); virtual void UnMap(const UInt_64 offset, const UInt_64 frames);
void BridgeStreams(UInt_64 frameBufferSize);
AudioDeviceType GetType() const; AudioDeviceType GetType() const;
void SetDataType(DataType newDataType); void SetDataType(const DataType newDataType);
DataType GetDataType() const; DataType GetDataType() const;
@ -66,39 +67,39 @@ namespace ehs
UInt_16 GetBitDepth() const; UInt_16 GetBitDepth() const;
void SetSampleRate(UInt_32 newSampleRate); void SetSampleRate(const UInt_32 newSampleRate);
UInt_32 GetSampleRate() const; UInt_32 GetSampleRate() const;
void SetChannels(UInt_32 newChannels); void SetChannels(const UInt_32 newChannels);
UInt_16 GetChannels() const; UInt_16 GetChannels() const;
UInt_32 GetFrameSize() const; UInt_32 GetFrameSize() const;
void SetPeriod(UInt_32 newPeriod); void SetPeriod(const UInt_32 newPeriod);
UInt_32 GetPeriod() const; UInt_32 GetPeriod() const;
void SetLatency(UInt_32 newLatency); void SetLatency(const UInt_32 newLatency);
UInt_32 GetLatency() const; UInt_32 GetLatency() const;
UInt_64 GetMaxFrames() const; UInt_64 GetMaxFrames() const;
virtual bool IsStreaming() const; bool IsStreaming() const;
virtual bool IsValid() const; virtual bool IsValid() const;
/// Retrieves the default audio input/output device. /// Retrieves the default audio input/output device.
/// @param [in] type The audio device type to retrieve. /// @param [in] type The audio device type to retrieve.
/// @param [out] device The default audio device. /// @param [out] device The default audio device.
static BaseAudioDevice GetDefault(AudioDeviceType type); static BaseAudioDevice GetDefault(const AudioDeviceType type);
/// Retrieves a list of audio input/output devices. /// Retrieves a list of audio input/output devices.
/// @param [in] type The audio device type to retrieve. /// @param [in] type The audio device type to retrieve.
/// @param [in] state The audio device state to retrieve. /// @param [in] state The audio device state to retrieve.
/// @param [out] devices The list of audio devices. /// @param [out] devices The list of audio devices.
static Array<BaseAudioDevice> Get(AudioDeviceType type, AudioDeviceState state); static Array<BaseAudioDevice> Get(const AudioDeviceType type, const AudioDeviceState state);
}; };
} }

22
include/ehs/io/hid/Button.h
View File

@ -5,33 +5,27 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Button class Button
{ {
private: private:
UInt_32 hash;
Str_8 name; Str_8 name;
UInt_32 hash;
public: public:
Button(); Button();
Button(Str_8 name); Button(const Str_8& name);
Button(Button &&key) noexcept; Button(const Button& key);
Button(const Button &key); Button& operator=(const Button& key);
Button &operator=(Button &&key) noexcept; bool operator==(const Button& key) const;
Button &operator=(const Button &key); bool operator!=(const Button& key) const;
bool operator==(const Button &key) const;
bool operator!=(const Button &key) const;
UInt_32 GetHash() const;
Str_8 GetName() const; Str_8 GetName() const;
bool IsValid() const; UInt_32 GetHash() const;
}; };
} }

2
include/ehs/io/hid/ButtonState.h
View File

@ -13,7 +13,7 @@ namespace ehs
TOUCHED TOUCHED
}; };
class EHS_LIB_IO ButtonState class ButtonState
{ {
private: private:
Button button; Button button;

24
include/ehs/io/hid/HID.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO HID class HID
{ {
protected: protected:
UInt_8 type; UInt_8 type;
@ -15,15 +15,11 @@ namespace ehs
Str_8 name; Str_8 name;
UInt_64 id; UInt_64 id;
Array<ButtonState> states; Array<ButtonState> states;
Button lastState;
float heldTime;
float activateTime;
bool active;
public: public:
HID(); HID();
HID(UInt_8 type, Str_8 name, UInt_64 id); HID(const UInt_8 type, Str_8 name, const UInt_64 id);
HID(HID&& hid) noexcept; HID(HID&& hid) noexcept;
@ -37,11 +33,11 @@ namespace ehs
bool operator!=(const HID& other) const; bool operator!=(const HID& other) const;
bool operator==(UInt_64 otherId) const; bool operator==(const UInt_64 otherId) const;
bool operator!=(UInt_64 otherId) const; bool operator!=(const UInt_64 otherId) const;
virtual void Poll(float delta); virtual void Poll();
UInt_8 GetType() const; UInt_8 GetType() const;
@ -75,10 +71,6 @@ namespace ehs
const ButtonState* IsUp() const; const ButtonState* IsUp() const;
const ButtonState *IsPressed(const Button &button);
const ButtonState *GetPressed();
void ButtonDown(const Button& button); void ButtonDown(const Button& button);
void ButtonUp(const Button& button); void ButtonUp(const Button& button);
@ -95,11 +87,5 @@ namespace ehs
bool AddState(const ButtonState& state); bool AddState(const ButtonState& state);
ButtonState* GetState(const Button& button); ButtonState* GetState(const Button& button);
bool TickHoldTime(float delta);
void ResetTime();
void TickActivateTime(float delta);
}; };
} }

2
include/ehs/io/hid/Input.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Input class Input
{ {
private: private:
Array<InputHandler*> handlers; Array<InputHandler*> handlers;

8
include/ehs/io/hid/InputHandler.h
View File

@ -5,13 +5,11 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO InputHandler class InputHandler
{ {
private: private:
UInt_64 hashId; UInt_64 hashId;
Str_8 id; Str_8 id;
UInt_64 start;
UInt_64 delta;
protected: protected:
Array<HID*> devices; Array<HID*> devices;
@ -31,9 +29,9 @@ namespace ehs
InputHandler& operator=(const InputHandler& ih); InputHandler& operator=(const InputHandler& ih);
bool operator==(const UInt_64 otherHashId) const; bool operator==(const UInt_64 otherHashId);
bool operator!=(const UInt_64 otherHashId) const; bool operator!=(const UInt_64 otherHashId);
virtual bool Initialize(); virtual bool Initialize();

4
include/ehs/io/hid/Keyboard.h
View File

@ -8,7 +8,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Keyboard : public HID class Keyboard : public HID
{ {
public: public:
Keyboard(); Keyboard();
@ -23,7 +23,7 @@ namespace ehs
Keyboard& operator=(const Keyboard& hid); Keyboard& operator=(const Keyboard& hid);
void Poll(float delta) override; void Poll() override;
Keyboard* Clone() const override; Keyboard* Clone() const override;

6
include/ehs/io/hid/Mouse.h
View File

@ -9,7 +9,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Mouse : public HID class Mouse : public HID
{ {
private: private:
friend class Input; friend class Input;
@ -19,7 +19,7 @@ namespace ehs
public: public:
Mouse(); Mouse();
Mouse(Str_8 name, UInt_64 id); Mouse(Str_8 name, const UInt_64 id);
Mouse(Mouse&& hid) noexcept = default; Mouse(Mouse&& hid) noexcept = default;
@ -29,7 +29,7 @@ namespace ehs
Mouse& operator=(const Mouse& hid); Mouse& operator=(const Mouse& hid);
void Poll(float delta) override; void Poll() override;
void SetDelta(const Vec2_s32& newDelta); void SetDelta(const Vec2_s32& newDelta);

2
include/ehs/io/img/Img.h
View File

@ -13,7 +13,7 @@ namespace ehs
NEAREST_NEIGHBOR NEAREST_NEIGHBOR
}; };
class EHS_LIB_IO Img : public BaseObj class Img : public BaseObj
{ {
private: private:
static Array<ImgCodec> codecs; static Array<ImgCodec> codecs;

2
include/ehs/io/img/ImgCodec.h
View File

@ -12,7 +12,7 @@ namespace ehs
typedef bool (*EncodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*); typedef bool (*EncodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*);
typedef bool (*DecodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*); typedef bool (*DecodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*);
class EHS_LIB_IO ImgCodec class ImgCodec
{ {
private: private:
Str_8 id; Str_8 id;

2
include/ehs/io/img/PNG.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO PNG class PNG
{ {
private: private:
Str_8 id; Str_8 id;

2
include/ehs/io/img/PNG_Chunk.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO PNG_Chunk class PNG_Chunk
{ {
private: private:
Str_8 id; Str_8 id;

2
include/ehs/io/mdl/AnimBone.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO AnimBone class AnimBone
{ {
private: private:
UInt_8 boneId; UInt_8 boneId;

2
include/ehs/io/mdl/Animation.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Animation class Animation
{ {
private: private:
UInt_64 hashId; UInt_64 hashId;

2
include/ehs/io/mdl/Bone.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Bone class Bone
{ {
private: private:
UInt_64 hashName; UInt_64 hashName;

2
include/ehs/io/mdl/KeyFrame.h
View File

@ -9,7 +9,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO KeyFrame class KeyFrame
{ {
private: private:
float num; float num;

2
include/ehs/io/mdl/Mdl.h
View File

@ -15,7 +15,7 @@ namespace ehs
EHM EHM
}; };
class EHS_LIB_IO Mdl : public BaseObj class Mdl : public BaseObj
{ {
private: private:
static Array<MdlCodec> codecs; static Array<MdlCodec> codecs;

2
include/ehs/io/mdl/MdlCodec.h
View File

@ -12,7 +12,7 @@ namespace ehs
typedef bool (*EnocdeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, const Mdl*); typedef bool (*EnocdeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, const Mdl*);
typedef bool (*DecodeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, Mdl*); typedef bool (*DecodeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, Mdl*);
class EHS_LIB_IO MdlCodec class MdlCodec
{ {
private: private:
Str_8 id; Str_8 id;

2
include/ehs/io/mdl/Mesh.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Mesh final : public BaseObj class Mesh final : public BaseObj
{ {
protected: protected:
UInt_64 hashId; UInt_64 hashId;

2
include/ehs/io/mdl/PropertyChange.h
View File

@ -19,7 +19,7 @@ namespace ehs
INVALID INVALID
}; };
class EHS_LIB_IO PropertyChange class PropertyChange
{ {
public: public:
ChangeType type; ChangeType type;

18
include/ehs/io/socket/BaseDNS.h
View File

@ -1,18 +0,0 @@
#pragma once
#include "Socket.h"
#include "ehs/Str.h"
namespace ehs
{
class EHS_LIB_IO BaseDNS
{
public:
static Str_8 Resolve(AddrType type, const Str_8 &hostname);
/// Resolves a hostname to an ip address.
/// @param [in] hostname The given hostname to resolve.
/// @returns The resulting ip address.
static Str_8 Resolve(const Str_8 &hostname);
};
}

6
include/ehs/io/socket/BaseTCP.h
View File

@ -9,7 +9,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO BaseTCP class BaseTCP
{ {
protected: protected:
AddrType addrType; AddrType addrType;
@ -146,10 +146,6 @@ namespace ehs
/// @returns The result. /// @returns The result.
virtual bool IsBlocking() const = 0; virtual bool IsBlocking() const = 0;
virtual void SetIPv6Only(bool value) = 0;
virtual bool IsIPv6Only() const = 0;
/// Retrieves whether or not this socket was initialized. /// Retrieves whether or not this socket was initialized.
/// @returns The result. /// @returns The result.
virtual bool IsValid() const = 0; virtual bool IsValid() const = 0;

6
include/ehs/io/socket/BaseUDP.h
View File

@ -6,7 +6,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO BaseUDP class BaseUDP
{ {
protected: protected:
AddrType type; AddrType type;
@ -69,10 +69,6 @@ namespace ehs
/// @returns The result. /// @returns The result.
virtual bool IsBlocking() const = 0; virtual bool IsBlocking() const = 0;
virtual void SetIPv6Only(bool value) = 0;
virtual bool IsIPv6Only() const = 0;
/// Retrieves the bound ip version. /// Retrieves the bound ip version.
/// @returns The result. /// @returns The result.
AddrType GetLocalAddressType() const; AddrType GetLocalAddressType() const;

20
include/ehs/io/socket/DNS.h
View File

@ -1,9 +1,17 @@
#pragma once #pragma once
#include "ehs/system/OS.h" #include "ehs/EHS.h"
#include "ehs/Str.h"
#include "Socket.h"
#if defined(EHS_OS_WINDOWS) namespace ehs
#include "DNS_W32.h" {
#elif defined(EHS_OS_LINUX) class DNS
#include "DNS_LNX.h" {
#endif public:
/// Resolves a hostname to an ip address.
/// @param [in] hostname The given hostname to resolve.
/// @returns The resulting ip address.
static Str_8 Resolve(const Str_8& hostname);
};
}

17
include/ehs/io/socket/DNS_LNX.h
View File

@ -1,17 +0,0 @@
#pragma once
#include "BaseDNS.h"
#include "ehs/EHS.h"
#include "ehs/Str.h"
#include "Socket.h"
namespace ehs
{
class EHS_LIB_IO DNS final : public BaseDNS
{
public:
static Str_8 Resolve(AddrType type, const Str_8 &hostname);
static Str_8 Resolve(const Str_8 &hostname);
};
}

14
include/ehs/io/socket/DNS_W32.h
View File

@ -1,14 +0,0 @@
#pragma once
#include "BaseDNS.h"
namespace ehs
{
class EHS_LIB_IO DNS final : public BaseDNS
{
public:
static Str_8 Resolve(AddrType type, const Str_8 &hostname);
static Str_8 Resolve(const Str_8 &hostname);
};
}

228
include/ehs/io/socket/EHC.h
View File

@ -1,228 +0,0 @@
#pragma once
#include "ehs/io/socket/ehc/NetUtils.h"
#include "ehs/io/socket/ehc/NetEnc.h"
#include "ehs/Serializer.h"
#include "ehs/Vector.h"
#include "ehs/Array.h"
#include "Socket.h"
#include "UDP.h"
namespace ehs
{
class NetSys;
class NetEnd;
class EHC;
typedef bool (*ConnectCb)(EHC *, NetEnd **, Serializer<UInt_64>);
typedef void (*ConnectedCb)(EHC *, NetEnd *);
typedef void (*ActiveCb)(EHC *, NetEnd *);
typedef void (*DisconnectCb)(EHC *, NetEnd *, Serializer<UInt_64>);
typedef void (*DisconnectedCb)(EHC *, NetEnd *);
typedef void (*TimeoutCb)(EHC *, NetEnd *);
class EHC
{
private:
friend class NetEnc;
friend class NetEnd;
static const Version version;
static const UInt_64 internalSys;
static const UInt_64 connectOp;
static const UInt_64 connectedOp;
static const UInt_64 rejectedOp;
static const UInt_64 disconnectOp;
static const UInt_64 disconnectedOp;
static const UInt_64 statusUpdateOp;
static const UInt_64 pingOp;
static const UInt_64 pongOp;
static const UInt_64 latencyOp;
static const UInt_64 receivedOp;
UDP udp;
Version appVer;
EndDisp disposition;
UInt_64 hashName;
Str_8 name;
bool dropPackets;
Byte* buffer;
UInt_32 bufferSize;
Array<NetEnc *> encryptions;
Array<NetSys *> systems;
UInt_32 maxEndpoints;
UInt_64 lastTSC;
float delta;
float maxTimeout;
float resendRate;
ConnectCb connectCb;
ConnectedCb connectedCb;
ActiveCb activeCb;
DisconnectCb disconnectCb;
DisconnectedCb disconnectedCb;
TimeoutCb timeoutCb;
protected:
Vector<NetEnd*> endpoints;
public:
~EHC();
EHC();
EHC(const Version &ver, Str_8 name, UInt_64 maxEndpoints);
EHC(const Version &ver, Str_8 name);
EHC(EHC &&sock) noexcept;
EHC(const EHC &sock);
EHC &operator=(EHC&& sock) noexcept;
EHC &operator=(const EHC &sock);
void Initialize();
void Release();
void Bind(AddrType newType, const Str_8& newAddress, UInt_16 newPort);
void Connect(AddrType rType, const Str_8& rAddress, UInt_16 rPort, Serializer<UInt_64> data);
bool Disconnect(EndDisp endDisp, const Char_8 token[64], const Str_8& msg);
void Broadcast(EndDisp endDisp, Status endStatus, bool deltaLocked, UInt_64 encHashId,
bool ensure, UInt_64 sysHashId, UInt_64 opHashId,
const Serializer<UInt_64> &payload);
void Broadcast(EndDisp endDisp, Status endStatus, bool deltaLocked, const Str_8 &encId,
bool ensure, const Str_8 &sysId, const Str_8 &opId,
const Serializer<UInt_64> &payload);
void Poll();
bool IsInitialized() const;
AddrType GetLocalAddressType() const;
Str_8 GetLocalAddress() const;
UInt_16 GetLocalPort() const;
bool IsBound() const;
static Version GetVersion();
Version GetAppVersion() const;
EndDisp GetDisposition() const;
UInt_64 GetHashName() const;
Str_8 GetName() const;
void EnableDropPackets(bool enable);
bool IsDropPacketsEnabled() const;
bool HasEncryption(UInt_64 encHashId) const;
bool HasEncryption(const Str_8& encId) const;
bool AddEncryption(NetEnc *enc);
NetEnc* GetEncryption(UInt_64 encHashId) const;
NetEnc* GetEncryption(const Str_8& encId) const;
bool HasSystem(UInt_64 sysHashId) const;
bool HasSystem(const Str_8& sysId) const;
bool AddSystem(NetSys *sys);
NetSys* GetSystem(UInt_64 sysHashId) const;
NetSys* GetSystem(const Str_8& sysId) const;
bool HasEndpoint(EndDisp endDisp, Status endStatus, const Char_8 token[64]) const;
bool HasEndpoint(EndDisp endDisp, Status endStatus, UInt_64 hashId) const;
bool HasEndpoint(EndDisp endDisp, Status endStatus, const Str_8 &id) const;
bool HasEndpoint(EndDisp endDisp, const Char_8 token[64]) const;
bool HasEndpoint(EndDisp endDisp, UInt_64 hashId) const;
bool HasEndpoint(EndDisp endDisp, const Str_8 &id) const;
bool HasEndpoint(const Char_8 token[64]) const;
bool HasEndpoint(UInt_64 hashId) const;
bool HasEndpoint(const Str_8 &id) const;
bool HasEndpoint(const Str_8& rAddress, UInt_16 rPort) const;
NetEnd *GetEndpoint(EndDisp endDisp, Status endStatus, const Char_8 token[64]) const;
NetEnd *GetEndpoint(EndDisp endDisp, Status endStatus, UInt_64 hashId) const;
NetEnd *GetEndpoint(EndDisp endDisp, Status endStatus, const Str_8 &id) const;
NetEnd *GetEndpoint(EndDisp endDisp, const Char_8 token[64]) const;
NetEnd *GetEndpoint(EndDisp endDisp, UInt_64 hashId) const;
NetEnd *GetEndpoint(EndDisp endDisp, const Str_8 &id) const;
NetEnd *GetEndpoint(const Str_8& rAddress, UInt_16 rPort) const;
Array<NetEnd *> GetEndpoints(EndDisp endDisp, Status endStatus);
Array<NetEnd *> GetEndpoints(EndDisp endDisp);
UInt_64 GetEndpointsCount(EndDisp endDisp, Status endStatus);
UInt_64 GetEndpointsCount(EndDisp endDisp);
UInt_64 GetMaxEndpoints() const;
void SetMaxTimeout(float seconds);
float GetMaxTimeout() const;
void SetResendRate(float seconds);
float GetResendRate() const;
void SetConnectCb(ConnectCb cb);
void SetConnectedCb(ConnectedCb cb);
void SetActiveCb(ActiveCb cb);
void SetDisconnectCb(DisconnectCb cb);
void SetDisconnectedCb(DisconnectedCb cb);
void SetTimeoutCb(TimeoutCb cb);
private:
void GenerateToken(Char_8 in[64]);
void UpdateQueue(UInt_64 active);
void UpdateQueue();
bool RemoveEndpoint(EndDisp disposition, const Char_8 token[64]);
bool RemoveEndpoint(const Str_8& address, UInt_16 port);
bool RemoveEndpoint(const NetEnd* end);
void PollEndpoints();
};
}

2
include/ehs/io/socket/Request.h
View File

@ -16,7 +16,7 @@ namespace ehs
DEL DEL
}; };
class EHS_LIB_IO Request class Request
{ {
private: private:
Verb verb; Verb verb;

2
include/ehs/io/socket/Response.h
View File

@ -8,7 +8,7 @@
namespace ehs namespace ehs
{ {
class EHS_LIB_IO Response class Response
{ {
private: private:
UInt_32 code; UInt_32 code;

2
include/ehs/io/socket/SSL.h
View File

@ -12,7 +12,7 @@ typedef struct ssl_st SSL;
namespace ehs namespace ehs
{ {
/// A class for handling the HTTP(S) TCP socket layer. /// A class for handling the HTTP(S) TCP socket layer.
class EHS_LIB_IO SSL : public TCP class SSL : public TCP
{ {
private: private:
SSL_CTX* ctx; SSL_CTX* ctx;

6
include/ehs/io/socket/TCP_BSD.h
View File

@ -10,7 +10,7 @@
namespace ehs namespace ehs
{ {
/// A wrapper class for the transmission control protocol socket. /// A wrapper class for the transmission control protocol socket.
class EHS_LIB_IO TCP : public BaseTCP class TCP : public BaseTCP
{ {
protected: protected:
Socket hdl; Socket hdl;
@ -80,10 +80,6 @@ namespace ehs
/// @returns The result. /// @returns The result.
bool IsBlocking() const override; bool IsBlocking() const override;
void SetIPv6Only(bool value) override;
bool IsIPv6Only() const override;
bool IsValid() const override; bool IsValid() const override;
private: private:

6
include/ehs/io/socket/TCP_W32.h
View File

@ -10,7 +10,7 @@
namespace ehs namespace ehs
{ {
/// A wrapper class for the transmission control protocol socket. /// A wrapper class for the transmission control protocol socket.
class EHS_LIB_IO TCP : public BaseTCP class TCP : public BaseTCP
{ {
protected: protected:
Socket hdl; Socket hdl;
@ -80,10 +80,6 @@ namespace ehs
/// @returns The result. /// @returns The result.
bool IsBlocking() const override; bool IsBlocking() const override;
void SetIPv6Only(bool value) override;
bool IsIPv6Only() const override;
bool IsValid() const override; bool IsValid() const override;
private: private:

6
include/ehs/io/socket/UDP_BSD.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
/// A wrapper class for the user datagram protocol socket. /// A wrapper class for the user datagram protocol socket.
class EHS_LIB_IO UDP : public BaseUDP class UDP : public BaseUDP
{ {
private: private:
Socket hdl; Socket hdl;
@ -68,10 +68,6 @@ namespace ehs
/// @returns The result. /// @returns The result.
bool IsBlocking() const override; bool IsBlocking() const override;
void SetIPv6Only(bool value) override;
bool IsIPv6Only() const override;
bool IsValid() const override; bool IsValid() const override;
private: private:

6
include/ehs/io/socket/UDP_W32.h
View File

@ -7,7 +7,7 @@
namespace ehs namespace ehs
{ {
/// A wrapper class for the user datagram protocol socket. /// A wrapper class for the user datagram protocol socket.
class EHS_LIB_IO UDP : public BaseUDP class UDP : public BaseUDP
{ {
private: private:
Socket hdl; Socket hdl;
@ -68,10 +68,6 @@ namespace ehs
/// @returns The result. /// @returns The result.
bool IsBlocking() const override; bool IsBlocking() const override;
void SetIPv6Only(bool value) override;
bool IsIPv6Only() const override;
bool IsValid() const override; bool IsValid() const override;
private: private:

43
include/ehs/io/socket/ehc/NetEnc.h
View File

@ -1,43 +0,0 @@
#pragma once
#include "ehs/Str.h"
namespace ehs
{
class EHC;
class NetEnc
{
private:
friend class EHC;
EHC *owner;
UInt_64 hashId;
Str_8 id;
public:
virtual ~NetEnc() = default;
NetEnc();
NetEnc(Str_8 id);
NetEnc(NetEnc &&enc) noexcept;
NetEnc(const NetEnc &enc);
NetEnc &operator=(NetEnc &&enc) noexcept;
NetEnc &operator=(const NetEnc &enc);
EHC *GetOwner() const;
UInt_64 GetHashId() const;
Str_8 GetId() const;
virtual void Encrypt(Byte *data, UInt_64 size) const;
virtual void Decrypt(Byte *data, UInt_64 size) const;
};
}

134
include/ehs/io/socket/ehc/NetEnd.h
View File

@ -1,134 +0,0 @@
#pragma once
#include "NetUtils.h"
#include "NetFrags.h"
#include "ehs/Str.h"
#include "ehs/Vector.h"
#include "ehs/Serializer.h"
#include "ehs/io/socket/Socket.h"
namespace ehs
{
class EHC;
class NetEnd
{
private:
friend class EHC;
EHC* owner;
EndDisp disposition;
UInt_64 hashName;
Str_8 name;
Status status;
Architecture arch;
Char_8 token[64];
UInt_64 nextSendId;
Vector<Insurance> sent;
UInt_64 nextRecvId;
Vector<NetFrags> received;
AddrType type;
Str_8 address;
UInt_16 port;
float deltaDuration;
float deltaRate;
float timeout;
float lastPing;
float oldLatency;
float latency;
UInt_64 queueSlot;
public:
NetEnd();
NetEnd(EndDisp disposition, Str_8 id, Architecture arch, AddrType type, Str_8 address, UInt_16 port);
NetEnd(AddrType type, Str_8 address, UInt_16 port);
NetEnd(NetEnd &&end) noexcept;
NetEnd(const NetEnd &end);
NetEnd &operator=(NetEnd &&end) noexcept;
NetEnd &operator=(const NetEnd &end);
EndDisp GetDisposition() const;
UInt_64 GetHashName() const;
Str_8 GetName() const;
Status GetStatus() const;
Architecture GetArchitecture() const;
UInt_64 GetNextSendId() const;
/// Sends data to the remote endpoint.
/// @param [in] deltaLocked Whether or not to match the remote endpoint's delta time to prevent overloading the client. This will drop data if delta time does not match.
/// @param [in] encHashId The hash id of the encryption to use. Can be zero for none.
/// @param [in] ensure Whether or not to ensure the data was received by the remote endpoint.
/// @param [in] sys The system hash id to execute an operation from.
/// @param [in] op The operation hash id in the system to execute.
/// @param [in] payload Additional parameters and data to send to the remote endpoint.
void Send(bool deltaLocked, UInt_64 encHashId, bool ensure, UInt_64 sys, UInt_64 op, const Serializer<UInt_64>& payload);
/// Sends data to the remote endpoint.
/// @param [in] deltaLocked Whether or not to match the remote endpoint's delta time to prevent overloading the client. This will drop data if delta time does not match.
/// @param [in] encId The id of the encryption to use. Can be empty for none.
/// @param [in] ensure Whether or not to ensure the data was received by the remote endpoint.
/// @param [in] sys The system string id to execute an operation from.
/// @param [in] op The operation string id in the system to execute.
/// @param [in] payload Additional parameters and data to send to the remote endpoint.
void Send(bool deltaLocked, const Str_8 &encID, bool ensure, const Str_8& sys, const Str_8& op, const Serializer<UInt_64>& payload);
UInt_64 GetNextRecvId() const;
Str_8 GetAddress() const;
UInt_16 GetPort() const;
void SetDeltaRate(float newDeltaRate);
float GetDeltaRate() const;
float GetTimeout() const;
float GetLastPing() const;
void SendLatency();
float GetLatency() const;
UInt_64 GetQueueSlot() const;
private:
void Poll(float delta);
void SetStatus(Status newStatus);
void RemoveInsurance(UInt_64 msgId, UInt_64 fragment);
void AddReceived(const Header& header, const Serializer<>& payload);
Vector<NetFrags>* GetReceived();
void Ping(float delta);
void Pong(float delta);
void SetLatency(float newLatency);
void SetQueueSlot(UInt_64 slot);
NetFrags FragmentData(const Header& header, const Serializer<>& data);
void Send(const Header& header, const Serializer<>& payload);
bool SortingNeeded() const;
void SortReceived();
};
}

43
include/ehs/io/socket/ehc/NetFrags.h
View File

@ -1,43 +0,0 @@
#pragma once
#include "NetUtils.h"
#include <ehs/Serializer.h>
namespace ehs
{
class NetFrags
{
private:
Header header;
Serializer<UInt_64>* data;
UInt_64 size;
public:
~NetFrags();
NetFrags();
NetFrags(const Header &header, const Serializer<UInt_64> &payload);
NetFrags(const Header &header, UInt_64 size);
NetFrags(NetFrags &&frags) noexcept;
NetFrags(const NetFrags &frags);
NetFrags &operator=(NetFrags &&frags) noexcept;
NetFrags &operator=(const NetFrags &frags);
operator Serializer<UInt_64> *() const;
Header GetHeader() const;
UInt_64 Size() const;
bool IsComplete() const;
Packet Combine() const;
};
}

42
include/ehs/io/socket/ehc/NetOp.h
View File

@ -1,42 +0,0 @@
#pragma once
#include "ehs/Str.h"
#include "ehs/Serializer.h"
namespace ehs
{
class EHC;
class NetSys;
class NetEnd;
class NetOp
{
private:
friend class NetSys;
UInt_64 hashId;
Str_8 id;
public:
virtual ~NetOp() = default;
NetOp();
NetOp(Str_8 id);
NetOp(NetOp &&op) noexcept;
NetOp(const NetOp &op);
NetOp &operator=(NetOp &&op) noexcept;
NetOp &operator=(const NetOp &op);
Str_8 GetId() const;
UInt_64 GetHashId() const;
private:
virtual void Process(EHC *ehc, NetEnd *endpoint, NetSys *sys, Serializer<UInt_64> &payload);
};
}

48
include/ehs/io/socket/ehc/NetSys.h
View File

@ -1,48 +0,0 @@
#pragma once
#include "ehs/Str.h"
#include "ehs/Array.h"
#include "ehs/Serializer.h"
namespace ehs
{
class EHC;
class NetEnd;
class NetOp;
class NetSys
{
private:
friend class EHC;
UInt_64 hashId;
Str_8 id;
Array<NetOp*> ops;
public:
virtual ~NetSys();
NetSys();
NetSys(Str_8 id);
NetSys(NetSys &&sys) noexcept;
NetSys(const NetSys &sys);
NetSys &operator=(NetSys &&sys) noexcept;
NetSys &operator=(const NetSys &sys);
Str_8 GetId() const;
UInt_64 GetHashId() const;
bool HasOperation(UInt_64 hashId) const;
bool AddOperation(NetOp *op);
private:
void Execute(EHC *ehc, NetEnd *endpoint, UInt_64 hashId, Serializer<UInt_64> &payload);
};
}

54
include/ehs/io/socket/ehc/NetUtils.h
View File

@ -1,54 +0,0 @@
#pragma once
#include "ehs/Serializer.h"
namespace ehs
{
enum class EndDisp : UInt_8
{
ENDPOINT,
SERVICE
};
enum class Status : UInt_8
{
ACTIVE,
PENDING,
IN_LOCAL_QUEUE,
IN_REMOTE_QUEUE,
};
struct Header
{
UInt_64 encHashId = 0;
UInt_64 id = 0;
UInt_64 fragments = 0;
UInt_64 fragment = 0;
bool ensure = false;
EndDisp disposition = EndDisp::ENDPOINT;
Char_8 token[64] = {};
UInt_64 system = 0;
UInt_64 op = 0;
};
struct Packet
{
Header header;
Serializer<UInt_64> payload;
};
struct Insurance
{
Header header;
Serializer<UInt_64> payload;
float lastResend;
};
}
#ifndef EHC_IPV4_PAYLOAD
#define EHC_IPV4_PAYLOAD (EHS_IPV4_UDP_PAYLOAD - (UInt_16)sizeof(Header))
#endif
#ifndef EHC_IPV6_PAYLOAD
#define EHC_IPV6_PAYLOAD (EHS_IPV6_UDP_PAYLOAD - (UInt_16)sizeof(Header))
#endif

12
include/ehs/io/socket/rest/Spotify.h
View File

@ -21,7 +21,7 @@ namespace ehs
Str_8 id; Str_8 id;
}; };
class EHS_LIB_IO Spotify final class Spotify
{ {
private: private:
SSL client; SSL client;
@ -40,14 +40,14 @@ namespace ehs
Spotify(); Spotify();
Spotify(Str_8 clientId, Str_8 secret, Str_8 redURI, Array<Str_8> scopes, bool forceVerify); Spotify(const Str_8& clientId, const Str_8& secret, const Str_8& redURI, const Array<Str_8>& scopes, const bool forceVerify);
bool Authorize(); bool Authorize();
/// Sets the volume for a device. /// Sets the volume for a device.
/// @param [in] level The percentage to set the volume to. /// @param [in] level The percentage to set the volume to.
/// @returns The response code. /// @returns The response code.
UInt_32 SetVolume(UInt_8 level); UInt_32 SetVolume(const UInt_8 level);
/// Resume playback for a device. /// Resume playback for a device.
/// @returns The response code. /// @returns The response code.
@ -60,12 +60,12 @@ namespace ehs
/// Repeats playback for a device. /// Repeats playback for a device.
/// @param [in] status The status to set it to. /// @param [in] status The status to set it to.
/// @returns The response code. /// @returns The response code.
UInt_32 SetRepeat(SpotifyState state); UInt_32 SetRepeat(const SpotifyState state);
/// Shuffles playback for a device. /// Shuffles playback for a device.
/// @param [in] state The state to set shuffle to. /// @param [in] state The state to set shuffle to.
/// @returns The response code. /// @returns The response code.
UInt_32 SetShuffle(bool state); UInt_32 SetShuffle(const bool state);
UInt_32 SearchTrack(Vector<Str_8>& artists, Str_8& id, Str_8& name); UInt_32 SearchTrack(Vector<Str_8>& artists, Str_8& id, Str_8& name);
@ -93,7 +93,7 @@ namespace ehs
/// Seeks to a position of the currently playing track in milliseconds. /// Seeks to a position of the currently playing track in milliseconds.
/// @param [in] pos The position in milliseconds to seek to. /// @param [in] pos The position in milliseconds to seek to.
/// @returns The response code. /// @returns The response code.
UInt_32 Seek(UInt_32 pos); UInt_32 Seek(const UInt_32 pos);
Str_8 GetClientId() const; Str_8 GetClientId() const;

Some files were not shown because too many files have changed in this diff Show More