version 0.11.2

PandaTeemo · Aug 4, 2019 · 2af82cb · 2af82cb
1 parent 794a368
commit 2af82cb
Show file tree

Hide file tree

Showing 67 changed files with 2,711 additions and 1,065 deletions.
diff --git a/build/Core/Core.vcxproj b/build/Core/Core.vcxproj
@@ -29,6 +29,7 @@
     <ClInclude Include="..\..\source\Core\Events\WindowEvent.hpp" />
     <ClInclude Include="..\..\source\Core\Math\Math.hpp" />
     <ClInclude Include="..\..\source\Core\Math\Matrix4.hpp" />
+    <ClInclude Include="..\..\source\Core\Math\Number.hpp" />
     <ClInclude Include="..\..\source\Core\Math\Quaternion.hpp" />
     <ClInclude Include="..\..\source\Core\Math\Transform3.hpp" />
     <ClInclude Include="..\..\source\Core\Math\Vector2.hpp" />
@@ -56,6 +57,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\source\Core\Math\Math.cpp" />
     <ClCompile Include="..\..\source\Core\Math\Matrix4.cpp" />
+    <ClCompile Include="..\..\source\Core\Math\Number.cpp" />
     <ClCompile Include="..\..\source\Core\Math\Quaternion.cpp" />
     <ClCompile Include="..\..\source\Core\Math\Transform3.cpp" />
     <ClCompile Include="..\..\source\Core\Math\Vector2.cpp" />

diff --git a/build/Core/Core.vcxproj.filters b/build/Core/Core.vcxproj.filters
@@ -120,6 +120,9 @@
     <ClInclude Include="..\..\source\Core\Events\WindowEvent.hpp">
       <Filter>Events</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\Core\Math\Number.hpp">
+      <Filter>Math</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\Core\Support\Settings.cpp">
@@ -174,5 +177,8 @@
     <ClCompile Include="..\..\source\Core\UI\Window.cpp">
       <Filter>UI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\Core\Math\Number.cpp">
+      <Filter>Math</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/build/Installer32/Product.wxs b/build/Installer32/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.11.1.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
+  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.11.2.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
 
     <Package Id="*" InstallerVersion="200" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" />
     <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)\..\etc\Eula.rtf" />

diff --git a/build/Installer64/Product.wxs b/build/Installer64/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.11.1.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
+  <Product Id="*" Name="YoloMouse" Language="1033" Version="0.11.2.0" Manufacturer="HaPpY" UpgradeCode="69ce184e-a676-4169-a124-e1ee073bd0e6">
 
     <Package Id="*" InstallerVersion="200" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" Platform="x64"/>
     <WixVariable Id="WixUILicenseRtf" Value="$(var.SolutionDir)\..\etc\Eula.rtf" />

diff --git a/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj b/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj
@@ -112,7 +112,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Gdiplus.lib;d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -130,7 +130,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Gdiplus.lib;d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -152,7 +152,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Gdiplus.lib;d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -174,7 +174,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Gdiplus.lib;d3d11.lib;dxgi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -190,8 +190,15 @@
     <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Cursor\OverlayCursorVault.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Mouse\MousePositionMonitor.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Overlay.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Mesh.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Texture.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\RenderContext.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Support\RenderTimingController.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Support\RenderTools.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontAtlas.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontMapBuilder.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextMesh.cpp" />
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextPopup.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Target\Support\CursorVisibilityHacker.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Target\Target.cpp" />
     <ClCompile Include="..\..\source\YoloMouse\Loader\Target\TargetController.cpp" />
@@ -211,12 +218,19 @@
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Cursor\OverlayCursorVault.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Mouse\MousePositionMonitor.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Overlay.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Mesh.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Texture.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\RenderContext.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Shaders\Default\PixelShader.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Shaders\Default\VertexShader.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Shaders\ShaderTypes.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Support\RenderTimingController.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Support\RenderTools.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Types.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontAtlas.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontMapBuilder.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextMesh.hpp" />
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextPopup.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Resource\resource.h" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Target\Support\CursorVisibilityHacker.hpp" />
     <ClInclude Include="..\..\source\YoloMouse\Loader\Target\Target.hpp" />

