Lock input during launch animation.

Aloshi · Dec 13, 2013 · 1398785 · 1398785
1 parent 7e9b20f
commit 1398785
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/views/ViewController.cpp b/src/views/ViewController.cpp
@@ -10,7 +10,7 @@
 #include "../animations/LambdaAnimation.h"
 
 ViewController::ViewController(Window* window)
-	: GuiComponent(window), mCurrentView(nullptr), mCamera(Eigen::Affine3f::Identity()), mFadeOpacity(1)
+	: GuiComponent(window), mCurrentView(nullptr), mCamera(Eigen::Affine3f::Identity()), mFadeOpacity(1), mLockInput(false)
 {
 	// slot 1 so the fade carries over
 	setAnimation(new LambdaAnimation([&] (float t) { mFadeOpacity = lerp<float>(1.0f, 0.0f, t); }, 900), nullptr, false, 1);
@@ -105,10 +105,12 @@ void ViewController::launch(FileData* game, Eigen::Vector3f center)
 
 	center += mCurrentView->getPosition();
 	stopAnimation(1); // make sure the fade in isn't still playing
+	mLockInput = true;
 	setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 1500), [this, origCamera, center, game] 
 	{
 		game->getSystem()->launchGame(mWindow, game);
 		mCamera = origCamera;
+		mLockInput = false;
 		setAnimation(new LaunchAnimation(mCamera, mFadeOpacity, center, 600), nullptr, true);
 	});
 }
@@ -171,6 +173,9 @@ std::shared_ptr<SystemListView> ViewController::getSystemListView()
 
 bool ViewController::input(InputConfig* config, Input input)
 {
+	if(mLockInput)
+		return true;
+
 	if(mCurrentView)
 		return mCurrentView->input(config, input);
 

diff --git a/src/views/ViewController.h b/src/views/ViewController.h
@@ -64,6 +64,7 @@ class ViewController : public GuiComponent
 
 	Eigen::Affine3f mCamera;
 	float mFadeOpacity;
+	bool mLockInput;
 
 	State mState;
 };