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

Fix demo compilation and warnings

This commit is contained in:
Lynix 2017-10-10 21:08:16 +02:00
parent c5f7b36df1
commit bddc03c228
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Particles/LogoDemo.cpp
View File

@ -231,7 +231,7 @@ bool LogoExample::Update(Ndk::StateMachine& fsm, float elapsedTime)
ParticleData* sprite = static_cast<ParticleData*>(m_particles); ParticleData* sprite = static_cast<ParticleData*>(m_particles);
for (std::size_t i = 0; i < m_pixels.size(); ++i) for (std::size_t i = 0; i < m_pixels.size(); ++i)
{ {
Nz::Vector2f particleToMouse = sprite[i].position - controller->actualMousePos; Nz::Vector2f particleToMouse = Nz::Vector2f(sprite[i].position) - controller->actualMousePos;
float sqDist = particleToMouse.GetSquaredLength(); float sqDist = particleToMouse.GetSquaredLength();
if (sqDist < 10000.f) if (sqDist < 10000.f)
{ {

6
include/Nazara/Utility/Algorithm.inl
View File

@ -1,4 +1,6 @@
#pragma once // Copyright (C) 2017 Jérôme Leclercq
// This file is part of the "Nazara Engine - Utility module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/Algorithm.hpp> #include <Nazara/Utility/Algorithm.hpp>
#include <Nazara/Utility/Debug.hpp> #include <Nazara/Utility/Debug.hpp>
@ -42,4 +44,4 @@ namespace Nz
} }
} }
#include <Nazara/Graphics/DebugOff.hpp> #include <Nazara/Utility/DebugOff.hpp>