From f625b33d56f6a0ce98f03a24bf6cad8b5624ce07 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Fri, 3 Oct 2014 12:33:03 +0200
Subject: QtBiomeVisualiser: Zoom is now limited and aligned to steps.

---
 Tools/QtBiomeVisualiser/BiomeView.cpp | 78 +++++++++++------------------------
 1 file changed, 25 insertions(+), 53 deletions(-)

(limited to 'Tools/QtBiomeVisualiser/BiomeView.cpp')

diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index ce5a870cd..8d53c8626 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -80,6 +80,27 @@ void BiomeView::setChunkSource(std::shared_ptr<ChunkSource> a_ChunkSource)
 
 
 
+void BiomeView::setPosition(int a_BlockX, int a_BlockZ)
+{
+	m_X = a_BlockX;
+	m_Z = a_BlockZ;
+	redraw();
+}
+
+
+
+
+
+void BiomeView::setZoomLevel(double a_ZoomLevel)
+{
+	m_Zoom = a_ZoomLevel;
+	redraw();
+}
+
+
+
+
+
 void BiomeView::redraw()
 {
 	if (!hasData())
@@ -307,12 +328,12 @@ void BiomeView::wheelEvent(QWheelEvent * a_Event)
 	m_MouseWheelDelta += a_Event->delta();
 	while (m_MouseWheelDelta >= DELTA_STEP)
 	{
-		increaseZoom();
+		emit wheelUp();
 		m_MouseWheelDelta -= DELTA_STEP;
 	}
 	while (m_MouseWheelDelta <= -DELTA_STEP)
 	{
-		decreaseZoom();
+		emit wheelDown();
 		m_MouseWheelDelta += DELTA_STEP;
 	}
 }
@@ -360,14 +381,14 @@ void BiomeView::keyPressEvent(QKeyEvent * a_Event)
 		case Qt::Key_PageUp:
 		case Qt::Key_Q:
 		{
-			increaseZoom();
+			emit increaseZoom();
 			break;
 		}
 
 		case Qt::Key_PageDown:
 		case Qt::Key_E:
 		{
-			decreaseZoom();
+			emit decreaseZoom();
 			break;
 		}
 	}
@@ -376,52 +397,3 @@ void BiomeView::keyPressEvent(QKeyEvent * a_Event)
 
 
 
-
-void BiomeView::decreaseZoom()
-{
-	if (m_Zoom > 1.001)
-	{
-		m_Zoom--;
-		if (m_Zoom < 1.0)
-		{
-			// Just crossed the 100%, fixate the 100% threshold:
-			m_Zoom = 1.0;
-		}
-	}
-	else if (m_Zoom > 0.01)
-	{
-		m_Zoom = m_Zoom / 2;
-	}
-	redraw();
-}
-
-
-
-
-
-void BiomeView::increaseZoom()
-{
-	if (m_Zoom > 0.99)
-	{
-		if (m_Zoom > 20.0)
-		{
-			// Zoom too large
-			return;
-		}
-		m_Zoom++;
-	}
-	else
-	{
-		m_Zoom = m_Zoom * 2;
-		if (m_Zoom > 1.0)
-		{
-			// Just crossed the 100%, fixate the 100% threshold:
-			m_Zoom = 1.0;
-		}
-	}
-	redraw();
-}
-
-
-
-
-- 
cgit v1.2.3


From 0aa1b5667e0ba97101f60343323c595cc7866c6d Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Fri, 3 Oct 2014 19:41:42 +0200
Subject: QtBiomeVisualiser: Added mouse hover info.

---
 Tools/QtBiomeVisualiser/BiomeView.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'Tools/QtBiomeVisualiser/BiomeView.cpp')

diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index 8d53c8626..b44b935d7 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -42,8 +42,9 @@ BiomeView::BiomeView(QWidget * parent) :
 	// Add a chunk-update callback mechanism:
 	connect(&m_Cache, SIGNAL(chunkAvailable(int, int)), this, SLOT(chunkAvailable(int, int)));
 
-	// Allow keyboard interaction:
+	// Allow mouse and keyboard interaction:
 	setFocusPolicy(Qt::StrongFocus);
+	setMouseTracking(true);
 }
 
 
@@ -296,6 +297,12 @@ void BiomeView::mousePressEvent(QMouseEvent * a_Event)
 
 void BiomeView::mouseMoveEvent(QMouseEvent * a_Event)
 {
+	// If there's no data displayed, bail out:
+	if (!hasData())
+	{
+		return;
+	}
+
 	if (m_IsMouseDragging)
 	{
 		// The user is dragging the mouse, move the view around:
@@ -307,7 +314,15 @@ void BiomeView::mouseMoveEvent(QMouseEvent * a_Event)
 		return;
 	}
 
-	// TODO: Update the status bar info for the biome currently pointed at
+	// Update the status bar info text:
+	int blockX = floor((a_Event->x() - width()  / 2) / m_Zoom + m_X);
+	int blockZ = floor((a_Event->y() - height() / 2) / m_Zoom + m_Z);
+	int chunkX, chunkZ;
+	int relX = blockX, relY, relZ = blockZ;
+	cChunkDef::AbsoluteToRelative(relX, relY, relZ, chunkX, chunkZ);
+	auto chunk = m_Cache.fetch(chunkX, chunkZ);
+	int biome = (chunk.get() != nullptr) ? chunk->getBiome(relX, relZ) : biInvalidBiome;
+	emit hoverChanged(blockX, blockZ, biome);
 }
 
 
-- 
cgit v1.2.3