refactor: remove feature-Draw and remove empty functions

doodlum · Jul 23, 2024 · d44d5d4 · d44d5d4
1 parent b66151d
commit d44d5d4
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 58 deletions.
diff --git a/src/Feature.h b/src/Feature.h
@@ -22,7 +22,6 @@ struct Feature
 	virtual void Reset() {}
 
 	virtual void DrawSettings() {}
-	virtual void Draw(const RE::BSShader*, const uint32_t) {}
 	virtual void DrawDeferred() {}
 	virtual void DrawPreProcess() {}
 	virtual void Prepass() {}

diff --git a/src/Features/CloudShadows.h b/src/Features/CloudShadows.h
@@ -51,5 +51,5 @@ struct CloudShadows : Feature
 			logger::info("[Cloud Shadows] Installed hooks");
 		}
 	};
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/DynamicCubemaps.h b/src/Features/DynamicCubemaps.h
@@ -126,5 +126,5 @@ struct DynamicCubemaps : Feature
 
 	void Irradiance(bool a_reflections);
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/ExtendedMaterials.h b/src/Features/ExtendedMaterials.h
@@ -37,5 +37,5 @@ struct ExtendedMaterials : Feature
 
 	virtual void RestoreDefaultSettings() override;
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/GrassCollision.h b/src/Features/GrassCollision.h
@@ -60,7 +60,7 @@ struct GrassCollision : Feature
 
 	virtual void PostPostLoad() override;
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 
 	struct Hooks
 	{

diff --git a/src/Features/GrassLighting.h b/src/Features/GrassLighting.h
@@ -32,5 +32,5 @@ struct GrassLighting : Feature
 
 	virtual void RestoreDefaultSettings() override;
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/LightLimitFix.h b/src/Features/LightLimitFix.h
@@ -308,7 +308,7 @@ struct LightLimitFix : Feature
 		}
 	};
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
 
 template <>

diff --git a/src/Features/ScreenSpaceShadows.h b/src/Features/ScreenSpaceShadows.h
@@ -71,5 +71,5 @@ struct ScreenSpaceShadows : Feature
 
 	virtual void RestoreDefaultSettings() override;
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/SubsurfaceScattering.cpp b/src/Features/SubsurfaceScattering.cpp
@@ -1,3 +1,4 @@
+
 #include "SubsurfaceScattering.h"
 
 #include "Deferred.h"
@@ -240,10 +241,6 @@ void SubsurfaceScattering::DrawSSS()
 	context->CSSetShader(shader, nullptr, 0);
 }
 
-void SubsurfaceScattering::Draw(const RE::BSShader*, const uint32_t)
-{
-}
-
 void SubsurfaceScattering::SetupResources()
 {
 	{

diff --git a/src/Features/SubsurfaceScattering.h b/src/Features/SubsurfaceScattering.h
@@ -83,8 +83,6 @@ struct SubsurfaceScattering : Feature
 
 	void DrawSSS();
 
-	virtual void Draw(const RE::BSShader* shader, const uint32_t descriptor) override;
-
 	virtual void LoadSettings(json& o_json) override;
 	virtual void SaveSettings(json& o_json) override;
 
@@ -117,5 +115,5 @@ struct SubsurfaceScattering : Feature
 		}
 	};
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/TerrainBlending.h b/src/Features/TerrainBlending.h
@@ -180,5 +180,5 @@ struct TerrainBlending : Feature
 			logger::info("[Terrain Blending] Installed hooks");
 		}
 	};
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/TerrainOcclusion.h b/src/Features/TerrainOcclusion.h
@@ -124,5 +124,5 @@ struct TerrainOcclusion : public Feature
 
 	virtual inline void RestoreDefaultSettings() override { settings = {}; }
 	virtual void ClearShaderCache() override;
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/WaterCaustics.cpp b/src/Features/WaterCaustics.cpp
@@ -5,10 +5,6 @@
 
 #include <DDSTextureLoader.h>
 
-void WaterCaustics::DrawSettings()
-{
-}
-
 void WaterCaustics::SetupResources()
 {
 	auto& device = State::GetSingleton()->device;
@@ -23,10 +19,6 @@ void WaterCaustics::Prepass()
 	context->PSSetShaderResources(70, 1, &causticsView);
 }
 
-void WaterCaustics::RestoreDefaultSettings()
-{
-}
-
 bool WaterCaustics::HasShaderDefine(RE::BSShader::Type)
 {
 	return true;

diff --git a/src/Features/WaterCaustics.h b/src/Features/WaterCaustics.h
@@ -21,11 +21,7 @@ struct WaterCaustics : Feature
 
 	virtual void SetupResources() override;
 
-	virtual void DrawSettings() override;
-
 	virtual void Prepass() override;
 
-	virtual void RestoreDefaultSettings() override;
-
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/WaterParallax.cpp b/src/Features/WaterParallax.cpp
@@ -1,24 +1,5 @@
 #include "WaterParallax.h"
 
-#include "State.h"
-#include "Util.h"
-
-void WaterParallax::DrawSettings()
-{
-}
-
-void WaterParallax::Draw(const RE::BSShader*, const uint32_t)
-{
-}
-
-void WaterParallax::SetupResources()
-{
-}
-
-void WaterParallax::RestoreDefaultSettings()
-{
-}
-
 bool WaterParallax::HasShaderDefine(RE::BSShader::Type)
 {
 	return true;

diff --git a/src/Features/WaterParallax.h b/src/Features/WaterParallax.h
@@ -17,12 +17,5 @@ struct WaterParallax : Feature
 
 	bool HasShaderDefine(RE::BSShader::Type shaderType) override;
 
-	virtual void SetupResources() override;
-
-	virtual void DrawSettings() override;
-
-	virtual void Draw(const RE::BSShader* shader, const uint32_t descriptor) override;
-
-	virtual void RestoreDefaultSettings() override;
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
diff --git a/src/Features/WetnessEffects.h b/src/Features/WetnessEffects.h
@@ -97,5 +97,5 @@ struct WetnessEffects : Feature
 		}
 	};
 
-	bool SupportsVR() override { return true; };
+	virtual bool SupportsVR() override { return true; };
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -308,7 +308,7 @@ struct LightLimitFix : Feature @@
     		}
     	};
-    	bool SupportsVR() override { return true; };
+    	virtual bool SupportsVR() override { return true; };
     };
     template <>
@@ Expand Down @@