diff --git a/Engine.cpp b/Engine.cpp index 778e8a9..4278cb7 100644 --- a/Engine.cpp +++ b/Engine.cpp @@ -176,9 +176,6 @@ void Engine::drawAxisLines() m_AxisFont->draw(L"Z+", rect(textPos, textSize), SColor(255, 0, 0, 255), true, true); } - //delete xMaterial; - //delete yMaterial; - //delete zMaterial; } } diff --git a/UserInterface.cpp b/UserInterface.cpp index be88032..b6ab0c0 100644 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -160,7 +160,7 @@ void UserInterface::setupUserInterface() y += size_y + spacing_y; axisSizeStaticText = m_Gui->addStaticText( L"Axis Size:", - rect(vector2d(spacing_x, y) + rect(vector2d(spacing_x, y), dimension2d(size_x, size_y)), true, true, diff --git a/View.cpp b/View.cpp index c095599..41115ac 100644 --- a/View.cpp +++ b/View.cpp @@ -184,7 +184,8 @@ bool View::OnEvent(const SEvent& event) vector3df offsetVec3( m_Engine->m_CamPos.X - m_Engine->m_CamTarget.X, m_Engine->m_CamPos.Y - m_Engine->m_CamTarget.Y, - m_Engine->m_CamPos.Z - m_Engine->m_CamTarget.Z); + m_Engine->m_CamPos.Z - m_Engine->m_CamTarget.Z + ); f32 distanceDelta = mouseEvent->Wheel * -1 * (offsetVec3.getLength() / 10); ICameraSceneNode* camera = m_Engine->m_Scene->getActiveCamera(); @@ -210,7 +211,12 @@ bool View::OnEvent(const SEvent& event) // m_Pitch = asin(offsetVec3.Y); // m_CameraDistance = Utility::distance(m_Engine->m_CamPos, m_Engine->m_CamTarget); - m_CameraDistance += distanceDelta; + if (m_CameraDistance + distanceDelta > 0.0001f) { + m_CameraDistance += distanceDelta; + } + else { + m_CameraDistance /= 2; + } setNewCameraPosition(); debug() << "m_CamPos: " << m_Engine->m_CamPos.X << "," << m_Engine->m_CamPos.Y