cleanup for weapon/armor detection

hakasapl · Jul 22, 2024 · 6965076 · 6965076
1 parent e8cebaa
commit 6965076
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/ParallaxGen/ParallaxGen.hpp b/include/ParallaxGen/ParallaxGen.hpp
@@ -24,6 +24,8 @@ class ParallaxGen
     // which texture indices to search when mapping mesh shapes to parallax maps
 	static inline const std::array<uint32_t, 2> texture_maps_idx_search = { 0, 1 };
 
+	static inline const std::vector<std::wstring> dynCubemap_ignore_list = { L"armor", L"weapons" };
+
     // bools to ignore parallax and/or complex material
 	bool ignore_parallax;
 	bool ignore_complex_material;

diff --git a/src/ParallaxGen/ParallaxGen.cpp b/src/ParallaxGen/ParallaxGen.cpp
@@ -314,7 +314,7 @@ void ParallaxGen::processNIF(const fs::path& nif_file, vector<fs::path>& heightM
 
 				// check if this is weapon or armor
 				bool dynCubemaps = true;
-				if (pgd->checkIfAnyComponentIs(nif_file, { L"weapons", L"armor" }) || boost::icontains(search_prefix, "armor") || boost::icontains(search_prefix, "weapon")) {
+				if (pgd->checkIfAnyComponentIs(nif_file, dynCubemap_ignore_list) || pgd->checkIfAnyComponentIs(search_prefix, dynCubemap_ignore_list)) {
 					dynCubemaps = false;
 				}