Merge pull request 'Added the capability for custom encryption's to be added to EHC.' (#14) from fix into main

Reviewed-on: #14

.gitea/workflows/BuildRelease.yaml

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

CMakeLists.txt

@@ -13,7 +13,8 @@ project(EHS CXX C)
 
 if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
     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.")
 elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
     set(IS_OS_LINUX TRUE)
@@ -39,164 +40,198 @@ endif ()
 set(CMAKE_CXX_STANDARD 20)
 
 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/GarbageCollector.cpp include/ehs/GarbageCollector.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/database/DVar.cpp include/ehs/database/DVar.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
 
-        src/io/socket/Request.cpp include/ehs/io/socket/Request.h
+    include/ehs/io/socket/Socket.h
-        src/io/socket/Response.cpp include/ehs/io/socket/Response.h
+    src/io/socket/Request.cpp include/ehs/io/socket/Request.h
-        src/io/socket/DNS.cpp include/ehs/io/socket/DNS.h
+    src/io/socket/Response.cpp include/ehs/io/socket/Response.h
-        src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.h
+    src/io/socket/BaseDNS.cpp include/ehs/io/socket/BaseDNS.h
-        src/io/socket/BaseTCP.cpp include/ehs/io/socket/BaseTCP.h
+    include/ehs/io/socket/DNS.h
-        src/io/socket/SSL.cpp include/ehs/io/socket/SSL.h
+    src/io/socket/BaseUDP.cpp include/ehs/io/socket/BaseUDP.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
 
-        src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
+        include/ehs/io/socket/ehc/NetUtils.h
-        src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
+        src/io/socket/EHC.cpp include/ehs/io/socket/EHC.h
-        src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h
+        src/io/socket/ehc/NetFrags.cpp include/ehs/io/socket/ehc/NetFrags.h
-        include/ehs/io/socket/Socket.h
+        src/io/socket/ehc/NetEnd.cpp include/ehs/io/socket/ehc/NetEnd.h
-        include/ehs/io/socket/TCP.h
+        src/io/socket/ehc/NetSys.cpp include/ehs/io/socket/ehc/NetSys.h
-        include/ehs/io/socket/UDP.h
+        src/io/socket/ehc/NetOp.cpp include/ehs/io/socket/ehc/NetOp.h
 
-        src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h
+    src/io/socket/rest/Twitch.cpp include/ehs/io/socket/rest/Twitch.h
-        src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h
+    src/io/socket/rest/TwitchChat.cpp include/ehs/io/socket/rest/TwitchChat.h
-        src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h
+    src/io/socket/rest/Spotify.cpp include/ehs/io/socket/rest/Spotify.h
-        include/ehs/io/audio/AudioDevice.h
 
-        src/io/img/PNG.cpp include/ehs/io/img/PNG.h
+    src/io/audio/Audio.cpp include/ehs/io/audio/Audio.h
-        src/io/img/Img.cpp include/ehs/io/img/Img.h
+    src/io/audio/BaseAudioDevice.cpp include/ehs/io/audio/BaseAudioDevice.h
-        src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h
+    src/io/audio/AudioCodec.cpp include/ehs/io/audio/AudioCodec.h
-        src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h
+    include/ehs/io/audio/AudioDevice.h
 
-        include/ehs/io/model/Vertex.h
+    src/io/img/PNG.cpp include/ehs/io/img/PNG.h
-        src/io/model/Mesh.cpp include/ehs/io/model/Mesh.h
+    src/io/img/Img.cpp include/ehs/io/img/Img.h
-        src/io/model/Bone.cpp include/ehs/io/model/Bone.h
+    src/io/img/PNG_Chunk.cpp include/ehs/io/img/PNG_Chunk.h
-        src/io/model/Model.cpp include/ehs/io/model/Model.h
+    src/io/img/ImgCodec.cpp include/ehs/io/img/ImgCodec.h
-        src/io/model/Animation.cpp include/ehs/io/model/Animation.h
-        src/io/model/AnimBone.cpp include/ehs/io/model/AnimBone.h
-        src/io/model/KeyFrame.cpp include/ehs/io/model/KeyFrame.h
-        src/io/model/PropertyChange.cpp include/ehs/io/model/PropertyChange.h
 
-        src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h
+    include/ehs/io/mdl/Vertex.h
-        src/io/hid/Button.cpp include/ehs/io/hid/Button.h
+    src/io/model/Mesh.cpp include/ehs/io/mdl/Mesh.h
-        src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h
+    src/io/model/Bone.cpp include/ehs/io/mdl/Bone.h
-        src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h
+    src/io/model/Mdl.cpp include/ehs/io/mdl/Mdl.h
-        src/io/hid/HID.cpp include/ehs/io/hid/HID.h
+    src/io/model/Animation.cpp include/ehs/io/mdl/Animation.h
-        src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h
+    src/io/model/AnimBone.cpp include/ehs/io/mdl/AnimBone.h
-        src/io/hid/Input.cpp include/ehs/io/hid/Input.h
+    src/io/model/KeyFrame.cpp include/ehs/io/mdl/KeyFrame.h
+    src/io/model/PropertyChange.cpp include/ehs/io/mdl/PropertyChange.h
+
+    src/io/hid/ButtonState.cpp include/ehs/io/hid/ButtonState.h
+    src/io/hid/Button.cpp include/ehs/io/hid/Button.h
+    src/io/hid/Mouse.cpp include/ehs/io/hid/Mouse.h
+    src/io/hid/Keyboard.cpp include/ehs/io/hid/Keyboard.h
+    src/io/hid/HID.cpp include/ehs/io/hid/HID.h
+    src/io/hid/InputHandler.cpp include/ehs/io/hid/InputHandler.h
+    src/io/hid/Input.cpp include/ehs/io/hid/Input.h
+    src/io/model/MdlCodec.cpp
+    include/ehs/io/mdl/MdlCodec.h
+    include/ehs/io/UsbBase.h
+    src/io/UsbBase.cpp
+    include/ehs/db/DbTable.h
+    include/ehs/db/DbObject.h
+    include/ehs/db/DbVar.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)
     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/system/Semaphore_W32.cpp include/ehs/system/Semaphore_W32.h
+        src/io/socket/DNS_W32.cpp include/ehs/io/socket/DNS_W32.h
-            src/system/System_W32.cpp include/ehs/system/System_W32.h
+        src/system/Semaphore_W32.cpp include/ehs/system/Semaphore_W32.h
-            src/system/Mutex_W32.cpp include/ehs/system/Mutex_W32.h
+        src/system/System_W32.cpp include/ehs/system/System_W32.h
-            src/system/Open_W32.cpp include/ehs/system/Open_W32.h
+        src/system/Mutex_W32.cpp include/ehs/system/Mutex_W32.h
-            src/io/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h
+        src/system/Open_W32.cpp include/ehs/system/Open_W32.h
-            src/io/File_W32.cpp include/ehs/io/File_W32.h
+        src/io/audio/audioDevice_W32.cpp include/ehs/io/audio/audioDevice_W32.h
-            src/io/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h
+        src/io/File_W32.cpp include/ehs/io/File_W32.h
-            src/io/Window_W32.cpp include/ehs/io/Window_W32.h
+        src/io/FileMonitor_W32.cpp include/ehs/io/FileMonitor_W32.h
-            src/io/COM.cpp include/ehs/io/COM.h
+        src/io/Window_W32.cpp include/ehs/io/Window_W32.h
-            src/system/CPU_MSVC_AMD64.asm src/HRNG_MSVC.asm src/Math_MSVC_AMD64.asm
+        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/io/Directory_W32.cpp include/ehs/io/Directory_W32.h
     )
 elseif (IS_OS_LINUX)
     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/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.h
