2
0
vlod 3 жил өмнө
parent
commit
b661c73091

+ 1 - 1
Pika/core/coreConfig/pikaConfig.h

@@ -42,7 +42,7 @@
 
 #define PIKA_REMOVE_OPTIONAL_NOVALUE_CHECKS_IN_PRODUCTION 1
 
-#define PIKA_REMOVE_EDITOR_IN_PRODUCATION 1
+#define PIKA_REMOVE_EDITOR_IN_PRODUCATION 0 //todo remove this, just keep the console or sthing
 
 #define PIKA_REMOVE_PUSH_NOTIFICATION_IN_PRODUCTION 0
 

+ 2 - 10
Pika/core/pikaRuntime/containerManager/containerManager.cpp

@@ -242,7 +242,7 @@ void pika::ContainerManager::init()
 }
 
 void pika::ContainerManager::update(pika::LoadedDll &loadedDll, pika::PikaWindow &window,
-	pika::LogManager &logs, pika::pikaImgui::ImGuiIdsManager &imguiIdManager, pika::ConsoleWindow *console)
+	pika::LogManager &logs, pika::pikaImgui::ImGuiIdsManager &imguiIdManager)
 {
 	PIKA_DEVELOPMENT_ONLY_ASSERT(loadedDll.dllHand != 0, "dll not loaded when trying to update containers");
 
@@ -369,16 +369,8 @@ void pika::ContainerManager::update(pika::LoadedDll &loadedDll, pika::PikaWindow
 
 			auto callUpdate = [&](pika::WindowState &windowState)
 			{
-
-				std::stringstream buf;
-
 				loadedDll.bindAllocatorDllRealm(&c.second.allocator);
-				{
-					loadedDll.setConsoleBuffer_(buf.rdbuf());
-					c.second.pointer->update(windowInput, windowState, c.second.requestedContainerInfo);
-					loadedDll.setConsoleBuffer_(nullptr); //reset console buffer
-					
-				}
+				c.second.pointer->update(windowInput, windowState, c.second.requestedContainerInfo);
 				loadedDll.resetAllocatorDllRealm();
 			};
 

+ 1 - 2
Pika/core/pikaRuntime/containerManager/containerManager.h

@@ -55,8 +55,7 @@ namespace pika
 			pika::LoadedDll &loadedDll,
 			pika::PikaWindow &window,
 			pika::LogManager &logs,
-			pika::pikaImgui::ImGuiIdsManager &imguiIdManager,
-			pika::ConsoleWindow *console);
+			pika::pikaImgui::ImGuiIdsManager &imguiIdManager);
 
 		void reloadDll(pika::LoadedDll &loadedDll,
 			pika::PikaWindow &window,

+ 0 - 3
Pika/core/pikaRuntime/dllLoader/dllLoader.cpp

@@ -141,7 +141,6 @@ bool pika::LoadedDll::loadDll(int id, pika::LogManager &logs)
 	bindAllocator_ = (bindAllocator_t *)GetProcAddress(dllHand, "bindAllocator");
 	resetAllocator_ = (resetAllocator_t *)GetProcAddress(dllHand, "resetAllocator");
 	dissableAllocators_ = (dissableAllocators_t *)GetProcAddress(dllHand, "dissableAllocators");
-	setConsoleBuffer_ = (setConsoleBuffer_t *)GetProcAddress(dllHand, "setConsoleBuffer");
 
 	if (!gameplayStart_) { return false; }
 	if (!gameplayReload_) { return false; }
@@ -151,7 +150,6 @@ bool pika::LoadedDll::loadDll(int id, pika::LogManager &logs)
 	if (!bindAllocator_) { return false; }
 	if (!resetAllocator_) { return false; }
 	if (!dissableAllocators_) { return false; }
-	if (!setConsoleBuffer_) { return false; }
 
 	//get container info
 	getContainerInfoAndCheck(logs);
@@ -262,7 +260,6 @@ bool pika::LoadedDll::loadDll(int id, pika::LogManager &logs)
 	bindAllocator_ = bindAllocator;
 	resetAllocator_ = resetAllocator;
 	dissableAllocators_ = dissableAllocators;
-	setConsoleBuffer_ = setConsoleBuffer;
 	getContainerInfoAndCheck(logs);
 	this->id = id;
 

+ 0 - 4
Pika/core/pikaRuntime/dllLoader/dllLoader.h

@@ -43,9 +43,6 @@ typedef RESETALLOCATOR(resetAllocator_t)
 typedef DISSABLEALLOCATORS(dissableAllocators_t)
 #undef DISSABLEALLOCATORS
 
-#define SETCONSOLEBUFFER(x) void x(std::streambuf *buf);
-typedef SETCONSOLEBUFFER(setConsoleBuffer_t)
-#undef SETCONSOLEBUFFER
 
 
 
@@ -69,7 +66,6 @@ struct LoadedDll
 	bindAllocator_t *bindAllocator_ = {};
 	resetAllocator_t *resetAllocator_ = {};
 	dissableAllocators_t *dissableAllocators_ = {};
-	setConsoleBuffer_t *setConsoleBuffer_ = {};
 
 #ifdef PIKA_WINDOWS
 	FILETIME filetime = {};

+ 1 - 6
Pika/core/pikaRuntime/pikaMain.cpp

@@ -227,12 +227,7 @@ int main()
 		}
 	#endif
 
-	#if !PIKA_SHOULD_REMOVE_EDITOR
-		containerManager.update(loadedDll, window, logs, imguiIdsManager, &editor.consoleWindow);
-	#else
-		containerManager.update(loadedDll, window, logs, imguiIdsManager, nullptr);
-	#endif
-
+	containerManager.update(loadedDll, window, logs, imguiIdsManager);
 
 	#pragma endregion
 

BIN
Pika/engineResources/engineSaves/window1.bin


BIN
Pika/engineResources/engineSaves/window2.bin


+ 0 - 26
Pika/gameplay/dll/dllMain.cpp

@@ -73,32 +73,6 @@ PIKA_API void gameplayStart(pika::PikaContext &pikaContext)
 }
 
 
-static std::streambuf *old = 0;
-
-PIKA_API void setConsoleBuffer(std::streambuf *buf)
-{
-	if (buf) 
-	{
-		if (old == nullptr)
-		{
-			old = std::cout.rdbuf(buf);
-		}
-		else
-		{
-			std::cout.rdbuf(buf);
-		}
-	}
-	else
-	{
-		if (old) 
-		{
-			std::cout.rdbuf(old);
-		}
-	}
-	
-}
-
-
 //this won't be ever called in production so we can remove the code
 PIKA_API void gameplayReload(pika::PikaContext &pikaContext)
 {

+ 3 - 1
Pika/resources/logs.txt

@@ -1 +1,3 @@
-#2022-10-23 12:55:15: Created container: Gameplay
+#2022-10-23 13:01:27: Created container: Gameplay
+#2022-10-23 13:02:01: Reloaded dll
+#2022-10-23 13:02:08: Destroyed continer: Gameplay #1