From 1f2b1cb037a202cafe25167c071a2615341dafdb Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 24 Feb 2019 14:07:16 +0100
Subject: Further abstract mouse handling

---
 src/main.cc | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

(limited to 'src/main.cc')

diff --git a/src/main.cc b/src/main.cc
index aa2456e..99e9a73 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -108,13 +108,17 @@ int renderWindow() {
 
 	auto pause_key = window.getKeyWatcher(GLFW_KEY_SPACE);
 
+	int prevMouseState = 0;
+	float prevLatticeMouseX;
+	float prevLatticeMouseY;
+
+	int currMouseState = 0;
+	float currLatticeMouseX;
+	float currLatticeMouseY;
+
 	auto tick_buffers = { lattice_a->getBuffer(), lattice_b->getBuffer(), fluid->getBuffer() };
 	auto tock_buffers = { lattice_b->getBuffer(), lattice_a->getBuffer(), fluid->getBuffer() };
 
-	int prevLatticeMouseState = 0;
-	int prevLatticeMouseX = 0;
-	int prevLatticeMouseY = 0;
-
 	window.render([&](bool window_size_changed) {
 		if ( pause_key.wasClicked() ) {
 			update_lattice = !update_lattice;
@@ -139,24 +143,28 @@ int renderWindow() {
 					tick = true;
 				}
 
-				/// Handle mouse-based interaction
-				const auto m = window.getMouse();
+				/// Update mouse projection
+				{
+					const auto m = window.getMouse();
 
-				if ( std::get<0>(m) != 0 || prevLatticeMouseState != 0 ) {
-					auto guard = interact_shader->use();
+					prevMouseState = currMouseState;
+					prevLatticeMouseX = currLatticeMouseX;
+					prevLatticeMouseY = currLatticeMouseY;
 
-					interact_shader->setUniform("prevMouseState", prevLatticeMouseState);
-					interact_shader->setUniform("prevMousePos", prevLatticeMouseX, prevLatticeMouseY);
+					currMouseState = std::get<0>(m);
+					currLatticeMouseX = float(std::get<1>(m)) / window.getWidth()  * world_width  + nX/2;
+					currLatticeMouseY = float(std::get<2>(m)) / window.getHeight() * world_height + nY/2;
+				}
 
-					const float latticeMouseX = float(std::get<1>(m)) / window.getWidth()  * world_width  + nX/2;
-					const float latticeMouseY = float(std::get<2>(m)) / window.getHeight() * world_height + nY/2;
+				/// Handle mouse-based interaction
+				if ( currMouseState != 0 || prevMouseState != 0 ) {
+					auto guard = interact_shader->use();
 
-					interact_shader->setUniform("currMouseState", std::get<0>(m));
-					interact_shader->setUniform("currMousePos", latticeMouseX, latticeMouseY);
+					interact_shader->setUniform("influxRequested", currMouseState == 1);
+					interact_shader->setUniform("wallRequested",   currMouseState == 2);
 
-					prevLatticeMouseState = std::get<0>(m);
-					prevLatticeMouseX = latticeMouseX;
-					prevLatticeMouseY = latticeMouseY;
+					interact_shader->setUniform("startOfLine", prevLatticeMouseX, prevLatticeMouseY);
+					interact_shader->setUniform("endOfLine", currLatticeMouseX, currLatticeMouseY);
 
 					interact_shader->dispatch(nX, nY);
 				}
-- 
cgit v1.2.3