Merge branch 'nazara-next' into vulkan

examples/DopplerEffect/main.cpp

@@ -10,11 +10,12 @@
 
 #include <Nazara/Audio.hpp>
 #include <Nazara/Core/Clock.hpp>
-#include <Nazara/Core/Thread.hpp> // Thread::Sleep
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Platform/Keyboard.hpp>
 #include <Nazara/Platform/Platform.hpp>
+#include <chrono>
 #include <iostream>
+#include <thread>
 
 int main()
 {
@@ -61,7 +62,7 @@ int main()
 		int sleepTime = int(1000/60 - clock.GetMilliseconds()); // 60 FPS
 
 		if (sleepTime > 0)
-			Nz::Thread::Sleep(sleepTime);
+			std::this_thread::sleep_for(std::chrono::milliseconds(sleepTime));
 
 		// On bouge la source du son en fonction du temps depuis chaque mise à jour
 		Nz::Vector3f pos = sound.GetPosition() + sound.GetVelocity()*clock.GetSeconds();

examples/FirstScene/main.cpp

@@ -13,18 +13,16 @@
 */
 
 #include <Nazara/Core/Clock.hpp> // Horloges
-#include <Nazara/Lua.hpp> // Module de scripting
 #include <Nazara/Graphics.hpp> // Module graphique
 #include <Nazara/Renderer.hpp> // Module de rendu
 #include <Nazara/Network.hpp> // Module utilitaire
 #include <Nazara/Utility.hpp> // Module utilitaire
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Console.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/LuaAPI.hpp>
-#include <NDK/Sdk.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Console.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/Sdk.hpp>
+#include <NazaraSDK/World.hpp>
 #include <iostream>
 
 // Petite fonction permettant de rendre le déplacement de la caméra moins ridige
@@ -264,10 +262,6 @@ int main()
 	application.EnableConsole(true);
 	application.EnableFPSCounter(true);
 
-	Ndk::Application::ConsoleOverlay& consoleOverlay = application.GetConsoleOverlay();
-	consoleOverlay.lua.PushGlobal("Spaceship", spaceship->CreateHandle());
-	consoleOverlay.lua.PushGlobal("World", world->CreateHandle());
-
 
 	//Gestion des Evenements 
 	Nz::EventHandler& eventHandler = window.GetEventHandler();

examples/MeshInfos/main.cpp

@@ -1,4 +1,3 @@
-#include <Nazara/Core/Directory.hpp>
 #include <Nazara/Core/File.hpp>
 #include <Nazara/Math/Box.hpp>
 #include <Nazara/Utility/Animation.hpp>
@@ -26,25 +25,17 @@ int main()
 
 	for (;;)
 	{
-		Nz::Directory resourceDirectory("resources");
-		if (!resourceDirectory.Open())
+		std::vector<std::filesystem::path> models;
+		for (auto& p : std::filesystem::directory_iterator("resources"))
 		{
-			std::cerr << "Failed to open resource directory" << std::endl;
-			std::getchar();
-			return EXIT_FAILURE;
-		}
+			if (!p.is_regular_file())
+				continue;
 
-		std::vector<Nz::String> models;
-		while (resourceDirectory.NextResult())
-		{
-			Nz::String path = resourceDirectory.GetResultName();
-			Nz::String ext = path.SubStringFrom('.', -1, true); // Tout ce qui vient après le dernier '.' de la chaîne
-			if (Nz::MeshLoader::IsExtensionSupported(ext)) // L'extension est-elle supportée par le MeshLoader ?
-				models.push_back(path);
+			const std::filesystem::path& filePath = p.path();
+			if (Nz::MeshLoader::IsExtensionSupported(filePath.extension().generic_u8string())) // L'extension est-elle supportée par le MeshLoader ?
+				models.push_back(filePath);
 		}
 
-		resourceDirectory.Close();
-
 		if (models.empty())
 		{
 			std::cout << "No loadable mesh found in resource directory" << std::endl;
@@ -71,7 +62,7 @@ int main()
 		if (iChoice == 0)
 			break;
 
-		Nz::MeshRef mesh = Nz::Mesh::LoadFromFile(resourceDirectory.GetPath() + '/' + models[iChoice-1]);
+		Nz::MeshRef mesh = Nz::Mesh::LoadFromFile(models[iChoice-1]);
 		if (!mesh)
 		{
 			std::cout << "Failed to load mesh" << std::endl;
@@ -123,8 +114,8 @@ int main()
 				}
 			}
 
-			Nz::String animationPath = mesh->GetAnimation();
-			if (!animationPath.IsEmpty())
+			std::filesystem::path animationPath = mesh->GetAnimation();
+			if (!animationPath.empty())
 			{
 				Nz::AnimationRef animation = Nz::Animation::LoadFromFile(animationPath);
 				if (animation)

examples/Particles/Common.cpp

@@ -1,8 +1,8 @@
 #include "Common.hpp"
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Utility/SimpleTextDrawer.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/Systems/RenderSystem.hpp>
 
 ParticleDemo::ParticleDemo(const Nz::String& name, const ExampleShared& exampleShared) :
 m_shared(exampleShared),

examples/Particles/Common.hpp

@@ -7,10 +7,10 @@
 #include <Nazara/Graphics/AbstractBackground.hpp>
 #include <Nazara/Graphics/TextSprite.hpp>
 #include <Nazara/Renderer/RenderWindow.hpp>
-#include <NDK/Components/ParticleGroupComponent.hpp>
-#include <NDK/EntityOwner.hpp>
-#include <NDK/StateMachine.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Components/ParticleGroupComponent.hpp>
+#include <NazaraSDK/EntityOwner.hpp>
+#include <NazaraSDK/StateMachine.hpp>
+#include <NazaraSDK/World.hpp>
 #include <memory>
 #include <random>
 #include <vector>

examples/Particles/LogoDemo.cpp

@@ -2,8 +2,8 @@
 #include <Nazara/Core/OffsetOf.hpp>
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
 #include <iostream>
 
 namespace
@@ -126,7 +126,7 @@ ParticleDemo("Logo", sharedData)
 	Nz::ImageParams params;
 	params.loadFormat = Nz::PixelFormatType_RGBA8;
 
-	m_logo = Nz::Image::LoadFromFile("resources/Logo.png", params);
+	m_logo = Nz::Image::LoadFromFile("E:/Twitch/avatar_interested.png", params);
 	if (!m_logo)
 		NazaraError("Failed to load logo!");
 

examples/Particles/LogoDemo.hpp

@@ -5,7 +5,7 @@
 
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Graphics/ParticleStruct.hpp>
-#include <NDK/State.hpp>
+#include <NazaraSDK/State.hpp>
 #include <vector>
 #include "Common.hpp"
 

examples/Particles/SpacebattleDemo.cpp

@@ -4,8 +4,8 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Platform.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
 
 namespace
 {

examples/Particles/SpacebattleDemo.hpp

@@ -11,8 +11,8 @@
 #include <Nazara/Graphics/SkyboxBackground.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Platform/EventHandler.hpp>
-#include <NDK/Entity.hpp>
-#include <NDK/State.hpp>
+#include <NazaraSDK/Entity.hpp>
+#include <NazaraSDK/State.hpp>
 #include <vector>
 #include "Common.hpp"
 

examples/Particles/main.cpp

@@ -1,16 +1,14 @@
 #include <Nazara/Audio.hpp>
 #include <Nazara/Core.hpp>
 #include <Nazara/Graphics.hpp>
-#include <Nazara/Lua.hpp>
 #include <Nazara/Network.hpp>
-#include <Nazara/Noise.hpp>
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/StateMachine.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/StateMachine.hpp>
 #include "LogoDemo.hpp"
 #include "SpacebattleDemo.hpp"
 #include <iostream>
@@ -38,6 +36,8 @@ int main()
 	Nz::RenderWindow& window = app.AddWindow<Nz::RenderWindow>(mode, "Nazara demo - Particles", Nz::WindowStyle_Closable, targetParams);
 	//Nz::RenderWindow& window = app.AddWindow<Nz::RenderWindow>(Nz::VideoMode(1920, 1080), "Nazara demo - Particles", Nz::WindowStyle_Fullscreen, targetParams);
 
+	app.EnableFPSCounter(true);
+
 	Ndk::World& world3D = app.AddWorld();
 	Ndk::World& world2D = app.AddWorld();
 
@@ -173,7 +173,7 @@ int main()
 							window.CopyToImage(&screenshot);
 
 							static unsigned int counter = 1;
-							screenshot.SaveToFile("screenshot_" + Nz::String::Number(counter++) + ".png");
+							screenshot.SaveToFile("screenshot_" + std::to_string(counter++) + ".png");
 							break;
 						}
 

examples/Tut00/build.lua

@@ -10,9 +10,7 @@ EXAMPLE.Libraries = {
     "NazaraAudio",
     "NazaraCore",
     "NazaraGraphics",
-    "NazaraLua",
     "NazaraNetwork",
-    "NazaraNoise",
     "NazaraPhysics2D",
     "NazaraPhysics3D",
     "NazaraPlatform",

examples/Tut00/main.cpp

@@ -1,14 +1,12 @@
-#include <Nazara/Audio.hpp>
+#include <Nazara/Audio.hpp>
 #include <Nazara/Core.hpp>
 #include <Nazara/Graphics.hpp>
-#include <Nazara/Lua.hpp>
 #include <Nazara/Network.hpp>
-#include <Nazara/Noise.hpp>
 #include <Nazara/Physics2D.hpp>
 #include <Nazara/Physics3D.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
+#include <NazaraSDK/Application.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])

examples/Tut01/main.cpp

@@ -3,10 +3,10 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/World.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])

examples/Tut02/main.cpp

@@ -3,10 +3,10 @@
 #include <Nazara/Graphics.hpp>
 #include <Nazara/Renderer.hpp>
 #include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/World.hpp>
+#include <NazaraSDK/Application.hpp>
+#include <NazaraSDK/Components.hpp>
+#include <NazaraSDK/Systems.hpp>
+#include <NazaraSDK/World.hpp>
 #include <iostream>
 
 int main(int argc, char* argv[])