Skip to content

Commit da91bbc

Browse files
crosirecrosire
committed
Reorder example add-ons by complexity
1 parent 40ea60b commit da91bbc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+132
-145
lines changed

‎ReShade.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
</ProjectReference>
500500
</ItemGroup>
501501
<ItemGroup>
502-
<ClCompile Include="examples\07-generic_depth\generic_depth.cpp">
502+
<ClCompile Include="examples\09-depth\generic_depth.cpp">
503503
<!-- Force include "reshade.hpp" before anything else when creating built-in add-on, so that no Dear ImGui functions are created. -->
504504
<ForcedIncludeFiles>reshade.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
505505
<PreprocessorDefinitions>BUILTIN_ADDON;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎ReShade.vcxproj.filters‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<ClCompile Include="source\addon_manager.cpp">
8888
<Filter>core\runtime</Filter>
8989
</ClCompile>
90-
<ClCompile Include="examples\07-generic_depth\generic_depth.cpp">
90+
<ClCompile Include="examples\09-depth\generic_depth.cpp">
9191
<Filter>core\runtime</Filter>
9292
</ClCompile>
9393
<ClCompile Include="source\input.cpp">

‎examples/12-framerate_limit/framerate_limit.cpp‎ renamed to ‎examples/01-framerate_limit/framerate_limit.cpp‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Patrick Mours
2+
* Copyright (C) 2022 Patrick Mours
33
* SPDX-License-Identifier: BSD-3-Clause OR MIT
44
*/
55

@@ -59,21 +59,8 @@ static void draw_settings(reshade::api::effect_runtime *)
5959
s_enabled = s_started = false;
6060
}
6161

62-
void register_addon_framerate_limit()
63-
{
64-
reshade::register_overlay(nullptr, draw_settings);
65-
66-
reshade::register_event<reshade::addon_event::present>(on_present);
67-
}
68-
void unregister_addon_framerate_limit()
69-
{
70-
reshade::unregister_overlay(nullptr, draw_settings);
71-
72-
reshade::unregister_event<reshade::addon_event::present>(on_present);
73-
}
74-
7562
extern "C" __declspec(dllexport) const char *NAME = "Framerate Limiter";
76-
extern "C" __declspec(dllexport) const char *DESCRIPTION = "Limits the framerate of an application to a specified FPS value.";
63+
extern "C" __declspec(dllexport) const char *DESCRIPTION = "Example add-on that limits the framerate of an application to a specified FPS value.";
7764

7865
BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
7966
{
@@ -82,10 +69,10 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
8269
case DLL_PROCESS_ATTACH:
8370
if (!reshade::register_addon(hModule))
8471
return FALSE;
85-
register_addon_framerate_limit();
72+
reshade::register_overlay(nullptr, draw_settings);
73+
reshade::register_event<reshade::addon_event::present>(on_present);
8674
break;
8775
case DLL_PROCESS_DETACH:
88-
unregister_addon_framerate_limit();
8976
reshade::unregister_addon(hModule);
9077
break;
9178
}

‎examples/12-framerate_limit/framerate_limit.vcxproj‎ renamed to ‎examples/01-framerate_limit/framerate_limit.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Keyword>Win32Proj</Keyword>
2525
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
2626
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
27-
<ProjectName>12-framerate_limit</ProjectName>
27+
<ProjectName>01-framerate_limit</ProjectName>
2828
</PropertyGroup>
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3030
<PropertyGroup Label="Configuration">
@@ -59,7 +59,7 @@
5959
<Optimization>Disabled</Optimization>
6060
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6161
<ConformanceMode>true</ConformanceMode>
62-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
62+
<AdditionalIncludeDirectories>..\..\include;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6363
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
6464
<LanguageStandard>stdcpp17</LanguageStandard>
6565
</ClCompile>
@@ -75,7 +75,7 @@
7575
<Optimization>Disabled</Optimization>
7676
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<ConformanceMode>true</ConformanceMode>
78-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78+
<AdditionalIncludeDirectories>..\..\include;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7979
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8080
<LanguageStandard>stdcpp17</LanguageStandard>
8181
</ClCompile>
@@ -92,7 +92,7 @@
9292
<FunctionLevelLinking>true</FunctionLevelLinking>
9393
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<ConformanceMode>true</ConformanceMode>
95-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
95+
<AdditionalIncludeDirectories>..\..\include;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9696
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9797
<LanguageStandard>stdcpp17</LanguageStandard>
9898
</ClCompile>
@@ -111,7 +111,7 @@
111111
<FunctionLevelLinking>true</FunctionLevelLinking>
112112
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113113
<ConformanceMode>true</ConformanceMode>
114-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>..\..\include;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
116116
<LanguageStandard>stdcpp17</LanguageStandard>
117117
</ClCompile>

‎examples/13-freepie/freepie.cpp‎ renamed to ‎examples/02-freepie/freepie.cpp‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (C) 2014 Patrick Mours
3-
* SPDX-License-Identifier: BSD-3-Clause
2+
* Copyright (C) 2022 Patrick Mours
3+
* SPDX-License-Identifier: BSD-3-Clause OR MIT
44
*/
55

66
#include <reshade.hpp>
@@ -68,7 +68,7 @@ struct freepie_io_shared_data
6868
freepie_io_data data;
6969
};
7070

