Merge pull request #115 from FlayaN/simplify-feature-loading

feat: simplify feature loading
doodlum · Oct 1, 2023 · 0f3f128 · 0f3f128
2 parents a1fb0f7 + b11a87d
commit 0f3f128
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 12 deletions.
diff --git a/src/Feature.h b/src/Feature.h
@@ -13,12 +13,17 @@ struct Feature
 
 	virtual void DrawSettings() = 0;
 	virtual void Draw(const RE::BSShader* shader, const uint32_t descriptor) = 0;
+	virtual void DrawDeferred() {}
+
+	virtual void DataLoaded() {}
+	virtual void PostPostLoad() {}
 
 	virtual void Load(json& o_json);
 	virtual void Save(json& o_json) = 0;
 
 	virtual bool ValidateCache(CSimpleIniA& a_ini);
 	virtual void WriteDiskCacheInfo(CSimpleIniA& a_ini);
+	virtual void ClearShaderCache() {}
 
 	// Cat: add all the features in here
 	static const std::vector<Feature*>& GetFeatureList();

diff --git a/src/Features/ExtendedMaterials.h b/src/Features/ExtendedMaterials.h
@@ -47,7 +47,7 @@ struct ExtendedMaterials : Feature
 	virtual void SetupResources();
 	virtual inline void Reset() {}
 
-	void DataLoaded();
+	virtual void DataLoaded() override;
 
 	virtual void DrawSettings();
 

diff --git a/src/Features/LightLimitFix.cpp b/src/Features/LightLimitFix.cpp
@@ -570,6 +570,12 @@ void LightLimitFix::Draw(const RE::BSShader* shader, const uint32_t descriptor)
 	}
 }
 
+void LightLimitFix::PostPostLoad()
+{
+	ParticleLights::GetSingleton()->GetConfigs();
+	LightLimitFix::InstallHooks();
+}
+
 void LightLimitFix::DataLoaded()
 {
 	auto iMagicLightMaxCount = RE::GameSettingCollection::GetSingleton()->GetSetting("iMagicLightMaxCount");

diff --git a/src/Features/LightLimitFix.h b/src/Features/LightLimitFix.h
@@ -115,7 +115,8 @@ struct LightLimitFix : Feature
 	virtual void DrawSettings();
 	virtual void Draw(const RE::BSShader* shader, const uint32_t descriptor);
 
-	void DataLoaded();
+	virtual void PostPostLoad() override;
+	virtual void DataLoaded() override;
 
 	float CalculateLightDistance(float3 a_lightPosition, float a_radius);
 	bool AddCachedParticleLights(eastl::vector<LightData>& lightsData, LightLimitFix::LightData& light, ParticleLights::Config* a_config = nullptr, RE::BSGeometry* a_geometry = nullptr, double timer = 0.0f);

diff --git a/src/Features/ScreenSpaceShadows.cpp b/src/Features/ScreenSpaceShadows.cpp
@@ -187,7 +187,7 @@ uint32_t GetTechnique(uint32_t descriptor)
 	return 0x3F & (descriptor >> 24);
 }
 
-void ScreenSpaceShadows::ClearComputeShader()
+void ScreenSpaceShadows::ClearShaderCache()
 {
 	if (raymarchProgram) {
 		raymarchProgram->Release();

diff --git a/src/Features/ScreenSpaceShadows.h b/src/Features/ScreenSpaceShadows.h
@@ -71,7 +71,7 @@ struct ScreenSpaceShadows : Feature
 	void ModifyGrass(const RE::BSShader* shader, const uint32_t descriptor);
 	void ModifyDistantTree(const RE::BSShader*, const uint32_t descriptor);
 
-	void ClearComputeShader();
+	virtual void ClearShaderCache() override;
 	ID3D11ComputeShader* GetComputeShader();
 	ID3D11ComputeShader* GetComputeShaderHorizontalBlur();
 	ID3D11ComputeShader* GetComputeShaderVerticalBlur();

diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -318,7 +318,11 @@ void Menu::DrawSettings()
 			ImGui::TableNextColumn();
 			if (ImGui::Button("Clear Shader Cache", { -1, 0 })) {
 				shaderCache.Clear();
-				ScreenSpaceShadows::GetSingleton()->ClearComputeShader();
+				for (auto* feature : Feature::GetFeatureList()) {
+					if (feature->loaded) {
+						feature->ClearShaderCache();
+					}
+				}
 			}
 			if (ImGui::IsItemHovered()) {
 				ImGui::BeginTooltip();

diff --git a/src/State.cpp b/src/State.cpp
@@ -39,6 +39,15 @@ void State::Draw()
 	currentShader = nullptr;
 }
 
+void State::DrawDeferred()
+{
+	for (auto* feature : Feature::GetFeatureList()) {
+		if (feature->loaded) {
+			feature->DrawDeferred();
+		}
+	}
+}
+
 void State::Reset()
 {
 	for (auto* feature : Feature::GetFeatureList())

diff --git a/src/State.h b/src/State.h
@@ -27,6 +27,7 @@ class State
 	bool upscalerLoaded = false;
 
 	void Draw();
+	void DrawDeferred();
 	void Reset();
 	void Setup();
 

diff --git a/src/XSEPlugin.cpp b/src/XSEPlugin.cpp
@@ -96,9 +96,10 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
 
 				shaderCache.ValidateDiskCache();
 
-				if (LightLimitFix::GetSingleton()->loaded) {
-					ParticleLights::GetSingleton()->GetConfigs();
-					LightLimitFix::InstallHooks();
+				for (auto* feature : Feature::GetFeatureList()) {
+					if (feature->loaded) {
+						feature->PostPostLoad();
+					}
 				}
 			}
 
@@ -124,10 +125,11 @@ void MessageHandler(SKSE::MessagingInterface::Message* message)
 					shaderCache.WriteDiskCacheInfo();
 				}
 
-				if (LightLimitFix::GetSingleton()->loaded)
-					LightLimitFix::GetSingleton()->DataLoaded();
-				if (ExtendedMaterials::GetSingleton()->loaded)
-					ExtendedMaterials::GetSingleton()->DataLoaded();
+				for (auto* feature : Feature::GetFeatureList()) {
+					if (feature->loaded) {
+						feature->DataLoaded();
+					}
+				}
 			}
 
 			break;