diff --git a/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj.filters b/build/YoloMouse.Loader/YoloMouse.Loader.vcxproj.filters
@@ -46,6 +46,12 @@
     <Filter Include="Overlay\Mouse">
       <UniqueIdentifier>{4938d3f7-9383-41fa-945a-a8fae4fcdbf1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Overlay\Text">
+      <UniqueIdentifier>{e937feb4-036c-4353-8d79-8d5d13542376}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Overlay\Rendering\Assets">
+      <UniqueIdentifier>{f2c36add-91f4-4ff5-a514-661cbc09eb51}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\YoloMouse\Loader\Main.cpp" />
@@ -97,6 +103,27 @@
     <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Mouse\MousePositionMonitor.cpp">
       <Filter>Overlay\Mouse</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextMesh.cpp">
+      <Filter>Overlay\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Support\RenderTools.cpp">
+      <Filter>Overlay\Rendering\Support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontAtlas.cpp">
+      <Filter>Overlay\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontMapBuilder.cpp">
+      <Filter>Overlay\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextPopup.cpp">
+      <Filter>Overlay\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Mesh.cpp">
+      <Filter>Overlay\Rendering\Assets</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Texture.cpp">
+      <Filter>Overlay\Rendering\Assets</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\YoloMouse\Loader\Resource\resource.h">
@@ -171,6 +198,27 @@
     <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Mouse\MousePositionMonitor.hpp">
       <Filter>Overlay\Mouse</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextMesh.hpp">
+      <Filter>Overlay\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Support\RenderTools.hpp">
+      <Filter>Overlay\Rendering\Support</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontAtlas.hpp">
+      <Filter>Overlay\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\FontMapBuilder.hpp">
+      <Filter>Overlay\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Text\TextPopup.hpp">
+      <Filter>Overlay\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Mesh.hpp">
+      <Filter>Overlay\Rendering\Assets</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\YoloMouse\Loader\Overlay\Rendering\Assets\Texture.hpp">
+      <Filter>Overlay\Rendering\Assets</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\source\YoloMouse\Loader\Resource\AppIcon.ico">

diff --git a/source/Core/Container/Array.hpp b/source/Core/Container/Array.hpp
@@ -424,6 +424,115 @@ namespace Core
         }
     };
 
+    /*
+        memory: allocated
+        count:  variable
+        limit:  =count
+    */
+    template<typename TYPE>
+    class SimpleArray:
+        public Array<TYPE>
+    {
+    public:
+        /**/
+        SimpleArray() = default;
+
+        SimpleArray( ULong count )
+        {
+            _Construct(count);
+        }
+
+        SimpleArray( const std::initializer_list<TYPE>& ilist )
+        {
+            _Copy(ilist.begin(), static_cast<ULong>(ilist.size()));
+        }
+
+        SimpleArray( const SimpleArray& other )
+        {
+            _Copy(other.GetMemory(), other.GetCount());
+        }
+
+        template<class ARRAY>
+        SimpleArray( const ARRAY& other )
+        {
+            _Copy(other.GetMemory(), other.GetCount());
+        }
+
+        ~SimpleArray()
+        {
+            if( _memory != nullptr )
+                _Destruct();
+        }
+
+        /**/
+        void operator=( const SimpleArray& other )
+        {
+            Copy( other );
+        }
+        template<class ARRAY>
+        void operator=( const ARRAY& other )
+        {
+            Copy( other );
+        }
+
+        /**/
+        void Empty()
+        {
+            // if not already empty
+            if( _memory != nullptr )
+            {
+                _Destruct();
+                _count = 0;
+                _memory = nullptr;
+            }
+        }
+
+        /**/
+        void SetCount( ULong count )
+        {
+            if( _memory != nullptr )
+                _Destruct();
+            _Construct(count);
+        }
+
+        /**/
+        void Copy( const TYPE* data, ULong count )
+        {
+            if( _memory != nullptr )
+                _Destruct();
+            _Copy( data, count );
+        }
+        template<class ARRAY>
+        void Copy( const ARRAY& other )
+        {
+            Copy(other.GetMemory(), other.GetCount());
+        }
+
+    protected:
+        /**/
+        inline void _Construct( ULong count )
+        {
+            // allocate and construct data
+            _memory = new TYPE[count];
+
+            // set count
+            _count = count;
+        }
+
+        inline void _Destruct()
+        {
+            // destruct and free data
+            delete[] _memory;
+        }
+
+        /**/
+        void _Copy( const TYPE* data, ULong count )
+        {
+            _Construct(count);
+            BaseArray::Copy(data, count);
+        }
+    };
+
     /**/
     typedef Array<Byte>         ByteArray;
     typedef BufferArray<Byte>   ByteBufferArray;

