sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into nazara-next

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-08-27 20:12:36 +02:00
parent 056b78c2f7 ee3b5347b8
commit b2a7e620e0
21 changed files with 617 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/Particles/SpacebattleDemo.cpp
View File

@@ -674,10 +674,14 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
Nz::Boxf introAABB = introGfx.GetAABB();
introNode.SetPosition(cannonNode.GetForward() * 500.f + introNode.GetLeft() * introAABB.width / 2.f + introNode.GetUp() * introAABB.height / 2.f);
Nz::Mouse::SetRelativeMouseMode(true);
}
void SpacebattleExample::Leave(Ndk::StateMachine& fsm)
{
Nz::Mouse::SetRelativeMouseMode(false);
m_ambientMusic.Stop();
m_onMouseMoved.Disconnect();
if (m_shared.target)
@@ -836,7 +840,4 @@ void SpacebattleExample::OnMouseMoved(const Nz::EventHandler* /*eventHandler*/,
m_turretCannonBaseRotation = Nz::Clamp(m_turretCannonBaseRotation + speed * event.deltaY, -65.f, 40.f);
m_turretBaseRotation -= event.deltaX * speed;
Nz::Vector2ui size = m_shared.target->GetSize();
Nz::Mouse::SetPosition(size.x / 2, size.y / 2, *m_shared.target);
}