+        src/io/socket/DNS_LNX.cpp include/ehs/io/socket/DNS_LNX.h
-            src/system/System_LNX.cpp include/ehs/system/System_LNX.h
+        src/system/Semaphore_P.cpp include/ehs/system/Semaphore_P.h
-            src/system/Open_UNX.cpp include/ehs/system/Open_UNX.h
+        src/system/System_LNX.cpp include/ehs/system/System_LNX.h
-            src/io/File_UNX.cpp include/ehs/io/File_UNX.h
+        src/system/Open_UNX.cpp include/ehs/system/Open_UNX.h
-            src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_UNX.h
+        src/io/File_UNX.cpp include/ehs/io/File_UNX.h
-            src/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h
+        src/io/FileMonitor_UNX.cpp include/ehs/io/FileMonitor_UNX.h
-            src/io/audio/AudioDevice_ALSA.cpp include/ehs/io/audio/AudioDevice_ALSA.h
+        src/system/Mutex_PT.cpp include/ehs/system/Mutex_PT.h
-            src/system/FileSystem.cpp include/ehs/system/FileSystem.h
+        src/io/audio/AudioDevice_PW.cpp include/ehs/io/audio/AudioDevice_PW.h
-            src/system/User.cpp include/ehs/system/User.h
+        src/system/FileSystem.cpp include/ehs/system/FileSystem.h
+        src/system/User.cpp include/ehs/system/User.h
+        src/io/Directory_LNX.cpp include/ehs/io/Directory_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")
         add_compile_definitions(EHS_WS_WAYLAND)
