Possible fix to a 2D camera bug

Natashi · Jan 21, 2021 · 27d2b6a · 27d2b6a
1 parent 10c0005
commit 27d2b6a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/source/GcLib/directx/DirectGraphics.hpp b/source/GcLib/directx/DirectGraphics.hpp
@@ -357,6 +357,11 @@ namespace directx {
 
 		void SetResetFocus(gstd::ref_count_ptr<D3DXVECTOR2>& pos) { posReset_ = pos; }
 		void Reset();
+		void ResetAll() {
+			posReset_ = nullptr;
+			Reset();
+		}
+
 		inline D3DXVECTOR2 GetLeftTopPosition();
 		inline static D3DXVECTOR2 GetLeftTopPosition(const D3DXVECTOR2& focus, float ratio);
 		inline static D3DXVECTOR2 GetLeftTopPosition(const D3DXVECTOR2& focus, float ratioX, float ratioY);

diff --git a/source/TouhouDanmakufu/DnhExecutor/System.cpp b/source/TouhouDanmakufu/DnhExecutor/System.cpp
@@ -166,7 +166,7 @@ void SceneManager::TransStgScene(ref_count_ptr<ScriptInformation> infoMain, ref_
 		Logger::WriteTop(e.what());
 
 		DirectGraphics* graphics = DirectGraphics::GetBase();
-		graphics->GetCamera2D()->Reset();
+		graphics->GetCamera2D()->ResetAll();
 
 		SystemController* system = SystemController::GetInstance();
 		system->ShowErrorDialog(e.what());
@@ -214,7 +214,7 @@ void SceneManager::TransStgScene(ref_count_ptr<ScriptInformation> infoMain, ref_
 		Logger::WriteTop(e.what());
 
 		DirectGraphics* graphics = DirectGraphics::GetBase();
-		graphics->GetCamera2D()->Reset();
+		graphics->GetCamera2D()->ResetAll();
 
 		SystemController* system = SystemController::GetInstance();
 		system->ShowErrorDialog(e.what());
@@ -261,7 +261,7 @@ void SceneManager::TransPackageScene(ref_count_ptr<ScriptInformation> infoMain,
 		Logger::WriteTop(e.what());
 
 		DirectGraphics* graphics = DirectGraphics::GetBase();
-		graphics->GetCamera2D()->Reset();
+		graphics->GetCamera2D()->ResetAll();
 
 		SystemController* system = SystemController::GetInstance();
 		system->ShowErrorDialog(e.what());