fix: fix caching in VR

SaneEngineer · May 4, 2024 · f799a49 · f799a49
1 parent 6d901f8
commit f799a49
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/include/GrassControl/GidFileCache.h b/include/GrassControl/GidFileCache.h
@@ -148,7 +148,9 @@ namespace GrassControl
 			{
 				static void thunk(RE::TESObjectCELL* cell)
 				{
-					InterlockedIncrement64(&queued_grass_counter);
+					if(strcmp(cell->worldSpace->editorID.c_str(), "VRPlayroom") != 0) {
+					    InterlockedIncrement64(&queued_grass_counter);
+					}
 					func(cell);
 				}
 				static inline REL::Relocation<decltype(thunk)> func;
@@ -159,7 +161,7 @@ namespace GrassControl
 				static void thunk(uintptr_t GrassMgr, RE::TESObjectCELL* cell, uintptr_t unk)
 				{
 					func(GrassMgr, cell, unk);
-					if (IsApplying) {
+					if (IsApplying && strcmp(cell->worldSpace->editorID.c_str(), "VRPlayroom") != 0) {
 						if (cell != nullptr) {
 							auto ws = cell->worldSpace;
 							if (ws != nullptr) {

diff --git a/src/Events.cpp b/src/Events.cpp
@@ -16,6 +16,8 @@ RE::BSEventNotifyControl MenuOpenCloseEventHandler::ProcessEvent(const RE::MenuO
 	if (a_event) {
 #ifndef NDEBUG
 		if (a_event->menuName == RE::Console::MENU_NAME) {
+#elif SKYRIMVR
+		if (a_event->menuName == RE::Console::MENU_NAME) {
 #else
 		if (a_event->menuName == RE::MainMenu::MENU_NAME) {
 #endif

diff --git a/src/GidFileCache.cpp b/src/GidFileCache.cpp
@@ -497,6 +497,9 @@ namespace GrassControl
 		char Char = ';';
 		auto skip = Util::StringHelpers::split(Config::SkipPregenerateWorldSpaces, Char, true);
 		auto skipSet = std::unordered_set<std::string, case_insensitive_unordered_set::hash, case_insensitive_unordered_set::comp>();
+#ifdef SKYRIMVR
+		skipSet.insert("VRPlayroom");
+#endif
 		for (auto& x : skip) {
 			logger::info("Skipping: {}", x);
 			skipSet.insert(x);