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

Improve PhysicsDemo a bit

This commit is contained in:
SirLynix 2022-10-31 22:44:37 +01:00
parent ab154819a7
commit 1f4bc24685
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
examples/PhysicsDemo/main.cpp
View File

@ -42,7 +42,7 @@ int main()
Nz::MeshParams meshParams; Nz::MeshParams meshParams;
meshParams.center = true; meshParams.center = true;
meshParams.vertexRotation = Nz::EulerAnglesf(0.f, -90.f, 0.f); meshParams.vertexRotation = Nz::EulerAnglesf(0.f, 90.f, 0.f);
meshParams.vertexScale = Nz::Vector3f(0.002f); meshParams.vertexScale = Nz::Vector3f(0.002f);
meshParams.vertexDeclaration = Nz::VertexDeclaration::Get(Nz::VertexLayout::XYZ_Normal_UV_Tangent); meshParams.vertexDeclaration = Nz::VertexDeclaration::Get(Nz::VertexLayout::XYZ_Normal_UV_Tangent);
@ -64,6 +64,15 @@ int main()
texParams.loadFormat = Nz::PixelFormat::RGBA8_SRGB; texParams.loadFormat = Nz::PixelFormat::RGBA8_SRGB;
std::shared_ptr<Nz::MaterialInstance> material = Nz::Graphics::Instance()->GetDefaultMaterials().phongMaterial->CreateInstance(); std::shared_ptr<Nz::MaterialInstance> material = Nz::Graphics::Instance()->GetDefaultMaterials().phongMaterial->CreateInstance();
for (std::string_view passName : { "DepthPass", "ForwardPass" })
{
material->UpdatePassStates(passName, [](Nz::RenderStates& states)
{
states.depthClamp = true;
return true;
});
}
material->SetTextureProperty("AlphaMap", Nz::Texture::LoadFromFile(resourceDir / "alphatile.png", texParams)); material->SetTextureProperty("AlphaMap", Nz::Texture::LoadFromFile(resourceDir / "alphatile.png", texParams));
material->SetTextureProperty("BaseColorMap", Nz::Texture::LoadFromFile(resourceDir / "Spaceship/Texture/diffuse.png", texParams)); material->SetTextureProperty("BaseColorMap", Nz::Texture::LoadFromFile(resourceDir / "Spaceship/Texture/diffuse.png", texParams));
@ -71,7 +80,15 @@ int main()
for (std::size_t i = 0; i < model->GetSubMeshCount(); ++i) for (std::size_t i = 0; i < model->GetSubMeshCount(); ++i)
model->SetMaterial(i, material); model->SetMaterial(i, material);
std::shared_ptr<Nz::TextSprite> sprite = std::make_shared<Nz::TextSprite>(); std::shared_ptr<Nz::MaterialInstance> textMaterial = Nz::Graphics::Instance()->GetDefaultMaterials().basicTransparent->Clone();
textMaterial->UpdatePassFlags("ForwardPass", Nz::MaterialPassFlag::SortByDistance);
textMaterial->UpdatePassStates("ForwardPass", [](Nz::RenderStates& states)
{
states.depthClamp = true;
return true;
});
std::shared_ptr<Nz::TextSprite> sprite = std::make_shared<Nz::TextSprite>(textMaterial);
sprite->Update(Nz::SimpleTextDrawer::Draw("Voix ambiguë d'un cœur qui, au zéphyr, préfère les jattes de kiwis", 72), 0.01f); sprite->Update(Nz::SimpleTextDrawer::Draw("Voix ambiguë d'un cœur qui, au zéphyr, préfère les jattes de kiwis", 72), 0.01f);
Nz::VertexMapper vertexMapper(*spaceshipMesh->GetSubMesh(0)); Nz::VertexMapper vertexMapper(*spaceshipMesh->GetSubMesh(0));
@ -164,6 +181,7 @@ int main()
auto& entityNode = registry.emplace<Nz::NodeComponent>(entity); auto& entityNode = registry.emplace<Nz::NodeComponent>(entity);
entityNode.SetPosition(Nz::Vector3f(x * 2.f, y * 1.5f, z * 2.f)); entityNode.SetPosition(Nz::Vector3f(x * 2.f, y * 1.5f, z * 2.f));
entityNode.SetRotation(Nz::EulerAnglesf(0.f, Nz::TurnAnglef(0.5f), 0.f));
auto& entityPhys = registry.emplace<Nz::RigidBody3DComponent>(entity, physSytem.CreateRigidBody(shipCollider)); auto& entityPhys = registry.emplace<Nz::RigidBody3DComponent>(entity, physSytem.CreateRigidBody(shipCollider));
entityPhys.SetMass(1.f); entityPhys.SetMass(1.f);
@ -187,7 +205,7 @@ int main()
float elapsedTime = 0.f; float elapsedTime = 0.f;
Nz::UInt64 time = Nz::GetElapsedMicroseconds(); Nz::UInt64 time = Nz::GetElapsedMicroseconds();
Nz::PidController<Nz::Vector3f> headingController(0.5f, 0.f, 0.05f); Nz::PidController<Nz::Vector3f> headingController(0.3f, 0.f, 0.1f);
Nz::PidController<Nz::Vector3f> upController(1.f, 0.f, 0.1f); Nz::PidController<Nz::Vector3f> upController(1.f, 0.f, 0.1f);
bool showColliders = false; bool showColliders = false;
@ -217,14 +235,14 @@ int main()
showColliders = !showColliders; showColliders = !showColliders;
if (showColliders) if (showColliders)
{ {
auto view = registry.view<Nz::GraphicsComponent>(); auto view = registry.view<Nz::GraphicsComponent, Nz::RigidBody3DComponent>();
for (auto [entity, gfxComponent] : view.each()) for (auto [entity, gfxComponent, _] : view.each())
gfxComponent.AttachRenderable(colliderModel, 1); gfxComponent.AttachRenderable(colliderModel, 1);
} }
else else
{ {
auto view = registry.view<Nz::GraphicsComponent>(); auto view = registry.view<Nz::GraphicsComponent, Nz::RigidBody3DComponent>();
for (auto [entity, gfxComponent] : view.each()) for (auto [entity, gfxComponent, _] : view.each())
gfxComponent.DetachRenderable(colliderModel); gfxComponent.DetachRenderable(colliderModel);
} }
} }