immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edge camera speed fix

dev-time-step
krzys-h 2016-02-19 17:22:20 +01:00
parent b15666f48e
commit 700f3ad448
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/engine/camera.cpp
View File

@ -1133,6 +1133,9 @@ bool CCamera::EventMouseMove(const Event &event)
if (m_mouseDeltaEdge.y < 0.0f) if (m_mouseDeltaEdge.y < 0.0f)
m_engine->SetMouseType(ENG_MOUSE_SCROLLD); m_engine->SetMouseType(ENG_MOUSE_SCROLLD);
} }
m_mouseDeltaEdge.x /= 2*Math::PI;
m_mouseDeltaEdge.y /= Math::PI;
} }
m_mousePos = event.mousePos; m_mousePos = event.mousePos;
@ -1315,12 +1318,14 @@ bool CCamera::EventFrameEdit(const Event &event)
{ {
float factor = m_editHeight * 0.5f + 30.0f; float factor = m_editHeight * 0.5f + 30.0f;
m_directionH -= m_mouseDelta.x * 2*Math::PI; m_directionH -= m_mouseDelta.x * 0.7f * 2*Math::PI;
m_eyePt = Math::LookatPoint(m_eyePt, m_directionH, m_directionV, m_mouseDelta.y * factor * m_speed); m_eyePt = Math::LookatPoint(m_eyePt, m_directionH, m_directionV, m_mouseDelta.y * factor * m_speed);
m_mouseDelta.LoadZero();
m_fixDirectionH += m_mouseDelta.x * 2*Math::PI;
m_fixDirectionH = Math::NormAngle(m_fixDirectionH); m_fixDirectionH = Math::NormAngle(m_fixDirectionH);
m_mouseDelta.LoadZero();
m_terrain->AdjustToBounds(m_eyePt, 10.0f); m_terrain->AdjustToBounds(m_eyePt, 10.0f);
if (m_terrain->AdjustToFloor(m_eyePt, false)) if (m_terrain->AdjustToFloor(m_eyePt, false))