Fix examples compilation
This commit is contained in:
parent
eccddc2871
commit
54c43c7600
|
|
@ -2,8 +2,8 @@
|
||||||
#include <Nazara/Core/Application.hpp>
|
#include <Nazara/Core/Application.hpp>
|
||||||
#include <Nazara/Core/Clock.hpp>
|
#include <Nazara/Core/Clock.hpp>
|
||||||
#include <Nazara/Graphics/Graphics.hpp>
|
#include <Nazara/Graphics/Graphics.hpp>
|
||||||
#include <Nazara/Platform/AppWindowingComponent.hpp>
|
|
||||||
#include <Nazara/Platform/Platform.hpp>
|
#include <Nazara/Platform/Platform.hpp>
|
||||||
|
#include <Nazara/Platform/WindowingAppComponent.hpp>
|
||||||
#include <Nazara/Renderer/GpuSwitch.hpp>
|
#include <Nazara/Renderer/GpuSwitch.hpp>
|
||||||
#include <Nazara/Renderer/WindowSwapchain.hpp>
|
#include <Nazara/Renderer/WindowSwapchain.hpp>
|
||||||
|
|
||||||
|
|
@ -43,7 +43,7 @@ int WinMain(int argc, char* argv[])
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
|
Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
|
||||||
auto& windowing = nazara.AddComponent<Nz::AppWindowingComponent>();
|
auto& windowing = nazara.AddComponent<Nz::WindowingAppComponent>();
|
||||||
std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
|
std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
|
||||||
|
|
||||||
std::string windowTitle = "Nazara Imgui Demo";
|
std::string windowTitle = "Nazara Imgui Demo";
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
#include <Nazara/Graphics.hpp>
|
#include <Nazara/Graphics.hpp>
|
||||||
#include <Nazara/Platform.hpp>
|
#include <Nazara/Platform.hpp>
|
||||||
#include <Nazara/Renderer.hpp>
|
#include <Nazara/Renderer.hpp>
|
||||||
#include <Nazara/Utility.hpp>
|
|
||||||
|
|
||||||
#include <NazaraImgui/ImguiHandler.hpp>
|
#include <NazaraImgui/ImguiHandler.hpp>
|
||||||
#include <NazaraImgui/ImguiWidgets.hpp>
|
#include <NazaraImgui/ImguiWidgets.hpp>
|
||||||
|
|
@ -41,10 +40,10 @@ int WinMain(int argc, char* argv[])
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
|
Nz::Application<Nz::Graphics, Nz::Imgui> nazara(argc, argv);
|
||||||
auto& windowing = nazara.AddComponent<Nz::AppWindowingComponent>();
|
auto& windowing = nazara.AddComponent<Nz::WindowingAppComponent>();
|
||||||
std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
|
std::shared_ptr<Nz::RenderDevice> device = Nz::Graphics::Instance()->GetRenderDevice();
|
||||||
|
|
||||||
auto& ecs = nazara.AddComponent<Nz::AppEntitySystemComponent>();
|
auto& ecs = nazara.AddComponent<Nz::EntitySystemAppComponent>();
|
||||||
auto& world = ecs.AddWorld<Nz::EnttWorld>();
|
auto& world = ecs.AddWorld<Nz::EnttWorld>();
|
||||||
|
|
||||||
auto& renderer = world.AddSystem<Nz::RenderSystem>();
|
auto& renderer = world.AddSystem<Nz::RenderSystem>();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue