Try 2: Windows 10 1809 update

Replace custom HDR tonemappers with Direct2D tonemapper effect, UI tweaks
13thsymphony · Feb 3, 2019 · f893c19 · f893c19
1 parent 7fdd398
commit f893c19
Show file tree

Hide file tree

Showing 17 changed files with 550 additions and 670 deletions.
diff --git a/Samples/D2DAdvancedColorImages/cpp/D2DAdvancedColorImages/D2DAdvancedColorImages.vcxproj b/Samples/D2DAdvancedColorImages/cpp/D2DAdvancedColorImages/D2DAdvancedColorImages.vcxproj
diff --git a/.../D2DAdvancedColorImages/cpp/D2DAdvancedColorImages/D2DAdvancedColorImages.vcxproj.filters b/.../D2DAdvancedColorImages/cpp/D2DAdvancedColorImages/D2DAdvancedColorImages.vcxproj.filters
@@ -29,12 +29,6 @@
       <Filter>Common</Filter>
     </ClCompile>
     <ClCompile Include="D2DAdvancedColorImagesRenderer.cpp" />
-    <ClCompile Include="ReinhardEffect.cpp">
-      <Filter>RenderEffects</Filter>
-    </ClCompile>
-    <ClCompile Include="FilmicEffect.cpp">
-      <Filter>RenderEffects</Filter>
-    </ClCompile>
     <ClCompile Include="SdrOverlayEffect.cpp">
       <Filter>RenderEffects</Filter>
     </ClCompile>
@@ -47,6 +41,9 @@
     <ClCompile Include="SphereMapEffect.cpp">
       <Filter>RenderEffects</Filter>
     </ClCompile>
+    <ClCompile Include="SimpleTonemapEffect.cpp">
+      <Filter>RenderEffects</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="App.xaml.h" />
@@ -63,12 +60,6 @@
     </ClInclude>
     <ClInclude Include="D2DAdvancedColorImagesRenderer.h" />
     <ClInclude Include="RenderOptions.h" />
-    <ClInclude Include="ReinhardEffect.h">
-      <Filter>RenderEffects</Filter>
-    </ClInclude>
-    <ClInclude Include="FilmicEffect.h">
-      <Filter>RenderEffects</Filter>
-    </ClInclude>
     <ClInclude Include="SdrOverlayEffect.h">
       <Filter>RenderEffects</Filter>
     </ClInclude>
@@ -81,6 +72,10 @@
     <ClInclude Include="SphereMapEffect.h">
       <Filter>RenderEffects</Filter>
     </ClInclude>
+    <ClInclude Include="SdrBrightnessFormatter.h" />
+    <ClInclude Include="SimpleTonemapEffect.h">
+      <Filter>RenderEffects</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest" />
@@ -196,12 +191,6 @@
     </Image>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="ReinhardEffect.hlsl">
-      <Filter>RenderEffects</Filter>
-    </Text>
-    <Text Include="FilmicEffect.hlsl">
-      <Filter>RenderEffects</Filter>
-    </Text>
     <Text Include="SdrOverlayEffect.hlsl">
       <Filter>RenderEffects</Filter>
     </Text>
@@ -211,6 +200,9 @@
     <Text Include="SphereMapEffect.hlsl">
       <Filter>RenderEffects</Filter>
     </Text>
+    <Text Include="SimpleTonemapEffect.hlsl">
+      <Filter>RenderEffects</Filter>
+    </Text>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />