Revert "Code Cleanup & Fixes"

This reverts commit eb3ad3a.
kirides · Jul 3, 2021 · 09908f2 · 09908f2
1 parent 48fa550
commit 09908f2
Show file tree

Hide file tree

Showing 18 changed files with 273 additions and 668 deletions.
diff --git a/D3D11Engine/BaseAntTweakBar.cpp b/D3D11Engine/BaseAntTweakBar.cpp
@@ -447,8 +447,7 @@ void BaseAntTweakBar::InitTextureSettingsBar() {
 
     std::string enumDef = "";
 
-    static std::set<zCTexture*> emptyTextures;
-    const std::set<zCTexture*>& frameTextures = emptyTextures;
+    const std::set<zCTexture*>& frameTextures = Engine::GraphicsEngine->GetFrameTextures();
     if ( !frameTextures.size() ) {
         return;
     }

diff --git a/D3D11Engine/BaseGraphicsEngine.h b/D3D11Engine/BaseGraphicsEngine.h
@@ -171,6 +171,9 @@ class BaseGraphicsEngine {
     /** Returns the data of the backbuffer */
     virtual void GetBackbufferData( byte** data, int& pixelsize ) {}
 
+    /** Returns the textures drawn this frame */
+    virtual const std::set<zCTexture*>& GetFrameTextures() { static auto empty = std::set<zCTexture*>(); return empty; }
+
     /** Draws a fullscreenquad, copying the given texture to the viewport */
     virtual void DrawQuad( INT2 position, INT2 size ) {}
 

diff --git a/D3D11Engine/D3D11Effect.cpp b/D3D11Engine/D3D11Effect.cpp
@@ -215,6 +215,7 @@ XRESULT D3D11Effect::DrawRain() {
     // Disable depth-write
     state.DepthState.DepthWriteEnabled = false;
     state.DepthState.SetDirty();
+    state.DepthState.DepthBufferCompareFunc = GothicDepthBufferStateInfo::DEFAULT_DEPTH_COMP_STATE;
 
     // Disable culling
     state.RasterizerState.CullMode = GothicRasterizerStateInfo::CM_CULL_NONE;
@@ -256,6 +257,8 @@ XRESULT D3D11Effect::DrawRain() {
     // Reset this
     e->GetContext()->IASetPrimitiveTopology( D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST );
     e->GetContext()->GSSetShader( nullptr, 0, 0 );
+
+    e->SetDefaultStates();
     return XR_SUCCESS;
 }
 
@@ -404,4 +407,4 @@ HRESULT LoadTextureArray( Microsoft::WRL::ComPtr<ID3D11Device1> pd3dDevice, Micr
     LE( pd3dDevice->CreateShaderResourceView( *ppTex2D, &SRVDesc, ppSRV ) );
 
     return hr;
-}
+}
diff --git a/D3D11Engine/D3D11Engine.vcxproj b/D3D11Engine/D3D11Engine.vcxproj
diff --git a/D3D11Engine/D3D11Engine.vcxproj.filters b/D3D11Engine/D3D11Engine.vcxproj.filters
@@ -723,9 +723,6 @@
     <ClInclude Include="zQuat.h">
       <Filter>ZenGin\Classes</Filter>
     </ClInclude>
-    <ClInclude Include="GothicMemoryLocations1_12f.h">
-      <Filter>ZenGin</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />