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

Move warning fixes!

This commit is contained in:
Lynix 2017-09-30 15:23:05 +02:00
parent 8569d7da88
commit bccbc0dbf1
7 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SDK/include/NDK/Widgets/TextAreaWidget.inl
View File

@ -71,13 +71,13 @@ namespace Ndk
inline void TextAreaWidget::MoveCursor(const Nz::Vector2i& offset) inline void TextAreaWidget::MoveCursor(const Nz::Vector2i& offset)
{ {
auto BoundOffset = [] (unsigned int cursorPosition, int offset) -> unsigned int auto BoundOffset = [] (unsigned int cursorPosition, int cursorOffset) -> unsigned int
{ {
if (offset >= 0) if (cursorOffset >= 0)
return cursorPosition + offset; return cursorPosition + cursorOffset;
else else
{ {
unsigned int nOffset = static_cast<unsigned int>(-offset); unsigned int nOffset = static_cast<unsigned int>(-cursorOffset);
if (nOffset >= cursorPosition) if (nOffset >= cursorPosition)
return 0; return 0;
else else

7
SDK/src/NDK/Widgets/TextAreaWidget.cpp
View File

@ -173,10 +173,13 @@ namespace Ndk
MoveCursor({0, -1}); MoveCursor({0, -1});
break; break;
} }
default:
break;
} }
} }
void TextAreaWidget::OnKeyReleased(const Nz::WindowEvent::KeyEvent& key) void TextAreaWidget::OnKeyReleased(const Nz::WindowEvent::KeyEvent& /*key*/)
{ {
} }
@ -195,7 +198,7 @@ namespace Ndk
} }
} }
void TextAreaWidget::OnMouseMoved(int x, int y, int deltaX, int deltaY) void TextAreaWidget::OnMouseMoved(int x, int y, int /*deltaX*/, int /*deltaY*/)
{ {
} }

6
examples/Particles/Common.cpp
View File

@ -11,7 +11,7 @@ m_name(name)
{ {
} }
void ParticleDemo::Enter(Ndk::StateMachine& fsm) void ParticleDemo::Enter(Ndk::StateMachine& /*fsm*/)
{ {
m_shared.demoName->Update(Nz::SimpleTextDrawer::Draw(Nz::String::Number(m_index+1) + " - " + m_name, 48)); m_shared.demoName->Update(Nz::SimpleTextDrawer::Draw(Nz::String::Number(m_index+1) + " - " + m_name, 48));
m_fpsCounter = 0; m_fpsCounter = 0;
@ -23,7 +23,7 @@ void ParticleDemo::Enter(Ndk::StateMachine& fsm)
m_oldBackground3D = renderSystem3D.GetDefaultBackground(); m_oldBackground3D = renderSystem3D.GetDefaultBackground();
} }
void ParticleDemo::Leave(Ndk::StateMachine& fsm) void ParticleDemo::Leave(Ndk::StateMachine& /*fsm*/)
{ {
m_shared.world2D->GetSystem<Ndk::RenderSystem>().SetDefaultBackground(m_oldBackground2D); m_shared.world2D->GetSystem<Ndk::RenderSystem>().SetDefaultBackground(m_oldBackground2D);
m_shared.world3D->GetSystem<Ndk::RenderSystem>().SetDefaultBackground(m_oldBackground3D); m_shared.world3D->GetSystem<Ndk::RenderSystem>().SetDefaultBackground(m_oldBackground3D);
@ -32,7 +32,7 @@ void ParticleDemo::Leave(Ndk::StateMachine& fsm)
m_particleGroups.clear(); m_particleGroups.clear();
} }
bool ParticleDemo::Update(Ndk::StateMachine& fsm, float elapsedTime) bool ParticleDemo::Update(Ndk::StateMachine& /*fsm*/, float elapsedTime)
{ {
m_fpsCounter++; m_fpsCounter++;
if (m_updateClock.GetMilliseconds() > 1000) if (m_updateClock.GetMilliseconds() > 1000)

61
examples/Particles/SpacebattleDemo.cpp
View File

@ -318,10 +318,10 @@ ParticleDemo("Space battle", sharedData)
m_spaceshipTemplate = m_shared.world3D->CreateEntity(); m_spaceshipTemplate = m_shared.world3D->CreateEntity();
m_spaceshipTemplate->Enable(false); m_spaceshipTemplate->Enable(false);
m_spaceshipTemplate->AddComponent<Ndk::NodeComponent>();
m_spaceshipTemplate->AddComponent<Ndk::VelocityComponent>();
m_spaceshipTemplate->AddComponent<SpaceshipComponent>();
auto& gfxComponent = m_spaceshipTemplate->AddComponent<Ndk::GraphicsComponent>(); auto& gfxComponent = m_spaceshipTemplate->AddComponent<Ndk::GraphicsComponent>();
auto& nodeComponent = m_spaceshipTemplate->AddComponent<Ndk::NodeComponent>();
auto& velocityComponent = m_spaceshipTemplate->AddComponent<Ndk::VelocityComponent>();
auto& spaceshipComponent = m_spaceshipTemplate->AddComponent<SpaceshipComponent>();
gfxComponent.Attach(&m_spaceshipModel); gfxComponent.Attach(&m_spaceshipModel);
m_ambientMusic.OpenFromFile("resources/ambience.ogg"); m_ambientMusic.OpenFromFile("resources/ambience.ogg");
@ -386,9 +386,7 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
m_torpedoGroup->AddController(Nz::ParticleFunctionController::New([this] (Nz::ParticleGroup& group, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) m_torpedoGroup->AddController(Nz::ParticleFunctionController::New([this] (Nz::ParticleGroup& group, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime)
{ {
auto positionPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Position); auto positionPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Position);
auto rotationPtr = mapper.GetComponentPtr<float>(Nz::ParticleComponent_Rotation);
auto sizePtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Size); auto sizePtr = mapper.GetComponentPtr<Nz::Vector2f>(Nz::ParticleComponent_Size);
auto velocityPtr = mapper.GetComponentPtr<Nz::Vector3f>(Nz::ParticleComponent_Velocity);
auto& spaceshipSystem = m_shared.world3D->GetSystem<SpaceshipSystem>(); auto& spaceshipSystem = m_shared.world3D->GetSystem<SpaceshipSystem>();
@ -422,7 +420,7 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
emitter.SetEmissionCount(2); emitter.SetEmissionCount(2);
emitter.SetEmissionRate(200.f); emitter.SetEmissionRate(200.f);
emitter.SetSetupFunc([this] (const Ndk::EntityHandle& entity, Nz::ParticleMapper& mapper, unsigned int count) emitter.SetSetupFunc([this] (const Ndk::EntityHandle& emitter, Nz::ParticleMapper& particleMapper, unsigned int count)
{ {
auto& gen = m_shared.randomGen; auto& gen = m_shared.randomGen;
@ -434,29 +432,29 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
std::uniform_real_distribution<float> sizeDis(1.0f, 4.f); std::uniform_real_distribution<float> sizeDis(1.0f, 4.f);
std::uniform_real_distribution<float> velDis(-maxFireVel, maxFireVel); std::uniform_real_distribution<float> velDis(-maxFireVel, maxFireVel);
Nz::Vector3f pos = entity->GetComponent<Ndk::NodeComponent>().GetPosition(); Nz::Vector3f pos = emitter->GetComponent<Ndk::NodeComponent>().GetPosition();
Nz::ParticleStruct_Billboard* billboards = static_cast<Nz::ParticleStruct_Billboard*>(mapper.GetPointer()); Nz::ParticleStruct_Billboard* billboards = static_cast<Nz::ParticleStruct_Billboard*>(particleMapper.GetPointer());
Nz::ParticleStruct_Billboard* smokeParticles = static_cast<Nz::ParticleStruct_Billboard*>(m_smokeGroup->CreateParticles(count)); Nz::ParticleStruct_Billboard* smokeParticles = static_cast<Nz::ParticleStruct_Billboard*>(m_smokeGroup->CreateParticles(count));
for (unsigned int i = 0; i < count; ++i) for (unsigned int j = 0; j < count; ++j)
{ {
billboards[i].color = Nz::Color::White; billboards[j].color = Nz::Color::White;
billboards[i].life = 1.f + lifeDis(gen); billboards[j].life = 1.f + lifeDis(gen);
billboards[i].position = pos + Nz::Vector3f(posDis(gen), posDis(gen), posDis(gen)); billboards[j].position = pos + Nz::Vector3f(posDis(gen), posDis(gen), posDis(gen));
billboards[i].rotation = rotDis(gen); billboards[j].rotation = rotDis(gen);
billboards[i].size = {1.28f, 1.28f}; billboards[j].size = {1.28f, 1.28f};
billboards[i].size *= sizeDis(gen); billboards[j].size *= sizeDis(gen);
billboards[i].velocity.Set(normalDis(gen), normalDis(gen), normalDis(gen)); billboards[j].velocity.Set(normalDis(gen), normalDis(gen), normalDis(gen));
billboards[i].velocity.Normalize(); billboards[j].velocity.Normalize();
billboards[i].velocity *= velDis(gen); billboards[j].velocity *= velDis(gen);
smokeParticles[i].color = Nz::Color(128, 128, 128, 0); smokeParticles[j].color = Nz::Color(128, 128, 128, 0);
smokeParticles[i].life = maxSmokeLife; smokeParticles[j].life = maxSmokeLife;
smokeParticles[i].position = billboards[i].position; smokeParticles[j].position = billboards[j].position;
smokeParticles[i].rotation = billboards[i].rotation; smokeParticles[j].rotation = billboards[j].rotation;
smokeParticles[i].size = {2.56f, 2.56f}; smokeParticles[j].size = {2.56f, 2.56f};
smokeParticles[i].size *= sizeDis(gen); smokeParticles[j].size *= sizeDis(gen);
smokeParticles[i].velocity = billboards[i].velocity / 2.f; smokeParticles[j].velocity = billboards[j].velocity / 2.f;
} }
}); });
m_fireGroup->AddEmitter(entity); m_fireGroup->AddEmitter(entity);
@ -467,12 +465,11 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
} }
})); }));
m_torpedoGroup->SetRenderer(Nz::ParticleFunctionRenderer::New([sparkleMat1 = Nz::MaterialLibrary::Get("TorpedoFlare1")] (const Nz::ParticleGroup& group, const Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, Nz::AbstractRenderQueue* renderQueue) m_torpedoGroup->SetRenderer(Nz::ParticleFunctionRenderer::New([sparkleMat1 = Nz::MaterialLibrary::Get("TorpedoFlare1")] (const Nz::ParticleGroup& /*group*/, const Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, Nz::AbstractRenderQueue* renderQueue)
{ {
auto positionPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Position); auto positionPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Position);
auto rotationPtr = mapper.GetComponentPtr<const float>(Nz::ParticleComponent_Rotation); auto rotationPtr = mapper.GetComponentPtr<const float>(Nz::ParticleComponent_Rotation);
auto sizePtr = mapper.GetComponentPtr<const Nz::Vector2f>(Nz::ParticleComponent_Size); auto sizePtr = mapper.GetComponentPtr<const Nz::Vector2f>(Nz::ParticleComponent_Size);
auto velocityPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Velocity);
renderQueue->AddBillboards(0, sparkleMat1, endId - startId + 1, positionPtr, sizePtr, rotationPtr); renderQueue->AddBillboards(0, sparkleMat1, endId - startId + 1, positionPtr, sizePtr, rotationPtr);
for (unsigned int i = startId; i <= endId; ++i) for (unsigned int i = startId; i <= endId; ++i)
@ -581,7 +578,7 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
}); });
m_fireGroup->AddController(movementController); m_fireGroup->AddController(movementController);
m_fireGroup->AddController(Nz::ParticleFunctionController::New([] (Nz::ParticleGroup& group, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) m_fireGroup->AddController(Nz::ParticleFunctionController::New([] (Nz::ParticleGroup& /*group*/, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime)
{ {
auto colorPtr = mapper.GetComponentPtr<Nz::Color>(Nz::ParticleComponent_Color); auto colorPtr = mapper.GetComponentPtr<Nz::Color>(Nz::ParticleComponent_Color);
auto lifePtr = mapper.GetComponentPtr<float>(Nz::ParticleComponent_Life); auto lifePtr = mapper.GetComponentPtr<float>(Nz::ParticleComponent_Life);
@ -592,7 +589,7 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
})); }));
m_smokeGroup->AddController(movementController); m_smokeGroup->AddController(movementController);
m_smokeGroup->AddController(Nz::ParticleFunctionController::New([] (Nz::ParticleGroup& group, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) m_smokeGroup->AddController(Nz::ParticleFunctionController::New([] (Nz::ParticleGroup& /*group*/, Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime)
{ {
auto colorPtr = mapper.GetComponentPtr<Nz::Color>(Nz::ParticleComponent_Color); auto colorPtr = mapper.GetComponentPtr<Nz::Color>(Nz::ParticleComponent_Color);
auto lifePtr = mapper.GetComponentPtr<float>(Nz::ParticleComponent_Life); auto lifePtr = mapper.GetComponentPtr<float>(Nz::ParticleComponent_Life);
@ -618,7 +615,7 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
smokeMat->SetDiffuseColor(Nz::Color(128, 128, 128)); smokeMat->SetDiffuseColor(Nz::Color(128, 128, 128));
smokeMat->SetDiffuseMap("resources/smoke.png"); smokeMat->SetDiffuseMap("resources/smoke.png");
m_fireGroup->SetRenderer(Nz::ParticleFunctionRenderer::New([fireMat] (const Nz::ParticleGroup& group, const Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, Nz::AbstractRenderQueue* renderQueue) m_fireGroup->SetRenderer(Nz::ParticleFunctionRenderer::New([fireMat] (const Nz::ParticleGroup& /*group*/, const Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, Nz::AbstractRenderQueue* renderQueue)
{ {
auto colorPtr = mapper.GetComponentPtr<const Nz::Color>(Nz::ParticleComponent_Color); auto colorPtr = mapper.GetComponentPtr<const Nz::Color>(Nz::ParticleComponent_Color);
auto posPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Position); auto posPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Position);
@ -628,7 +625,7 @@ void SpacebattleExample::Enter(Ndk::StateMachine& fsm)
renderQueue->AddBillboards(0, fireMat, endId - startId + 1, posPtr, sizePtr, rotPtr, colorPtr); renderQueue->AddBillboards(0, fireMat, endId - startId + 1, posPtr, sizePtr, rotPtr, colorPtr);
})); }));
m_smokeGroup->SetRenderer(Nz::ParticleFunctionRenderer::New([smokeMat] (const Nz::ParticleGroup& group, const Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, Nz::AbstractRenderQueue* renderQueue) m_smokeGroup->SetRenderer(Nz::ParticleFunctionRenderer::New([smokeMat] (const Nz::ParticleGroup& /*group*/, const Nz::ParticleMapper& mapper, unsigned int startId, unsigned int endId, Nz::AbstractRenderQueue* renderQueue)
{ {
auto colorPtr = mapper.GetComponentPtr<const Nz::Color>(Nz::ParticleComponent_Color); auto colorPtr = mapper.GetComponentPtr<const Nz::Color>(Nz::ParticleComponent_Color);
auto posPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Position); auto posPtr = mapper.GetComponentPtr<const Nz::Vector3f>(Nz::ParticleComponent_Position);
@ -816,7 +813,7 @@ void SpacebattleExample::CreateTurret()
cannonGfx.Attach(&m_turret.cannonModel); cannonGfx.Attach(&m_turret.cannonModel);
} }
void SpacebattleExample::OnMouseMoved(const Nz::EventHandler* eventHandler, const Nz::WindowEvent::MouseMoveEvent& event) void SpacebattleExample::OnMouseMoved(const Nz::EventHandler* /*eventHandler*/, const Nz::WindowEvent::MouseMoveEvent& event)
{ {
const float speed = 0.1f; const float speed = 0.1f;

2
tests/Engine/Core/ByteArray.cpp
View File

@ -102,7 +102,7 @@ SCENARIO("ByteArray", "[CORE][BYTEARRAY]")
{ {
Nz::ByteArray abc("abc", 3); Nz::ByteArray abc("abc", 3);
Nz::ByteArray cba; Nz::ByteArray cba;
cba = std::move(Nz::ByteArray("cba", 3)); cba = Nz::ByteArray("cba", 3);
WHEN("We do some antagonists operations") WHEN("We do some antagonists operations")
{ {

2
tests/Engine/Platform/EventHandler/BaseState.cpp
View File

@ -17,7 +17,7 @@ BaseState::~BaseState()
{ {
} }
void BaseState::Enter(Ndk::StateMachine& fsm) void BaseState::Enter(Ndk::StateMachine& /*fsm*/)
{ {
m_text.SetVisible(true); m_text.SetVisible(true);
DrawMenu(); DrawMenu();

2
tests/Engine/Platform/EventHandler/MenuState.hpp
View File

@ -17,7 +17,7 @@ class MenuState : public BaseState
bool Update(Ndk::StateMachine& fsm, float elapsedTime) override; bool Update(Ndk::StateMachine& fsm, float elapsedTime) override;
private: private:
void DrawMenu(); void DrawMenu() override;
NazaraSlot(Nz::EventHandler, OnKeyPressed, m_keyPressedSlot); NazaraSlot(Nz::EventHandler, OnKeyPressed, m_keyPressedSlot);
int m_selectedNextState; int m_selectedNextState;