Merge remote-tracking branch 'origin/master' into Particle-Update

Former-commit-id: 7ec9fba80c2b47a1fb811c7912df67262986c9f0

include/Nazara/Graphics/Material.hpp

@@ -135,7 +135,7 @@ class NAZARA_API NzMaterial : public NzResource
 		struct ShaderInstance
 		{
 			const NzShader* shader;
-			NzUberShaderInstance* uberInstance;
+			NzUberShaderInstance* uberInstance = nullptr;
 			int uniforms[nzMaterialUniform_Max+1];
 		};
 

include/Nazara/Utility/Enums.hpp

@@ -221,12 +221,14 @@ enum nzVertexComponent
 {
 	nzVertexComponent_Unused = -1,
 
+	// Nous nous limitons à 16 composants de sommets car c'est le minimum supporté par le GPU
 	nzVertexComponent_InstanceData0,
 	nzVertexComponent_InstanceData1,
 	nzVertexComponent_InstanceData2,
 	nzVertexComponent_InstanceData3,
 	nzVertexComponent_InstanceData4,
 	nzVertexComponent_InstanceData5,
+	nzVertexComponent_Color,
 	nzVertexComponent_Normal,
 	nzVertexComponent_Position,
 	nzVertexComponent_Tangent,
@@ -236,14 +238,13 @@ enum nzVertexComponent
 	nzVertexComponent_Userdata2,
 	nzVertexComponent_Userdata3,
 	nzVertexComponent_Userdata4,
-	nzVertexComponent_Userdata5,
 
 	nzVertexComponent_FirstInstanceData = nzVertexComponent_InstanceData0,
-	nzVertexComponent_FirstVertexData = nzVertexComponent_Normal,
+	nzVertexComponent_FirstVertexData = nzVertexComponent_Color,
 	nzVertexComponent_LastInstanceData = nzVertexComponent_InstanceData5,
-	nzVertexComponent_LastVertexData = nzVertexComponent_Userdata5,
+	nzVertexComponent_LastVertexData = nzVertexComponent_Userdata4,
 
-	nzVertexComponent_Max = nzVertexComponent_Userdata5
+	nzVertexComponent_Max = nzVertexComponent_Userdata4
 };
 
 enum nzVertexLayout

include/Nazara/Utility/Event.hpp

@@ -9,6 +9,7 @@
 #ifndef NAZARA_EVENT_HPP
 #define NAZARA_EVENT_HPP
 
+#include <Nazara/Utility/Enums.hpp>
 #include <Nazara/Utility/Keyboard.hpp>
 #include <Nazara/Utility/Mouse.hpp>
 

include/Nazara/Utility/Mesh.hpp

@@ -36,6 +36,9 @@ struct NAZARA_API NzMeshParams
 	// Faut-il centrer le mesh autour de l'origine ?
 	bool center = false;
 
+	// Faut-il retourner les UV ?
+	bool flipUVs = false;
+
 	// Faut-il optimiser les index buffers ? (Rendu plus rapide, mais le chargement dure plus longtemps)
 	bool optimizeIndexBuffers = true;