diff --git a/source/Core/Container/String.hpp b/source/Core/Container/String.hpp
@@ -147,6 +147,39 @@ namespace Core
         }
     };
 
+    /**/
+    class SimpleString:
+        public BaseString<SimpleArray<Char>>
+    {
+    public:
+        /**/
+        SimpleString() = default;
+        SimpleString( const Char* cstring );
+        template<class STRING>
+        SimpleString( const STRING& other )
+        {
+            _Construct(other.GetCount());
+            Copy(other);
+        }
+
+        /**/
+        operator String() const
+        {
+            return String(_memory, _count);
+        }
+
+        /**/
+        void operator=( const SimpleArray& other )
+        {
+            SimpleArray::Copy( other );
+        }
+        template<class STRING>
+        void operator=( const STRING& other )
+        {
+            SimpleArray::Copy( other );
+        }
+    };
+
     /**/
     typedef FixedString<DynamicFlatArray<Char, STRING_SHORT_SIZE>>    ShortString;
     typedef FixedString<DynamicFlatArray<Char, STRING_MEDIUM_SIZE>>   MediumString;

diff --git a/source/Core/Math/Math.cpp b/source/Core/Math/Math.cpp
@@ -7,13 +7,16 @@ namespace Core
     //-------------------------------------------------------------------------
     template class Math<Float>;
     template class Math<Long>;
+    template class Math<ULong>;
 
     // statics
     //-------------------------------------------------------------------------
     template<> const Float Math<Float>::PI =    3.14159274f;
     template<> const Long  Math<Long>::PI =     3;
+    template<> const ULong Math<ULong>::PI =    3;
     template<> const Float Math<Float>::PI2 =   6.28318530f;
     template<> const Long  Math<Long>::PI2 =    6;
+    template<> const ULong Math<ULong>::PI2 =   6;
 
     //-------------------------------------------------------------------------
     template<>
@@ -26,12 +29,27 @@ namespace Core
     {
         return 0;
     }
+    template<>
+    ULong Math<ULong>::SquareRoot( ULong value )
+    {
+        return 0;
+    }
 
     //-------------------------------------------------------------------------
-    template<typename TYPE>
-    TYPE Math<TYPE>::Absolute( TYPE value )
+    template<>
+    Float Math<Float>::Absolute( Float value )
+    {
+        return static_cast<Float>(std::fabs( value ));
+    }
+    template<>
+    Long Math<Long>::Absolute( Long value )
+    {
+        return static_cast<Long>(std::abs( value ));
+    }
+    template<>
+    ULong Math<ULong>::Absolute( ULong value )
     {
-        return static_cast<TYPE>(std::abs( value ));
+        return value;
     }
 
     //-------------------------------------------------------------------------