71-
bool freepie_io_read(uint32_t index, freepie_io_data *output)
71+
static bool freepie_io_read(uint32_t index, freepie_io_data *output)
7272
{
7373
const size_t FREEPIE_IO_MAX_SLOTS = 4;
7474
if (index >= FREEPIE_IO_MAX_SLOTS)
@@ -92,26 +92,17 @@ static void update_uniform_variables(reshade::api::effect_runtime *runtime, resh
9292
int index = 0;
9393
runtime->get_annotation_int_from_uniform_variable(variable, "index", &index, 1);
9494

95-
if (freepie_io_data data;
96-
freepie_io_read(index, &data))
95+
freepie_io_data data;
96+
if (freepie_io_read(index, &data))
9797
{
9898
runtime->set_uniform_value_float(variable, &data.yaw, 3 * 2);
9999
}
100100
}
101101
});
102102
}
103103

104-
void register_addon_freepie()
105-
{
106-
reshade::register_event<reshade::addon_event::reshade_begin_effects>(update_uniform_variables);
107-
}
108-
void unregister_addon_freepie()
109-
{
110-
reshade::unregister_event<reshade::addon_event::reshade_begin_effects>(update_uniform_variables);
111-
}
112-
113104
extern "C" __declspec(dllexport) const char *NAME = "FreePIE";
114-
extern "C" __declspec(dllexport) const char *DESCRIPTION = "Adds support for reading FreePIE input data in effects.";
105+
extern "C" __declspec(dllexport) const char *DESCRIPTION = "Example add-on that adds support for reading FreePIE input data in effects via uniform variables.";
115106

116107
BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
117108
{
@@ -120,10 +111,9 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
120111
case DLL_PROCESS_ATTACH:
121112
if (!reshade::register_addon(hModule))
122113
return FALSE;
123-
register_addon_freepie();
114+
reshade::register_event<reshade::addon_event::reshade_begin_effects>(update_uniform_variables);
124115
break;
125116
case DLL_PROCESS_DETACH:
126-
unregister_addon_freepie();
127117
reshade::unregister_addon(hModule);
128118
break;
129119
}

‎examples/13-freepie/freepie.vcxproj‎ renamed to ‎examples/02-freepie/freepie.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Keyword>Win32Proj</Keyword>
2525
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
2626
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
27-
<ProjectName>13-freepie</ProjectName>
27+
<ProjectName>02-freepie</ProjectName>
2828
</PropertyGroup>
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3030
<PropertyGroup Label="Configuration">
@@ -59,7 +59,7 @@
5959
<Optimization>Disabled</Optimization>
6060
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6161
<ConformanceMode>true</ConformanceMode>
62-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
62+
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6363
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
6464
<LanguageStandard>stdcpp17</LanguageStandard>
6565
</ClCompile>
@@ -75,7 +75,7 @@
7575
<Optimization>Disabled</Optimization>
7676
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<ConformanceMode>true</ConformanceMode>
78-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78+
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7979
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8080
<LanguageStandard>stdcpp17</LanguageStandard>
8181
</ClCompile>
@@ -92,7 +92,7 @@
9292
<FunctionLevelLinking>true</FunctionLevelLinking>
9393
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<ConformanceMode>true</ConformanceMode>
95-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
95+
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9696
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9797
<LanguageStandard>stdcpp17</LanguageStandard>
9898
</ClCompile>
@@ -111,7 +111,7 @@
111111
<FunctionLevelLinking>true</FunctionLevelLinking>
112112
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;NOMINMAX;ImTextureID=ImU64;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113113
<ConformanceMode>true</ConformanceMode>
114-
<AdditionalIncludeDirectories>..\..\include;..\..\deps\stb;..\..\deps\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
116116
<LanguageStandard>stdcpp17</LanguageStandard>
117117
</ClCompile>

‎examples/06-history_window/history_window.cpp‎ renamed to ‎examples/03-history_window/history_window.cpp‎

File renamed without changes.

‎examples/06-history_window/history_window.vcxproj‎ renamed to ‎examples/03-history_window/history_window.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Keyword>Win32Proj</Keyword>
2525
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
2626
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
27-
<ProjectName>06-history_window</ProjectName>
27+
<ProjectName>03-history_window</ProjectName>
2828
</PropertyGroup>
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3030
<PropertyGroup Label="Configuration">

‎examples/01-api_trace/api_trace.cpp‎ renamed to ‎examples/04-api_trace/api_trace.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ static bool on_copy_query_pool_results(command_list *cmd_list, query_pool pool,
884884
return false;
885885
}
886886

887-
static void on_present(command_queue *, swapchain *, const rect *, const rect *, uint32_t, const rect *)
887+
static void on_present(effect_runtime *runtime)
888888
{
889889
if (s_do_capture)
890890
{
@@ -895,7 +895,7 @@ static void on_present(command_queue *, swapchain *, const rect *, const rect *,
895895
else
896896
{
897897
// The keyboard shortcut to trigger logging
898-
if (GetAsyncKeyState(VK_F10) & 0x80000000)
898+
if (runtime->is_key_pressed(VK_F10))
899899
{
900900
s_do_capture = true;
901901
reshade::log_message(3, "--- Frame ---");
@@ -957,7 +957,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID)
957957
reshade::register_event<reshade::addon_event::end_query>(on_end_query);
958958
reshade::register_event<reshade::addon_event::copy_query_pool_results>(on_copy_query_pool_results);
959959

960-
reshade::register_event<reshade::addon_event::present>(on_present);
960+
reshade::register_event<reshade::addon_event::reshade_present>(on_present);
961961
break;
962962
case DLL_PROCESS_DETACH:
963963
reshade::unregister_addon(hModule);

‎examples/01-api_trace/api_trace.vcxproj‎ renamed to ‎examples/04-api_trace/api_trace.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Keyword>Win32Proj</Keyword>
2525
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
2626
<WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
27-
<ProjectName>01-api_trace</ProjectName>
27+
<ProjectName>04-api_trace</ProjectName>
2828
</PropertyGroup>
2929
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3030
<PropertyGroup Label="Configuration">

0 commit comments

Comments
 (0)