Mouse done

chalonverse · chalonverse · commit 4c04879384e9 · 2017-11-29T20:33:53.000-08:00
diff --git a/Chapter08/Game.cpp b/Chapter08/Game.cpp
@@ -30,7 +30,7 @@ Game::Game()
 
 bool Game::Initialize()
 {
-	if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) != 0)
+	if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_GAMECONTROLLER) != 0)
 	{
 		SDL_Log("Unable to initialize SDL: %s", SDL_GetError());
 		return false;
@@ -122,6 +122,11 @@ void Game::ProcessInput()
 			case SDL_QUIT:
 				mIsRunning = false;
 				break;
+			case SDL_MOUSEWHEEL:
+				mInputSystem->ProcessEvent(event);
+				break;
+			default:
+				break;
 		}
 	}
 
diff --git a/Chapter08/InputSystem.cpp b/Chapter08/InputSystem.cpp
@@ -103,6 +103,7 @@ void InputSystem::PrepareForUpdate()
 	// Mouse
 	mState.Mouse.mPrevButtons = mState.Mouse.mCurrButtons;
 	mState.Mouse.mIsRelative = false;
+	mState.Mouse.mScrollWheel = Vector2::Zero;
 }
 
 void InputSystem::Update()
@@ -124,6 +125,20 @@ void InputSystem::Update()
 	mState.Mouse.mMousePos.y = static_cast<float>(y);
 }
 
+void InputSystem::ProcessEvent(SDL_Event& event)
+{
+	switch (event.type)
+	{
+	case SDL_MOUSEWHEEL:
+		mState.Mouse.mScrollWheel = Vector2(
+			static_cast<float>(event.wheel.x),
+			static_cast<float>(event.wheel.y));
+		break;
+	default:
+		break;
+	}
+}
+
 void InputSystem::SetRelativeMouseMode(bool value)
 {
 	SDL_bool set = value ? SDL_TRUE : SDL_FALSE;
diff --git a/Chapter08/InputSystem.h b/Chapter08/InputSystem.h
@@ -42,6 +42,7 @@ class MouseState
 
 	// For mouse position
 	const Vector2& GetPosition() const { return mMousePos; }
+	const Vector2& GetScrollWheel() const { return mScrollWheel; }
 	bool IsRelative() const { return mIsRelative; }
 
 	// For buttons
@@ -50,6 +51,8 @@ class MouseState
 private:
 	// Store current mouse position
 	Vector2 mMousePos;
+	// Motion of scroll wheel
+	Vector2 mScrollWheel;
 	// Store button data
 	Uint32 mCurrButtons;
 	Uint32 mPrevButtons;
@@ -74,6 +77,8 @@ class InputSystem
 	void PrepareForUpdate();
 	// Called after SDL_PollEvents loop
 	void Update();
+	// Called to process an SDL event in input system
+	void ProcessEvent(union SDL_Event& event);
 
 	const InputState& GetState() const { return mState; }
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ Game::Game()`
`30`	`30`
`31`	`31`	`bool Game::Initialize()`
`32`	`32`	`{`
`33`		`- if (SDL_Init(SDL_INIT_VIDEO\|SDL_INIT_AUDIO) != 0)`
	`33`	`+ if (SDL_Init(SDL_INIT_VIDEO\|SDL_INIT_AUDIO\|SDL_INIT_GAMECONTROLLER) != 0)`
`34`	`34`	`{`
`35`	`35`	`SDL_Log("Unable to initialize SDL: %s", SDL_GetError());`
`36`	`36`	`return false;`
`@@ -122,6 +122,11 @@ void Game::ProcessInput()`
`122`	`122`	`case SDL_QUIT:`
`123`	`123`	`mIsRunning = false;`
`124`	`124`	`break;`
	`125`	`+ case SDL_MOUSEWHEEL:`
	`126`	`+ mInputSystem->ProcessEvent(event);`
	`127`	`+ break;`
	`128`	`+ default:`
	`129`	`+ break;`
`125`	`130`	`}`
`126`	`131`	`}`
`127`	`132`