Merge fixes

This commit is contained in:
SirLynix
2023-02-02 18:36:48 +01:00
committed by Jérôme Leclercq
parent 5567a39a65
commit cee75dcc11
15 changed files with 47 additions and 644 deletions

View File

@@ -215,7 +215,7 @@ int main()
if (!frame)
{
std::this_thread::sleep_for(std::chrono::milliseconds(1));
return;
continue;
}
framePipeline.GetDebugDrawer().DrawLine(Nz::Vector3f::Zero(), Nz::Vector3f::Forward(), Nz::Color::Blue());
@@ -225,7 +225,7 @@ int main()
Nz::Boxf aabb = model.GetAABB();
aabb.Transform(worldInstance->GetWorldMatrix());
framePipeline.GetDebugDrawer().DrawBox(aabb, Nz::Color::Green);
framePipeline.GetDebugDrawer().DrawBox(aabb, Nz::Color::Green());
}
viewerInstance.UpdateViewMatrix(Nz::Matrix4f::TransformInverse(viewerPos, camAngles));
@@ -243,7 +243,7 @@ int main()
window.SetTitle(windowTitle + " - " + Nz::NumberToString(fps) + " FPS");
fps = 0;
}
});
}
return EXIT_SUCCESS;
}