From 4ea4bcbcb31e88d5784d6854aaf9545dd98a2ebf Mon Sep 17 00:00:00 2001
From: turanszkij <turanszkij@gmail.com>
Date: Tue, 2 Apr 2019 19:05:46 +0100
Subject: [PATCH] middle mouse scroll update

---
 Editor/Editor.cpp              | 4 ++--
 Editor/MaterialWindow.cpp      | 9 ++++++---
 WickedEngine/MainComponent.cpp | 4 ++--
 WickedEngine/wiVersion.cpp     | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index 6025a790f..a1d596549 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -835,9 +835,9 @@ void EditorComponent::Update(float dt)
 				XMStoreFloat3(&vec, V);
 				cameraWnd->camera_target.Translate(vec);
 			}
-			else if (wiInputManager::down(VK_LCONTROL))
+			else if (wiInputManager::down(VK_LCONTROL) || currentMouse.z != 0.0f)
 			{
-				cameraWnd->camera_transform.Translate(XMFLOAT3(0, 0, yDif * 4));
+				cameraWnd->camera_transform.Translate(XMFLOAT3(0, 0, yDif * 4 + currentMouse.z));
 				camera.SetDirty();
 			}
 			else if(abs(xDif) + abs(yDif) > 0)
diff --git a/Editor/MaterialWindow.cpp b/Editor/MaterialWindow.cpp
index 19f7fd07d..3a5465815 100644
--- a/Editor/MaterialWindow.cpp
+++ b/Editor/MaterialWindow.cpp
@@ -24,7 +24,7 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui)
 	GUI->AddWidget(materialWindow);
 
 	materialNameField = new wiTextInputField("MaterialName");
-	materialNameField->SetPos(XMFLOAT2(10, 30));
+	materialNameField->SetPos(XMFLOAT2(10, 60));
 	materialNameField->SetSize(XMFLOAT2(300, 20));
 	materialNameField->OnInputAccepted([&](wiEventArgs args) {
 		NameComponent* name = wiRenderer::GetScene().names.GetComponent(entity);
@@ -35,8 +35,8 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui)
 	});
 	materialWindow->AddWidget(materialNameField);
 
-	float x = 540, y = 0;
-	float step = 35;
+	float x = 540, y = 30;
+	float step = 25;
 
 	waterCheckBox = new wiCheckBox("Water: ");
 	waterCheckBox->SetTooltip("Set material as special water material.");
@@ -98,6 +98,9 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui)
 	});
 	materialWindow->AddWidget(specularGlossinessCheckBox);
 
+
+	step = 35;
+
 	normalMapSlider = new wiSlider(0, 4, 1, 4000, "Normalmap: ");
 	normalMapSlider->SetTooltip("How much the normal map should distort the face normals (bumpiness).");
 	normalMapSlider->SetSize(XMFLOAT2(100, 30));
diff --git a/WickedEngine/MainComponent.cpp b/WickedEngine/MainComponent.cpp
index 4086eac23..1048240ba 100644
--- a/WickedEngine/MainComponent.cpp
+++ b/WickedEngine/MainComponent.cpp
@@ -124,8 +124,6 @@ void MainComponent::Run()
 	wiProfiler::BeginFrame();
 	wiProfiler::BeginRange("CPU Frame", wiProfiler::DOMAIN_CPU);
 
-	wiInputManager::Update();
-
 	deltaTime = float(max(0, timer.elapsed() / 1000.0));
 	timer.record();
 
@@ -175,6 +173,8 @@ void MainComponent::Run()
 		wiLua::GetGlobal()->SetDeltaTime(0);
 	}
 
+	wiInputManager::Update();
+
 	wiProfiler::BeginRange("Render", wiProfiler::DOMAIN_CPU);
 	Render();
 	wiProfiler::EndRange(); // Render
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index 5d1478ef5..f145942fe 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 25;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 7;
+	const int revision = 8;
 
 
 	long GetVersion()