Skip to content

reworked render to threadsafe render #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

reworked render to threadsafe render #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 67 additions & 1 deletion CSGOSimple/CSGOSimple.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(DXSDK_DIR)Include</IncludePath>
<TargetName>csgosimple</TargetName>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(DXSDK_DIR)Lib\x86</LibraryPath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(DXSDK_DIR)Lib\x86;C:\Users\ZeroX\Desktop\Simple\CSGOSimple\packages\freetype.2.8.0.1\build\native\lib\Win32\v141\static\Release</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down Expand Up @@ -108,6 +108,7 @@
<ClCompile Include="hooks.cpp" />
<ClCompile Include="imgui\imgui.cpp" />
<ClCompile Include="imgui\imgui_draw.cpp" />
<ClCompile Include="imgui\imgui_freetype.cpp" />
<ClCompile Include="imgui\imgui_widgets.cpp" />
<ClCompile Include="imgui\impl\imgui_impl_dx9.cpp" />
<ClCompile Include="imgui\impl\imgui_impl_win32.cpp" />
Expand All @@ -133,6 +134,59 @@
<ClInclude Include="config.hpp" />
<ClInclude Include="fonts\cousine.hpp" />
<ClInclude Include="fonts\fonts.hpp" />
<ClInclude Include="freetype\config\ftconfig.h" />
<ClInclude Include="freetype\config\ftheader.h" />
<ClInclude Include="freetype\config\ftmodule.h" />
<ClInclude Include="freetype\config\ftoption.h" />
<ClInclude Include="freetype\config\ftstdlib.h" />
<ClInclude Include="freetype\freetype.h" />
<ClInclude Include="freetype\ftadvanc.h" />
<ClInclude Include="freetype\ftbbox.h" />
<ClInclude Include="freetype\ftbdf.h" />
<ClInclude Include="freetype\ftbitmap.h" />
<ClInclude Include="freetype\ftbzip2.h" />
<ClInclude Include="freetype\ftcache.h" />
<ClInclude Include="freetype\ftchapters.h" />
<ClInclude Include="freetype\ftcid.h" />
<ClInclude Include="freetype\ftcolor.h" />
<ClInclude Include="freetype\ftdriver.h" />
<ClInclude Include="freetype\fterrdef.h" />
<ClInclude Include="freetype\fterrors.h" />
<ClInclude Include="freetype\ftfntfmt.h" />
<ClInclude Include="freetype\ftgasp.h" />
<ClInclude Include="freetype\ftglyph.h" />
<ClInclude Include="freetype\ftgxval.h" />
<ClInclude Include="freetype\ftgzip.h" />
<ClInclude Include="freetype\ftimage.h" />
<ClInclude Include="freetype\ftincrem.h" />
<ClInclude Include="freetype\ftlcdfil.h" />
<ClInclude Include="freetype\ftlist.h" />
<ClInclude Include="freetype\ftlzw.h" />
<ClInclude Include="freetype\ftmac.h" />
<ClInclude Include="freetype\ftmm.h" />
<ClInclude Include="freetype\ftmodapi.h" />
<ClInclude Include="freetype\ftmoderr.h" />
<ClInclude Include="freetype\ftotval.h" />
<ClInclude Include="freetype\ftoutln.h" />
<ClInclude Include="freetype\ftparams.h" />
<ClInclude Include="freetype\ftpfr.h" />
<ClInclude Include="freetype\ftrender.h" />
<ClInclude Include="freetype\ftsizes.h" />
<ClInclude Include="freetype\ftsnames.h" />
<ClInclude Include="freetype\ftstroke.h" />
<ClInclude Include="freetype\ftsynth.h" />
<ClInclude Include="freetype\ftsystem.h" />
<ClInclude Include="freetype\fttrigon.h" />
<ClInclude Include="freetype\fttypes.h" />
<ClInclude Include="freetype\ftwinfnt.h" />
<ClInclude Include="freetype\t1tables.h" />
<ClInclude Include="freetype\ttnameid.h" />
<ClInclude Include="freetype\tttables.h" />
<ClInclude Include="freetype\tttags.h" />
<ClInclude Include="ft2build.h" />
<ClInclude Include="helpers\point.hpp" />
<ClInclude Include="helpers\rect.hpp" />
<ClInclude Include="imgui\imgui_freetype.h" />
<ClInclude Include="imgui\impl\imgui_impl_dx9.h" />
<ClInclude Include="imgui\impl\imgui_impl_win32.h" />
<ClInclude Include="resource.h" />
Expand Down Expand Up @@ -219,7 +273,19 @@
<ClInclude Include="valve_sdk\misc\vfunc.hpp" />
<ClInclude Include="valve_sdk\netvars.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets" Condition="Exists('..\packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets')" />
<Import Project="..\packages\freetype.2.8.0.1\build\native\freetype.targets" Condition="Exists('..\packages\freetype.2.8.0.1\build\native\freetype.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets'))" />
<Error Condition="!Exists('..\packages\freetype.2.8.0.1\build\native\freetype.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\freetype.2.8.0.1\build\native\freetype.targets'))" />
</Target>
</Project>
168 changes: 168 additions & 0 deletions CSGOSimple/CSGOSimple.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
<Filter Include="Header Files\fonts">
<UniqueIdentifier>{69d9715e-6194-4271-9c84-4b80235b0dba}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\freetype">
<UniqueIdentifier>{bc85ee4b-d282-4142-a698-4b63644c81f4}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Helpers\math.cpp">
Expand Down Expand Up @@ -125,6 +128,9 @@
<ClCompile Include="imgui\imgui_widgets.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
<ClCompile Include="imgui\imgui_freetype.cpp">
<Filter>Source Files\imgui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="valve_sdk\misc\BaseHandle.hpp">
Expand Down Expand Up @@ -391,5 +397,167 @@
<ClInclude Include="config.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="freetype\freetype.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftadvanc.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftbbox.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftbdf.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftbitmap.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftbzip2.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftcache.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftchapters.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftcid.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftcolor.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftdriver.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\fterrdef.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\fterrors.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftfntfmt.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftgasp.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftglyph.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftgxval.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftgzip.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftimage.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftincrem.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftlcdfil.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftlist.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftlzw.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftmac.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftmm.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftmodapi.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftmoderr.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftotval.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftoutln.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftparams.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftpfr.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftrender.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftsizes.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftsnames.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftstroke.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftsynth.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftsystem.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\fttrigon.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\fttypes.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ftwinfnt.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\t1tables.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\ttnameid.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\tttables.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\tttags.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\config\ftconfig.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\config\ftheader.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\config\ftmodule.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\config\ftoption.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="freetype\config\ftstdlib.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="ft2build.h">
<Filter>Header Files\freetype</Filter>
</ClInclude>
<ClInclude Include="imgui\imgui_freetype.h">
<Filter>Header Files\imgui</Filter>
</ClInclude>
<ClInclude Include="helpers\point.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="helpers\rect.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions CSGOSimple/UI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ bool ImGui::Hotkey(const char* label, int* k, const ImVec2& size_arg)
if (!ImGui::ItemAdd(total_bb, id))
return false;

const bool focus_requested = ImGui::FocusableItemRegister(window, g.ActiveId == id, false);
const bool focus_requested_by_code = focus_requested && (window->FocusIdxAllCounter == window->FocusIdxAllRequestCurrent);
const bool focus_requested = ImGui::FocusableItemRegister(window, g.ActiveId == id);
const bool focus_requested_by_code = focus_requested && (window->DC.FocusCounterRegular == g.FocusRequestCurrCounterRegular);
const bool focus_requested_by_tab = focus_requested && !focus_requested_by_code;

const bool hovered = ImGui::ItemHoverable(frame_bb, id);
Expand Down
Loading