-        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)
+        list(APPEND EHS_SOURCES
+                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.")
     elseif (LINUX_WINDOW_SYSTEM STREQUAL "XCB")
         add_compile_definitions(EHS_WS_XCB)
@@ -214,23 +249,37 @@ endif()
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 #message("${CMAKE_CXX_FLAGS}")
 
-add_library(EHS ${EHS_SOURCES})
+add_library(EHS_Stc STATIC ${EHS_SOURCES})
-
+add_library(EHS_Dyn SHARED ${EHS_SOURCES})
 add_executable(StrToHash src/StrToHash.cpp)
 
-target_include_directories(EHS PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_compile_definitions(EHS_Dyn PRIVATE EHS_LIB_EXPORT)
+
+target_include_directories(EHS_Stc PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(EHS_Dyn PUBLIC ${PROJECT_SOURCE_DIR}/include)
 
 if (IS_OS_LINUX)
     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)
     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 ()
 
-install(TARGETS EHS DESTINATION lib)
+install(TARGETS EHS_Stc 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)
 if (ZLIB_FOUND)
@@ -246,16 +295,22 @@ else ()
     message(STATUS "OpenSSL was not found.")
 endif ()
 
-target_link_libraries(EHS OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
+target_link_libraries(EHS_Stc 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)
-    target_link_libraries(StrToHash ws2_32 avrt EHS)
+    target_link_libraries(EHS_Dyn avrt ws2_32)
+    target_link_libraries(StrToHash ws2_32 avrt EHS_Stc)
 elseif (IS_OS_LINUX)
     if (LINUX_WINDOW_SYSTEM STREQUAL "Wayland")
+        target_link_libraries(EHS_Dyn wayland-client)
         target_link_libraries(StrToHash wayland-client)
     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)
     endif ()
 
-    target_link_libraries(StrToHash z asound EHS)
+    target_link_libraries(EHS_Dyn z asound pipewire-0.3)
+    target_link_libraries(StrToHash z asound EHS_Stc)
 endif ()

CMakePresets.json

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

README.md

@@ -8,6 +8,7 @@ This project does not fully follow the C++ standard.
 ### Features
 - Audio IO/Processing/Manipulation
 - Image Processing/Manipulation
+- Databases
 - 3D Model & Mesh Processing/Manipulation
 - File IO
 - Basic File Monitoring
@@ -20,7 +21,7 @@ This project does not fully follow the C++ standard.
 - Mutexes
 - Semaphores
 - CPU information and features at runtime
-- HTTP(S) Sockets
+- HTTP(S) Socket Layer
 - TCP Socket
 - UDP Socket
 - COM (Serial) IO
@@ -29,12 +30,13 @@ This project does not fully follow the C++ standard.
 - Twitch Integration
 - Json Parsing/Writing
 - User Friendly HID Input
-- Basic Garbage Collector
+- Heap Garbage Collector
 - Linked List
 - Array
 - Vector
 - Asynchronous Task System
 - URI Parsing
+- USB (WIP)
 
 ### Supported Architectures
 - AMD64
@@ -71,8 +73,10 @@ Wayland Window System. Wayland support is currently not fully supported yet, use
 - [CMake](https://cmake.org/)
 - [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
-`cmake -A x64 -DCMAKE_BUILD_TYPE=Release --preset=default /path/to/source`
+`cmake -A x64 -DCMAKE_BUILD_TYPE=Release /path/to/source`
 
 ### Compiling
 `cmake --build /path/to/build --config Release`
@@ -87,12 +91,10 @@ This will require the terminal to be running in administrator mode.
 #include <ehs/EHS.h>
 #include <ehs/io/Console.h>
 
-ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer)
+int main()
 {
 	// Simple identifying meta-data for the logger.
-	*appName = "Simple Example App"; // The application's name
+	ehs::Initialize("Simple Example App", "Release", {1, 0, 0});
-	*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.
 	
@@ -101,13 +103,15 @@ ehs::Int_32 Main(ehs::Str_8* appName, ehs::Str_8* appVerId, ehs::Version* appVer
 	if (!response.IsNum())
     {
 		ehs::Console::Clear(); // Clear the console's buffer.
-		return Main(appName, appVerId, appVer); // Repeat process if given response is not a number.
+		return main(); // 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::Console::Write("Your age is " + ehs::Str_8::FromNum(age) + "."); // Write the console with the age converted back to string.
 
+    ehs::Uninitialize();
+
     return 0;
 }
 ```

include/ehs/Base64.h

@@ -5,20 +5,20 @@
 
 namespace ehs
 {
-	class Base64
+	class EHS_LIB_IO Base64
 	{
 	private:
 		static const char ascii[];
 		
 	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:
-		static char Find(const char c);
+		static char Find(char c);
 	
-		static bool IsBase64(const char c);
+		static bool IsBase64(char c);
 		
 	};
 }

include/ehs/BaseObj.h

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

include/ehs/Color3.h

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

include/ehs/Color4.h

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

include/ehs/Data.h

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

include/ehs/DataType.h

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

include/ehs/EHS.h

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

include/ehs/GC.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "EHS.h"
 #include "Vector.h"
 #include "BaseObj.h"
 #include "ehs/system/Mutex.h"
@@ -10,10 +9,10 @@ namespace ehs
 {
 	typedef bool (*GcLogic)(BaseObj*);
 
-	class GarbageCollector
+	class EHS_LIB_IO GC
 	{
 	private:
-		static Vector<GcLogic>* logic;
+		static Array<GcLogic> logic;
 		static Vector<BaseObj*> garbage;
 		static UInt_64 max;
 		static Thread thread;
@@ -27,13 +26,17 @@ namespace ehs
 
 		static void Stop();
 
+		static bool HasLogic(GcLogic logicCb);
+
+		static bool AddLogic(GcLogic logicCb);
+
 		/// Adds an object to the garbage pile to be deleted.
 		/// @param[in] obj The object to be deleted.
 		static void Add(BaseObj* obj);
 
 		/// Sets the maximum amount of garbage to delete per poll.
 		/// @param[in] newMax The new maximum.
-		static void SetMax(const UInt_64 newMax);
+		static void SetMax(UInt_64 newMax);
 
 		/// Gets the maximum amount of garbage to delete per poll.
 		/// @returns The maximum.
@@ -41,7 +44,7 @@ namespace ehs
 
 		/// Sets a new amount for memory pre-allocation to save on memory operations.
 		/// @param[in] newStride The stride to pre-allocate.
-		static void SetStride(const UInt_64 newStride);
+		static void SetStride(UInt_64 newStride);
 
 		/// The amount of data pre-allocated to save on memory operations.
 		/// @returns The stride.
@@ -59,5 +62,8 @@ namespace ehs
 		static void Dump();
 
 		static bool IsRunning();
+
+	private:
+		static bool ShouldDelete(BaseObj *obj);
 	};
 }

include/ehs/HRNG.h

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

include/ehs/Log.h

@@ -9,26 +9,53 @@
 
 namespace ehs
 {
+	class Log;
+
+	typedef void (*LogRaisedCb)(const Log &);
+	typedef void (*LogOutputCb)(const Array<Log> &);
+
+	enum class LogType : UInt_8
+	{
+		SUCCESS,
+		ERR,
+		WARN,
+		INFO
+	};
+
 	/// A helper class for holding error information and handling them.
 	/// @tparam T The character data type to use.
 	/// @tparam N The number data type to use.
-	class Log
+	class EHS_LIB_IO Log
 	{
 	private:
-        static void (*logCb)(const Log&);
+		static void DefaultRaisedCb(const Log &log);
+
+		static void DefaultOutputCb(const Array<Log> &logs);
+
+        static LogRaisedCb raisedCb;
+		static LogOutputCb outputCb;
+		static Array<Log> logs;
 		static Log lastLog;
+		static bool immediate;
+		LogType type;
 		Array<Str_8> tags;
 		UInt_64 code;
 		Str_8 msg;
 
 	public:
-        static void SetCallback(void (*newLogCb)(const Log&));
+        static void SetRaisedCallback(LogRaisedCb newCb);
 
-        static void Raise(const Log& log);
+		static void SetOutputCallback(LogOutputCb newCb);
+
+		static void OnExit();
+
+        static void Raise(Log log);
 
 		/// Retrieves the last log raised.
 		static Log GetLastLog();
 
+		static void EnableImmediateMode(bool enable);
+
         /// Default members initialization.
 		Log();
 
@@ -36,22 +63,26 @@ namespace ehs
         /// @param [in] tags The tags to associate this log with.
 		/// @param [in] code The unique code to use.
         /// @param [in] msg Detailed information about what happened.
-		Log(std::initializer_list<Str_8> tags, const UInt_64 code, const Str_8& msg);
+		Log(LogType type, const std::initializer_list<Str_8> &tags, UInt_64 code, Str_8 msg);
 
         /// Initializes members with the given information.
         /// @param [in] tags The tags to associate this log with.
 		/// @param [in] code The unique code to use.
         /// @param [in] msg Detailed information about what happened.
-        Log(Array<Str_8>& tags, const UInt_64 code, const Str_8& msg);
+        Log(LogType type, Array<Str_8> tags, UInt_64 code, Str_8 msg);
+
+		Log(Log &&log) noexcept;
 
         /// Copies all members from the given log.
         /// @param [in] log The log to copy from.
-		Log(const Log& log);
+		Log(const Log &log);
+
+		Log &operator=(Log &&log) noexcept;
 
         /// Copies all members from the given log.
         /// @param [in] log The log to copy from.
         /// @returns The log that has been assigned to.
-        Log& operator=(const Log& log);
+        Log &operator=(const Log &log);
 
 		/*
         /// Compares with another given log.
@@ -65,24 +96,26 @@ namespace ehs
 		bool operator!=(const Log log);
 		*/
 
-        /// Checks whether or not this log has the given tags.
+		LogType GetType() const;
-        /// @param [in] tags The tags to look for.
-        /// @returns True if all tags were found, otherwise false.
-		bool HasTags(const std::initializer_list<Str_8> tags) const;
 
         /// Checks whether or not this log has the given tags.
         /// @param [in] tags The tags to look for.
         /// @returns True if all tags were found, otherwise false.
-		bool HasTags(const Array<Str_8>& tags) const;
+		bool HasTags(const std::initializer_list<Str_8> &tags) const;
+
+        /// Checks whether or not this log has the given tags.
+        /// @param [in] tags The tags to look for.
+        /// @returns True if all tags were found, otherwise false.
+		bool HasTags(const Array<Str_8> &tags) const;
 
 		/// Checks whether or not this log has the given tag.
 		/// @param [in] tag The tag to look for.
 		/// @returns True if tag was found, otherwise false.
-		bool HasTag(const Str_8& tag) const;
+		bool HasTag(const Str_8 &tag) const;
 
 		/// Retrieves all the tags.
 		/// @returns The result.
-        Array<Str_8> GetTags() const;
+        const Array<Str_8> &GetTags() const;
 
 		UInt_64 GetCode() const;
 
@@ -101,16 +134,20 @@ namespace ehs
 
 #ifndef EHS_LOG_INT
 	#ifdef EHS_DEBUG
-		#define EHS_LOG_INT(type, code, msg) Log::Raise({{type, GetAcronym_8(), EHS_FILE, EHS_FUNC, Str_8::FromNum((UInt_32)EHS_LINE)}, code, msg})
+		#define EHS_LOG_INT(type, code, msg) ehs::Log::Raise({type, {ehs::GetAcronym_8(), EHS_FILE, EHS_FUNC, ehs::Str_8::FromNum((ehs::UInt_32)EHS_LINE)}, code, msg})
 	#else
-		#define EHS_LOG_INT(type, code, msg) Log::Raise({{type, GetAcronym_8(), EHS_FUNC}, code, msg})
+		#define EHS_LOG_INT(type, code, msg) ehs::Log::Raise({type, {ehs::GetAcronym_8(), EHS_FUNC}, code, msg})
 	#endif
 #endif
 
 #ifndef EHS_LOG
 	#ifdef EHS_DEBUG
-		#define EHS_LOG(type, code, msg) ehs::Log::Raise({{type, ehs::GetAppName_8(), EHS_FILE, EHS_FUNC, ehs::Str_8::FromNum((ehs::UInt_32)EHS_LINE)}, code, msg})
+		#define EHS_LOG(type, code, msg) ehs::Log::Raise({type, {ehs::GetAppName_8(), EHS_FILE, EHS_FUNC, ehs::Str_8::FromNum((ehs::UInt_32)EHS_LINE)}, code, msg})
 	#else
-		#define EHS_LOG(type, code, msg) ehs::Log::Raise({{type, ehs::GetAppName_8(), EHS_FUNC}, code, msg})
+		#define EHS_LOG(type, code, msg) ehs::Log::Raise({type, {ehs::GetAppName_8(), EHS_FUNC}, code, msg})
 	#endif
+#endif
+
+#ifndef EHS_LOG_SUCCESS
+#define EHS_LOG_SUCCESS() ehs::Log::Raise({})
 #endif

include/ehs/Mat2.h

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

include/ehs/Mat3.h

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

include/ehs/Mat4.h

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

include/ehs/Math.h

@@ -6,7 +6,7 @@
 
 namespace ehs
 {
-	class Math
+	class EHS_LIB_IO Math
 	{
     private:
         static float Sqrt_AVX(const float from);
@@ -26,22 +26,22 @@ namespace ehs
 		constexpr static double dblEpsilon = 1e-16;
 
 		/// Absolute tolerance comparison for single precision floats.
-		static bool AbsCmp(const float a, const float b);
+		static bool AbsCmp(float a, float b);
 
 		/// Absolute tolerance comparison for double precision floats.
-		static bool AbsCmp(const double a, const double b);
+		static bool AbsCmp(double a, double b);
 
 		/// Relative tolerance comparison for single precision floats.
-		static bool RelCmp(const float a, const float b);
+		static bool RelCmp(float a, float b);
 
 		/// Relative tolerance comparison for double precision floats.
-		static bool RelCmp(const double a, const double b);
+		static bool RelCmp(double a, double b);
 
 		/// Combined absolute and relative tolerance comparison for single precision floats.
-		static bool ComCmp(const float a, const float b);
+		static bool ComCmp(float a, float b);
 
 		/// Combined absolute and relative tolerance comparison for double precision floats.
-		static bool ComCmp(const double a, const double b);
+		static bool ComCmp(double a, double b);
 
 		template<typename T = float>
 		static T Max(const T a, const T b)
@@ -101,29 +101,113 @@ namespace ehs
 			return from * 57.295779513082320876798154814105;
 		}
 
+		template <typename T = float>
+		static T Exp(const T x)
+		{
+			T sum = 1;
+			T term = 1;
+
+			for (int n = 1; n <= 20; ++n)
+			{
+				term *= x / n;
+				sum += term;
+			}
+
+			return sum;
+		}
+
+		template <typename T = float>
+		static T Ln_Taylor(T x)
+		{
+			T result = 0;
+			T term = (x - 1) / (x + 1);
+			T term_squared = term * term;
+			T denominator = 1;
+			T current_term = term;
+
+			for (int n = 0; n < 100; ++n)
+			{
+				result += current_term / denominator;
+				current_term *= term_squared;
+				denominator += 2;
+			}
+
+			return 2 * result;
+		}
+
+		template <typename T = float>
+		static T Ln(T x)
+		{
+			if (x <= 0)
+				return -1;
+
+			if (x == 1)
+				return 0;
+
+			SSize exp = 0;
+			while (x > 2)
+			{
+				x /= 2;
+				exp++;
+			}
+
+			while (x < 0.5)
+			{
+				x *= 2;
+				exp--;
+			}
+
+			T result = Ln_Taylor<T>(x);
+			result += exp * Ln_Taylor<T>(2);
+
+			return result;
+		}
+
 		/// A method for use of exponents.
 		/// @tparam T The data type to return;
 		/// @tparam I The data type to use as the exponent.
 		/// @param [in] from The value to use the exponent on.
 		/// @param [in] of The exponent.
 		/// @returns The result.
-		template<typename T = float, typename I = UInt_64>
+		template<typename T = float, typename I = float>
-        static T Pow(const T from, const I of)
+        static T Pow(const T base, const I exponent)
 		{
-            if (of < 0)
+			if (base == 0)
-            {
+				return (exponent == 0) ? 1 : 0;
-                if (from == 0)
-                    return -0;
 
-                return 1 / (from * Pow<T>(from, (-of) - 1));
+			if (exponent == 0)
-            }
+				return 1;
 
-            if (of == 0)
+			SSize intExp = (SSize)exponent;
-                return 1;
+			bool isInteger = exponent == intExp;
-            else if (of == 1)
+			bool isNeg = base < 0;
-                return from;
 
-			return from * Pow<T>(from, of - 1);
+			if (isNeg && isInteger)
+			{
+				T result = Exp<T>(exponent * Ln<T>(-base));
+				if ((SSize)exponent % 2)
+					result = -result;
+
+				return result;
+			}
+
+			if (isNeg && !isInteger)
+			{
+				T magnitude = Exp<T>(exponent * Ln<T>(-base));
+				T angle = exponent * Pi<T>();
+				T realPart = magnitude * Cos<T>(angle);
+				T imagPart = magnitude * Sin<T>(angle);
+
+				return realPart;
+			}
+
+			return Exp<T>(exponent * Ln<T>(base));
+		}
+
+		template <typename T = float>
+		static T Log10(const T x)
+		{
+			return Ln<T>(x) / Ln<T>(10);
 		}
 
         static float Near(const float from);

include/ehs/PtrData.h

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

include/ehs/Rect.h

@@ -130,7 +130,7 @@ namespace ehs
 				case 3:
 					return h;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
 					return x;
 			}
 		}
@@ -148,7 +148,7 @@ namespace ehs
 				case 3:
 					return h;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Rectangle.");
 					return x;
 			}
 		}

include/ehs/SArray.h

@@ -87,7 +87,7 @@ namespace ehs
 		{
 			if (index >= size)
 			{
-				EHS_LOG_INT("Warning", 0, "Cannot insert value at " + Str_8::FromNum(index) + " because it is outside of array range of " + size + ".");
+				EHS_LOG_INT(LogType::WARN, 0, "Cannot insert value at " + Str_8::FromNum(index) + " because it is outside of array range of " + size + ".");
 				return;
 			}
 

include/ehs/Serializer.h

@@ -194,7 +194,7 @@ namespace ehs
 
                 Byte* r = new Byte[this->size + remainder];
 
-				Util::Copy(r, data, size);
+				Util::Copy(r, data, this->size);
 
                 delete[] data;
                 data = r;
@@ -1044,7 +1044,10 @@ namespace ehs
         void ReadArray(T* const value, O* const size)
         {
             if (!*size)
-                *size = (O)Read<N>();
+            {
+	            *size = (O)Read<N>();
+            	return;
+            }
 
             for (N i = 0; i < *size; ++i)
                 value[i] = Read<T>();
@@ -1072,14 +1075,14 @@ namespace ehs
             return result;
         }
 
-        template<typename T, typename O>
+        template<typename T = Char_8, typename O = UInt_64>
         Str<T, O> ReadStr(O size = 0)
         {
 			bool sizeKnown = size;
 
 			if (!sizeKnown)
-				while (&data[offset + sizeof(T) * size])
+				while (((T*)&data[offset])[size])
-					size++;
+					++size;
 
             Str<T, O> result(size);
 
@@ -1090,14 +1093,14 @@ namespace ehs
 				else
 					for (N i = 0; i < size; ++i)
 						for (N b = 0; b < sizeof(T); ++b)
-							((Byte*)&result[i])[sizeof(T) - i - 1] = data[offset + sizeof(T) * i + b];
+							((Byte*)&result[i])[b] = data[offset + sizeof(T) * i + b];
 			}
 			else
 			{
 				if (endianness == Endianness::LE)
 					for (N i = 0; i < size; ++i)
 						for (N b = 0; b < sizeof(T); ++b)
-							((Byte*)&result[i])[sizeof(T) - i - 1] = data[offset + sizeof(T) * i + b];
+							((Byte*)&result[i])[b] = data[offset + sizeof(T) * i + b];
 				else
 					Util::Copy(&result[0], &data[offset], result.Size(true));
 			}

include/ehs/Str.h

@@ -564,7 +564,7 @@ namespace ehs
                 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.
@@ -580,7 +580,7 @@ namespace ehs
                 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.
@@ -595,7 +595,7 @@ namespace ehs
 	            return;
             }
 
-            Util::Copy(data[dstOffset], src, srcSize * sizeof(T));
+            Util::Copy(&data[dstOffset], src, srcSize * sizeof(T));
         }
 
 		/// Inserts a string at a specified index.
@@ -747,7 +747,7 @@ namespace ehs
 
             T* result = new T[size + inSize + 1];
             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;
 
@@ -1027,7 +1027,7 @@ namespace ehs
 		/// @param [in] pattern The search pattern for optimization.
 		/// @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.
-		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)
 			{
@@ -1271,8 +1271,11 @@ namespace ehs
 		/// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
         float ToFloat() const
         {
+			Str<T, N> ide;
+			ide.Push(46);
+
             N decPoint = size;
-            Find(".", &decPoint);
+            Find(ide, &decPoint);
 
             float result = 0.0f;
             float fraction = 0.0f;
@@ -1297,8 +1300,11 @@ namespace ehs
 		/// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
         double ToDouble() const
         {
+			Str<T, N> ide;
+			ide.Push(46);
+
             N decPoint = size;
-            Find(".", &decPoint);
+            Find(ide, &decPoint);
 
             double result = 0.0f;
             double fraction = 0.0f;
@@ -1323,8 +1329,11 @@ namespace ehs
 		/// @note Use "IsNum" before this if the string object is not guaranteed to be a number.
         long double ToLDouble() const
         {
+			Str<T, N> ide;
+			ide.Push(46);
+
             N decPoint = size;
-            Find(".", &decPoint);
+            Find(ide, &decPoint);
 
             long double result = 0.0f;
             long double fraction = 0.0f;
@@ -1679,7 +1688,7 @@ namespace ehs
 
 			Str<T, N> result;
 			if (whole < 0)
-				result += "-";
+				result.Push(45);
 
 			result += Str<T, N>::FromNum(whole);
 
@@ -1691,7 +1700,7 @@ namespace ehs
 			if (!fraction)
 				return result;
 
-			result += ".";
+			result.Push(46);
 
 			Str<T, N> fResult(maxDecimals);
 			N i = 0;
@@ -1721,7 +1730,7 @@ namespace ehs
 
 			Str<T, N> result;
 			if (whole < 0)
-				result += "-";
+				result.Push(45);
 
 			result += Str<T, N>::FromNum(whole);
 
@@ -1733,7 +1742,7 @@ namespace ehs
 			if (!fraction)
 				return result;
 
-			result += ".";
+			result.Push(46);
 
 			Str<T, N> fResult(maxDecimals);
 			N i = 0;
@@ -1763,7 +1772,7 @@ namespace ehs
 
 			Str<T, N> result;
 			if (whole < 0)
-				result += "-";
+				result.Push(45);
 
 			result += Str<T, N>::FromNum(whole);
 
@@ -1775,7 +1784,7 @@ namespace ehs
 			if (!fraction)
 				return result;
 
-			result += ".";
+			result.Push(46);
 
 			Str<T, N> fResult(maxDecimals);
 			N i = 0;
@@ -1795,23 +1804,23 @@ namespace ehs
 			return result;
         }
 
-        /// A 32-bit FNV-1a hash algorithm.
+		/// A 32-bit FNV-1a hash algorithm.
-        /// @param [in] str The string to hash.
+		/// @param [in] str The string to hash.
-        /// @returns The resulting hash. Zero if string does not contain any characters.
+		/// @returns The resulting hash. Zero if string does not contain any characters.
-        static UInt_32 Hash_32(const Str<T, N>& str)
+		static UInt_32 Hash_32(const Str<T, N>& str)
-        {
+		{
 			if (!str.Size())
 				return 0;
 
-            const Byte* const bytes = str.ToBytes();
+		    const Byte* const bytes = str.ToBytes();
 
-            UInt_32 hash = 2166136261ul;
+		    UInt_32 hash = 2166136261ul;
 
-	        for (N i = 0; i < str.Size(true); ++i)
+		    for (N i = 0; i < str.Size(true); ++i)
-                hash = (hash ^ bytes[i]) * 16777619;
+		        hash = (hash ^ bytes[i]) * 16777619;
 
-	        return hash;
+		    return hash;
-        }
+		}
 
 		/// A 32-bit FNV-1a hash algorithm.
 		/// @returns The resulting hash. Zero if string does not contain any characters.
@@ -1830,23 +1839,23 @@ namespace ehs
             return hash;
         }
 
-        /// A 64-bit FNV-1a hash algorithm.
+		/// A 64-bit FNV-1a hash algorithm.
-        /// @param [in] str The string to hash.
+		/// @param [in] str The string to hash.
 		/// @returns The resulting hash. Zero if string does not contain any characters.
-        static UInt_64 Hash_64(const Str<T, N>& str)
+		static UInt_64 Hash_64(const Str<T, N>& str)
-        {
+		{
 			if (!str.Size())
 				return 0;
 
-            const Byte* const bytes = str.ToBytes();
+		    const Byte* const bytes = str.ToBytes();
 
-            UInt_64 hash = 14695981039346656037ull;
+		    UInt_64 hash = 14695981039346656037ull;
 
-            for (N i = 0; i < str.Size(true); ++i)
+		    for (N i = 0; i < str.Size(true); ++i)
-                hash = (hash ^ bytes[i]) * 1099511628211;
+		        hash = (hash ^ bytes[i]) * 1099511628211;
 
-            return hash;
+		    return hash;
-        }
+		}
 
 		/// A 64-bit FNV-1a hash algorithm.
 		/// @returns The resulting hash. Zero if string does not contain any characters.
@@ -1870,6 +1879,9 @@ namespace ehs
 		/// @returns The character count.
         static N Len(const T* const str)
         {
+			if (!str)
+				return 0;
+
             N count = 0;
             while (str[count])
                 ++count;
@@ -1888,14 +1900,14 @@ namespace ehs
             if (aSize != bSize)
                 return false;
 
-            for (UInt_64 i = 0; i < aSize; ++i)
+        	return Util::Compare(a, b, aSize);
-                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_16, UInt_64> Str_16;
 	typedef Str<Char_8, UInt_64> Str_8;

include/ehs/Task.h

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

include/ehs/Type.h

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

include/ehs/Types.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "ehs/system/OS.h"
+#include "ehs/system/Architecture.h"
 
 #define EHS_MAX_PATH 0x104
 #define EHS_UINT_8_MAX 0xFF
@@ -25,6 +26,12 @@
 #define EHS_LDOUBLE_MAX 1.79769e+308
 #define EHS_LDOUBLE_MIN 2.22507e-308
 
+#if defined(EHS_64_BIT)
+	#define EHS_SIZE_MAX 0xFFFFFFFFFFFFFFFF
+#elif defined(EHS_32_BIT)
+	#define EHS_SIZE_MAX 0xFFFFFFFF
+#endif
+
 #define EHS_INFINITE EHS_UINT_32_MAX
 
 namespace ehs
@@ -52,4 +59,12 @@ namespace ehs
 		typedef signed long SInt_64;
 		typedef long Int_64;
 	#endif
+
+	#if defined(EHS_64_BIT)
+		typedef UInt_64 Size;
+		typedef SInt_64 SSize;
+	#elif defined(EHS_32_BIT)
+		typedef UInt_32 Size;
+		typedef SInt_32 SSize;
+	#endif
 }

include/ehs/URI.h

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

include/ehs/UTF.h

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

include/ehs/Util.h

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

include/ehs/Vec2.h

@@ -229,7 +229,7 @@ namespace ehs
 				case 1:
 					return y;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}
@@ -243,7 +243,7 @@ namespace ehs
 				case 1:
 					return y;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}

include/ehs/Vec3.h

@@ -266,7 +266,7 @@ namespace ehs
 				case 2:
 					return z;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}
@@ -282,7 +282,7 @@ namespace ehs
 				case 2:
 					return z;
 				default:
-					EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
+					EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 3.");
 					return x;
 			}
 		}

include/ehs/Vec4.h

@@ -279,7 +279,7 @@ namespace ehs
 			case 3:
 				return w;
             default:
-                EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
+                EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
                 return x;
 			}
 		}
@@ -297,7 +297,7 @@ namespace ehs
 			case 3:
 				return w;
             default:
-                EHS_LOG_INT("Error", 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
+                EHS_LOG_INT(LogType::ERR, 0, "Index of, \"" + Str_8::FromNum(index) + "\" is out of range for a Vector 4.");
                 return x;
 			}
 		}

include/ehs/Version.h

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

include/ehs/database/DVar.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include "ehs/EHS.h"
-#include "ehs/BaseObj.h"
-#include "ehs/Str.h"
-
-namespace ehs
-{
-	enum class DType : UInt_8
-	{
-	
-	};
-
-	class DVar : public BaseObj
-	{
-	private:
-		Str_8 id;
-		UInt_64 hashId;
-	};
-}

include/ehs/db/Database.h

@@ -0,0 +1,56 @@
+#pragma once
+
+#include "ehs/Array.h"
+#include "DbTable.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO Database
+	{
+	private:
+		UInt_64 hashId;
+		Str_8 id;
+		Version version;
+		Array<DbTable> tables;
+		Str_8 dir;
+
+	public:
+		Database();
+
+		Database(Str_8 id, const Version& version);
+
+		Database(Str_8 filePath);
+
+		Database(Database&& db) noexcept;
+
+		Database(const Database& db);
+
+		Database& operator=(Database&& db) noexcept;
+
+		Database& operator=(const Database& db);
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		void SetVersion(const Version& newVersion);
+
+		Version GetVersion() const;
+
+		bool HasTable(UInt_64 hashId) const;
+
+		bool HasTable(const Str_8& id) const;
+
+		DbTable* CreateTable(Str_8 id);
+
+		DbTable* GetTable(UInt_64 hashId) const;
+
+		DbTable* GetTable(const Str_8& id) const;
+
+		Str_8 GetDirectory() const;
+
+		void Save(Str_8 directory);
+	};
+}

include/ehs/db/DbObject.h

@@ -0,0 +1,52 @@
+#pragma once
+
+#include "ehs/Array.h"
+#include "DbVar.h"
+
+namespace ehs
+{
+	class DbTable;
+
+	class EHS_LIB_IO DbObject
+	{
+	private:
+		friend class DbTable;
+		friend class DbVar;
+
+		UInt_64 id;
+		DbTable* parent;
+		Array<DbVar> vars;
+
+	public:
+		DbObject();
+
+		DbObject(UInt_64 id);
+
+		DbObject(DbObject&& obj) noexcept;
+
+		DbObject(const DbObject& obj);
+
+		DbObject& operator=(DbObject&& obj) noexcept;
+
+		DbObject& operator=(const DbObject& obj);
+
+		UInt_64 GetId() const;
+
+		bool HasVariable(UInt_64 hashId) const;
+
+		DbVar* GetVariable(UInt_64 hashId) const;
+
+		DbVar* GetVariable(const Str_8& id) const;
+
+		void Save() const;
+
+		void Load();
+
+		bool IsLoaded() const;
+
+		void Free();
+
+	private:
+		void CreateVariable(DbVarTmpl* master);
+	};
+}

include/ehs/db/DbTable.h

@@ -0,0 +1,66 @@
+#pragma once
+
+#include "ehs/Version.h"
+#include "ehs/Array.h"
+#include "DbVarTmpl.h"
+#include "DbObject.h"
+#include "ehs/Serializer.h"
+
+namespace ehs
+{
+	class Database;
+
+	class EHS_LIB_IO DbTable
+	{
+	private:
+		friend class Database;
+		friend class DbVar;
+		friend class DbObject;
+
+		Database *parent;
+		UInt_64 hashId;
+		Str_8 id;
+		Array<DbVarTmpl> varTmpls;
+		Array<DbObject> objects;
+
+	public:
+		DbTable();
+
+		DbTable(Str_8 id);
+
+		DbTable(DbTable&& table) noexcept;
+
+		DbTable(const DbTable& table);
+
+		DbTable& operator=(DbTable&& table) noexcept;
+
+		DbTable& operator=(const DbTable& table);
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		bool HasVariable(UInt_64 hashId) const;
+
+		bool HasVariable(const Str_8& id) const;
+
+		bool CreateVariable(DbVarTmpl var);
+
+		DbObject *CreateObject();
+
+		DbObject *GetObject(UInt_64 variableHashId, const Str_8 &value) const;
+
+		DbObject *GetObject(const Str_8 &variable, const Str_8 &value) const;
+
+		DbObject *GetObject(UInt_64 id) const;
+
+	private:
+		DbVarTmpl *GetVariableTemplate(UInt_64 hashId) const;
+
+		void Serialize(const Str_8 &dir, Serializer<UInt_64>& data) const;
+
+		void Deserialize(const Str_8 &dir, Serializer<UInt_64>& data);
+	};
+}

include/ehs/db/DbVar.h

@@ -0,0 +1,105 @@
+#pragma once
+
+#include "ehs/Types.h"
+#include "ehs/Serializer.h"
+
+namespace ehs
+{
+	class DbVarTmpl;
+	class DbObject;
+
+	class EHS_LIB_IO DbVar
+	{
+	private:
+		friend class DbObject;
+
+		UInt_64 hashId;
+		DbObject *parent;
+		Byte *value;
+		UInt_64 size;
+
+	public:
+		~DbVar();
+
+		DbVar();
+
+		DbVar(UInt_64 hashId, const DbVarTmpl *master);
+
+		DbVar(DbVar &&var) noexcept;
+
+		DbVar(const DbVar &var);
+
+		DbVar &operator=(DbVar &&var) noexcept;
+
+		DbVar &operator=(const DbVar &var);
+
+		explicit operator Byte *() const;
+
+		UInt_64 GetHashId() const;
+
+		template<typename T>
+		void SetValueArray(const T* const newValue, const UInt_64 newSize)
+		{
+			size = sizeof(T) * newSize;
+
+			value = new Byte[size];
+
+			Util::Copy(value, newValue, size);
+		}
+
+		template<typename T = Char_8>
+		void SetValueStr(const T * const newValue)
+		{
+			size = sizeof(T) * Str<Char_8, UInt_64>::Len(newValue);
+
+			value = new Byte[size];
+
+			Util::Copy(value, newValue, size);
+		}
+
+		template<typename T = Char_8, typename I = UInt_64>
+		void SetValueStr(const Str<T, I>& newValue)
+		{
+			size = newValue.Size(true);
+
+			value = new Byte[size];
+
+			Util::Copy(value, &newValue[0], size);
+		}
+
+		template<typename T>
+		void SetValue(const Byte* newValue)
+		{
+			size = sizeof(T);
+
+			value = new Byte[size];
+
+			Util::Copy(value, newValue, size);
+		}
+
+		template<typename T>
+		T* GetValueArray() const
+		{
+			return (T*)value;
+		}
+
+		template<typename T = Char_8, typename I = UInt_64>
+		Str<T, I> GetValueStr() const
+		{
+			return {(T*)value, size / sizeof(T)};
+		}
+
+		template<typename T>
+		T GetValue() const
+		{
+			return *(T*)value;
+		}
+
+		UInt_64 GetSize() const;
+
+	private:
+		void Serialize(Serializer<UInt_64> &data) const;
+
+		void Deserialize(Serializer<UInt_64> &data);
+	};
+}

include/ehs/db/DbVarTmpl.h

@@ -0,0 +1,77 @@
+#pragma once
+
+#include "ehs/EHS.h"
+#include "ehs/Serializer.h"
+#include "ehs/Str.h"
+
+namespace ehs
+{
+	class DbVar;
+
+	class EHS_LIB_IO DbVarTmpl
+	{
+	private:
+		friend class DbTable;
+
+		UInt_64 hashId;
+		Str_8 id;
+		Byte* def;
+		UInt_64 size;
+
+	public:
+		~DbVarTmpl();
+
+		DbVarTmpl();
+
+		template<typename T>
+		DbVarTmpl(Str_8 id, const T* const def, UInt_64 size)
+			: hashId(id.Hash_64()), id((Str_8&&)id), def(new Byte[sizeof(T) * size]), size(sizeof(T) * size)
+		{
+			Util::Copy(this->def, def, this->size);
+		}
+
+		template<typename T>
+		DbVarTmpl(Str_8 id, const T* const def)
+			: hashId(id.Hash_64()), id((Str_8&&)id), def(new Byte[sizeof(T)]), size(sizeof(T))
+		{
+			Util::Copy(this->def, def, this->size);
+		}
+
+		DbVarTmpl(Str_8 id);
+
+		DbVarTmpl(DbVarTmpl&& varTmpl) noexcept;
+
+		DbVarTmpl(const DbVarTmpl& varTmpl);
+
+		DbVarTmpl& operator=(DbVarTmpl&& varTmpl) noexcept;
+
+		DbVarTmpl& operator=(const DbVarTmpl& varTmpl);
+
+		operator Byte *() const;
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		template<typename T>
+		T* GetDefaultArray() const
+		{
+			return (T*)def;
+		}
+
+		template<typename T>
+		T GetDefault() const
+		{
+			return *(T*)def;
+		}
+
+		UInt_64 GetSize() const;
+
+	private:
+		void Serialize(Serializer<UInt_64> &data) const;
+
+		void Deserialize(Serializer<UInt_64> &data);
+	};
+}

include/ehs/io/BaseDirectory.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "ehs/Array.h"
+#include "ehs/Str.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO BaseDirectory
+	{
+	public:
+		static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+		static void CreateRecursive(Str_8 dir);
+
+		static void Create(const Str_8 &dir);
+	};
+}

include/ehs/io/BaseFile.h

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

include/ehs/io/BaseFileMonitor.h

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

include/ehs/io/BaseWindow.h

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

include/ehs/io/COM.h

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

include/ehs/io/Console.h

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

include/ehs/io/Directory.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "ehs/system/OS.h"
+
+#if defined(EHS_OS_WINDOWS)
+    #include "Directory_W32.h"
+#elif defined(EHS_OS_LINUX)
+    #include "Directory_LNX.h"
+#endif

include/ehs/io/Directory_LNX.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "BaseDirectory.h"
+
+namespace ehs
+{
+	class EHS_LIB_IO Directory : public BaseDirectory
+	{
+	public:
+		static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+		static void CreateRecursive(Str_8 dir);
+
+		static void Create(const Str_8 &dir);
+	};
+}

include/ehs/io/Directory_W32.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "BaseDirectory.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO Directory : public BaseDirectory
+    {
+    public:
+        static Array<Str_8> GetAllFiles(const Str_8 &dir);
+
+        static void CreateRecursive(Str_8 dir);
+
+        static void Create(const Str_8 &dir);
+    };
+}

include/ehs/io/File.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ehs/EHS.h"
+#include "ehs/system/OS.h"
 
 #if defined(EHS_OS_WINDOWS)
 #include "File_W32.h"

include/ehs/io/FileMonitor_UNX.h

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

include/ehs/io/FileMonitor_W32.h

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

include/ehs/io/File_UNX.h

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

include/ehs/io/File_W32.h

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

include/ehs/io/FontAtlas.h

@@ -6,11 +6,11 @@
 #include "Glyph.h"
 #include "ehs/Anchor.h"
 #include "ehs/io/img/Img.h"
-#include "ehs/io/model/Mesh.h"
+#include "ehs/io/mdl/Mesh.h"
 
 namespace ehs
 {
-	class FontAtlas : public BaseObj
+	class EHS_LIB_IO FontAtlas : public BaseObj
 	{
 	private:
 		UInt_64 hashId;

include/ehs/io/Glyph.h

@@ -7,7 +7,7 @@
 
 namespace ehs
 {
-	class Glyph
+	class EHS_LIB_IO Glyph
 	{
 	private:
 		Char_32 code;
@@ -20,7 +20,7 @@ namespace ehs
 	public:
 		Glyph();
 
-		Glyph(Serializer<>& ser);
+		Glyph(Serializer<UInt_64>& ser);
 
 		Glyph(const Char_32 code);
 

include/ehs/io/RIFF.h

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

include/ehs/io/RIFF_Chunk.h

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

include/ehs/io/Resource.h

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

include/ehs/io/UsbBase.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include "ehs/Types.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO UsbBase
+    {
+    private:
+        UInt_32 bus;
+        UInt_32 address;
+
+    public:
+        virtual ~UsbBase() = default;
+
+        UsbBase();
+
+        UsbBase(UInt_32 bus, UInt_32 address);
+
+        UsbBase(UsbBase&& usb) noexcept;
+
+        UsbBase(const UsbBase& usb);
+
+        UsbBase& operator=(UsbBase&& usb) noexcept;
+
+        UsbBase& operator=(const UsbBase& usb);
+
+        virtual void Initialize() = 0;
+
+        virtual void Release() = 0;
+
+        virtual bool IsInitialized() const = 0;
+
+        virtual Size Send(const Byte* data, Size size) = 0;
+
+        void BulkSend(const Byte* data, Size size);
+
+        virtual Size Receive(Byte* data, Size size) = 0;
+
+        void BulkReceive(Byte** data, Size* size);
+
+        UInt_32 GetBus() const;
+
+        UInt_32 GetAddress() const;
+
+        bool IsValid() const;
+    };
+}

include/ehs/io/Usb_LNX.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "UsbBase.h"
+#include "File.h"
+
+namespace ehs
+{
+    class EHS_LIB_IO Usb final : public UsbBase
+    {
+    private:
+        int hdl;
+
+    public:
+        ~Usb() override;
+
+        Usb();
+
+        Usb(UInt_32 bus, UInt_32 address);
+
+        Usb(Usb&& usb) noexcept;
+
+        Usb(const Usb& usb);
+
+        Usb& operator=(Usb&& usb) noexcept;
+
+        Usb& operator=(const Usb& usb);
+
+        void Initialize() override;
+
+        void Release() override;
+
+        bool IsInitialized() const override;
+    };
+}

include/ehs/io/Window_W32.h

@@ -14,7 +14,7 @@
 
 namespace ehs
 {
-    class Window : public BaseWindow
+    class EHS_LIB_IO Window : public BaseWindow
     {
     private:
         UInt_32 owner;
@@ -71,13 +71,6 @@ namespace ehs
 
 		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.
         /// @returns The window's native handle.
         HWND GetHdl() const;

include/ehs/io/Window_Way.h

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

include/ehs/io/Window_XCB.h

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

include/ehs/io/audio/Audio.h

@@ -11,7 +11,7 @@
 
 namespace ehs
 {
-    class Audio : public Resource
+    class EHS_LIB_IO Audio : public Resource
     {
 	private:
 		static Array<AudioCodec> codecs;
@@ -39,7 +39,9 @@ namespace ehs
 
 		Audio();
 
-		Audio(Str_8 id);
+		Audio(const Str_8& filePath);
+
+		Audio(const Str_8& filePath, DataType type);
 
 		Audio(Str_8 id, UInt_64 sampleRate, DataType dataType, UInt_8 channels, UInt_64 frames, const Byte* data);
 
@@ -79,10 +81,14 @@ namespace ehs
 
 		UInt_64 GetSampleCount() const;
 
+		UInt_8 GetFrameSize() const;
+
 		UInt_64 GetSize() const;
 
 		float GetLength() const;
 
+		Byte* GetFrame(UInt_64 frameIndex) const;
+
 		Array<Byte> FrameAsMono(UInt_64 frameIndex) const;
 
 		Array<Byte> FrameAsStereo(UInt_64 frameIndex) const;
@@ -123,17 +129,7 @@ namespace ehs
 
 		Audio GetAsChannels(UInt_8 newChannels) const;
 
-		bool ToFile(const Str_8& filePath) const;
+		bool Export(const Str_8& filePath) const;
-
-		static Audio FromFile(const Str_8& filePath);
-
-		static Audio* FromFile_Heap(const Str_8& filePath);
-
-		static Audio FromFile(const Str_8& filePath, DataType required);
-
-		static Audio* FromFile_Heap(const Str_8& filePath, DataType required);
-
-		static Audio FromData(Str_8 id, const Str_8& ext, Serializer<UInt_64>& data);
 
 	private:
 		void ToMono(UInt_64 newFrameCount, Byte* newData, UInt_64 frameOffset) const;
@@ -201,4 +197,10 @@ namespace ehs
 
 		void SInt_32_to_SInt_64(Byte* newData, Byte* newPeak) const;
     };
+
+	bool EncodeEHA(const ehs::AudioCodec* codec, ehs::Serializer<ehs::UInt_64>& out, const ehs::Audio* in);
+
+	bool DecodeEHA(const ehs::AudioCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Audio* out);
+
+	bool DecodeWAV(const ehs::AudioCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Audio* out);
 }

include/ehs/io/audio/AudioCodec.h

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

include/ehs/io/audio/AudioDevice.h

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

include/ehs/io/audio/AudioDevice_ALSA.h

@@ -1,46 +0,0 @@
-#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);
-	};
-}

include/ehs/io/audio/AudioDevice_PW.h

@@ -0,0 +1,67 @@
+#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;
+	};
+}

include/ehs/io/audio/AudioDevice_W32.h

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

include/ehs/io/audio/BaseAudioDevice.h

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

include/ehs/io/hid/Button.h

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

include/ehs/io/hid/ButtonState.h

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

include/ehs/io/hid/HID.h

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

include/ehs/io/hid/Input.h

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

include/ehs/io/hid/InputHandler.h

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

include/ehs/io/hid/Keyboard.h

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

include/ehs/io/hid/Mouse.h

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

include/ehs/io/img/Img.h

@@ -13,7 +13,7 @@ namespace ehs
 		NEAREST_NEIGHBOR
 	};
 
-	class Img : public BaseObj
+	class EHS_LIB_IO Img : public BaseObj
 	{
 	private:
 		static Array<ImgCodec> codecs;
@@ -42,7 +42,7 @@ namespace ehs
 
 		Img();
 
-		Img(Str_8 id);
+		Img(const Str_8& filePath);
 
 		Img(Str_8 id, UInt_8 byteDepth, UInt_8 channels, const Vec2_u64& resolution, const Byte* data);
 
@@ -124,13 +124,7 @@ namespace ehs
 
 		bool IsValid() const;
 
-		bool ToFile(const Str_8& filePath) const;
+		bool Export(const Str_8& filePath) const;
-
-		static Img FromFile(const Str_8& filePath);
-
-		static Img* FromFile_Heap(const Str_8& filePath);
-
-		static Img FromData(Str_8 id, const Str_8& ext, Serializer<UInt_64>& data);
 
 	private:
 		Img GetNearestNeighbor(const Vec2_u64& newResolution) const;
@@ -185,4 +179,10 @@ namespace ehs
 
 		void BD16_to_BD8(UInt_64 newSize, Byte* buffer) const;
 	};
+
+	bool EncodeQOI(const ehs::ImgCodec* codec, ehs::Serializer<ehs::UInt_64>& out, const ehs::Img* in);
+
+	bool DecodeQOI(const ehs::ImgCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Img* out);
+
+	bool DecodePNG(const ehs::ImgCodec* codec, ehs::Serializer<ehs::UInt_64>& in, ehs::Img* out);
 }

include/ehs/io/img/ImgCodec.h

@@ -7,23 +7,25 @@
 namespace ehs
 {
 	class Img;
+	class ImgCodec;
 
-	class ImgCodec
+	typedef bool (*EncodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*);
+	typedef bool (*DecodeImgCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*);
+
+	class EHS_LIB_IO ImgCodec
 	{
 	private:
 		Str_8 id;
 		UInt_64 hashExt;
 		Str_8 ext;
 		Endianness endianness;
-		bool (*encodeCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*);
+		EncodeImgCb encoder;
-		bool (*decodeCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*);
+		DecodeImgCb decoder;
 
 	public:
 		ImgCodec();
 
-		ImgCodec(Str_8 id, Str_8 ext, const Endianness end,
+		ImgCodec(Str_8 id, Str_8 ext, Endianness end, EncodeImgCb encoder, DecodeImgCb decoder);
-				 bool (*encodeCb)(const ImgCodec* const, Serializer<UInt_64>&, const Img*),
-				 bool (*decodeCb)(const ImgCodec* const, Serializer<UInt_64>&, Img*));
 
 		ImgCodec(ImgCodec&& codec) noexcept;
 

include/ehs/io/img/PNG.h

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

include/ehs/io/img/PNG_Chunk.h

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

include/ehs/io/mdl/AnimBone.h

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

include/ehs/io/mdl/Animation.h

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

include/ehs/io/mdl/Bone.h

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

include/ehs/io/mdl/KeyFrame.h

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

include/ehs/io/mdl/Mdl.h

@@ -0,0 +1,93 @@
+#pragma once
+
+#include "ehs/EHS.h"
+#include "ehs/Array.h"
+#include "ehs/io/File.h"
+#include "MdlCodec.h"
+#include "Mesh.h"
+#include "Bone.h"
+#include "Animation.h"
+
+namespace ehs
+{
+	enum class ModelEncoding : UInt_8
+	{
+		EHM
+	};
+
+	class EHS_LIB_IO Mdl : public BaseObj
+	{
+	private:
+		static Array<MdlCodec> codecs;
+
+	protected:
+		UInt_64 hashId;
+		Str_8 id;
+		Array<Mesh> meshes;
+		Bone skeleton;
+		Array<Animation> animations;
+
+	public:
+		static bool HasCodec(UInt_64 hashExt);
+
+		static bool HasCodec(const Str_8& ext);
+
+		static bool AddCodec(MdlCodec codec);
+
+		static const MdlCodec* GetCodec(UInt_64 hashExt);
+
+		static const MdlCodec* GetCodec(const Str_8& ext);
+
+		Mdl();
+
+		Mdl(const Str_8& filePath);
+
+		Mdl(Str_8 id, Array<Mesh> meshes, Bone skeleton, Array<Animation> animations);
+
+		Mdl(Str_8 id, Array<Mesh> meshes, Bone skeleton);
+
+		Mdl(Str_8 id, Array<Mesh> meshes);
+
+		Mdl(Mdl&& model) noexcept;
+
+		Mdl(const Mdl& model) = default;
+
+		Mdl& operator=(Mdl&& model) noexcept;
+
+		Mdl& operator=(const Mdl& model) = default;
+
+		void Release();
+
+		UInt_64 GetHashId() const;
+
+		void SetId(Str_8 newId);
+
+		Str_8 GetId() const;
+
+		const Array<Mesh>& GetMeshes() const;
+
+		Array<Mesh>& GetMeshes();
+
+		Mesh* GetMesh(UInt_64 inHashId);
+
+		Mesh* GetMesh(const Str_8& inId);
+
+		const Bone& GetSkeleton() const;
+
+		Bone& GetSkeleton();
+
+		Animation* GetAnimation(UInt_64 inHashId);
+
+		const Array<Animation>& GetAnimations() const;
+
+		Array<Animation>& GetAnimations();
+
+		void Calculate();
+
+		bool Export(const Str_8& filePath) const;
+	};
+
+	bool EncodeEHM(const MdlCodec* codec, Serializer<UInt_64>& data, const Mdl* mdl);
+
+	bool DecodeEHM(const MdlCodec* codec, Serializer<UInt_64>& data, Mdl* mdl);
+}

include/ehs/io/mdl/MdlCodec.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include "ehs/Str.h"
+#include "ehs/Serializer.h"
+#include "ehs/system/CPU.h"
+
+namespace ehs
+{
+	class Mdl;
+	class MdlCodec;
+
+	typedef bool (*EnocdeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, const Mdl*);
+	typedef bool (*DecodeMdlCb)(const MdlCodec*, Serializer<UInt_64>&, Mdl*);
+
+	class EHS_LIB_IO MdlCodec
+	{
+	private:
+		Str_8 id;
+		UInt_64 hashExt;
+		Str_8 ext;
+		Endianness endianness;
+		EnocdeMdlCb encoder;
+		DecodeMdlCb decoder;
+
+	public:
+		MdlCodec();
+
+		MdlCodec(Str_8 id, Str_8 ext, Endianness end, EnocdeMdlCb encoder, DecodeMdlCb decoder);
+
+		MdlCodec(MdlCodec&& codec) noexcept;
+
+		MdlCodec(const MdlCodec& codec);
+
+		MdlCodec& operator=(MdlCodec&& codec) noexcept;
+
+		MdlCodec& operator=(const MdlCodec& codec);
+
+		Str_8 GetId() const;
+
+		UInt_64 GetHashExt() const;
+
+		Str_8 GetExt() const;
+
+		Endianness GetEndianness() const;
+
+		bool Encode(Serializer<UInt_64>& out, const Mdl* in) const;
+
+		bool Decode(Serializer<UInt_64>& in, Mdl* out) const;
+	};
+}

include/ehs/io/mdl/Mesh.h

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

include/ehs/io/mdl/PropertyChange.h

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

include/ehs/io/model/Model.h

@@ -1,80 +0,0 @@
-#pragma once
-
-#include "ehs/EHS.h"
-#include "ehs/Array.h"
-#include "ehs/io/File.h"
-#include "Mesh.h"
-#include "Bone.h"
-#include "Animation.h"
-
-namespace ehs
-{
-	enum class ModelEncoding : UInt_8
-	{
-		EHM
-	};
-
-	class Model : public BaseObj
-	{
-	protected:
-		UInt_64 hashId;
-		Str_8 id;
-		Array<Mesh> meshes;
-		Bone skeleton;
-		Array<Animation> animations;
-
-	public:
-		Model();
-
-		Model(const Str_8& filePath);
-
-		Model(Str_8 id, Array<Mesh> meshes, Bone skeleton, Array<Animation> animations);
-
-		Model(Str_8 id, Array<Mesh> meshes, Bone skeleton);
-
-		Model(Str_8 id, Array<Mesh> meshes);
-
-		Model(Model&& model) noexcept;
-
-		Model(const Model& model) = default;
-
-		Model& operator=(Model&& model) noexcept;
-
-		Model& operator=(const Model& model) = default;
-
-		void Release();
-
-		UInt_64 GetHashId() const;
-
-		void SetId(Str_8 newId);
-
-		Str_8 GetId() const;
-
-		const Array<Mesh>& GetMeshes() const;
-
-		Array<Mesh>& GetMeshes();
-
-		Mesh* GetMesh(UInt_64 inHashId);
-
-		Mesh* GetMesh(const Str_8& inId);
-
-		const Bone& GetSkeleton() const;
-
-		Bone& GetSkeleton();
-
-		Animation* GetAnimation(UInt_64 inHashId);
-
-		const Array<Animation>& GetAnimations() const;
-
-		Array<Animation>& GetAnimations();
-
-		void Calculate();
-
-		void Export(const Str_8& filePath, ModelEncoding encoding);
-
-	private:
-		void ToEHM(File& file);
-
-		void FromEHM(File& file);
-	};
-}

include/ehs/io/socket/BaseDNS.h

@@ -0,0 +1,18 @@
+#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);
+	};
+}

include/ehs/io/socket/BaseTCP.h

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

include/ehs/io/socket/BaseUDP.h

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

include/ehs/io/socket/DNS.h

@@ -1,17 +1,9 @@
 #pragma once
 
-#include "ehs/EHS.h"
+#include "ehs/system/OS.h"
-#include "ehs/Str.h"
-#include "Socket.h"
 
-namespace ehs
+#if defined(EHS_OS_WINDOWS)
-{
+	#include "DNS_W32.h"
-    class DNS
+#elif defined(EHS_OS_LINUX)
-    {
+	#include "DNS_LNX.h"
-    public:
+#endif
-		/// 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);
-    };
-}

include/ehs/io/socket/DNS_LNX.h

@@ -0,0 +1,17 @@
+#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);
+    };
+}

include/ehs/io/socket/DNS_W32.h

@@ -0,0 +1,14 @@
+#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);
+	};
+}

include/ehs/io/socket/EHC.h

@@ -0,0 +1,228 @@
+#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();
+    };
+}

include/ehs/io/socket/Request.h

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

include/ehs/io/socket/Response.h

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