Merge branch 'master' into vulkan

Former-commit-id: 09e0a4e6f0547a32c42f5a624009257af179201e

SDK/include/NDK/Components/CameraComponent.inl

@@ -11,8 +11,8 @@ namespace Ndk
 	inline CameraComponent::CameraComponent() :
 	m_projectionType(Nz::ProjectionType_Perspective),
 	m_targetRegion(0.f, 0.f, 1.f, 1.f),
-	m_size(0.f),
 	m_target(nullptr),
+	m_size(0.f),
 	m_frustumUpdated(false),
 	m_projectionMatrixUpdated(false),
 	m_viewMatrixUpdated(false),
@@ -30,8 +30,8 @@ namespace Ndk
 	AbstractViewer(camera),
 	m_projectionType(camera.m_projectionType),
 	m_targetRegion(camera.m_targetRegion),
-	m_size(camera.m_size),
 	m_target(nullptr),
+	m_size(camera.m_size),
 	m_frustumUpdated(false),
 	m_projectionMatrixUpdated(false),
 	m_viewMatrixUpdated(false),

SDK/include/NDK/Components/GraphicsComponent.inl

@@ -8,6 +8,7 @@ namespace Ndk
 {
 	inline GraphicsComponent::GraphicsComponent(const GraphicsComponent& graphicsComponent) :
 	Component(graphicsComponent),
+	HandledObject(graphicsComponent),
 	m_boundingVolume(graphicsComponent.m_boundingVolume),
 	m_transformMatrix(graphicsComponent.m_transformMatrix),
 	m_boundingVolumeUpdated(graphicsComponent.m_boundingVolumeUpdated),

SDK/include/NDK/LuaAPI.inl

@@ -84,8 +84,12 @@ namespace Nz
 
 	inline unsigned int LuaImplQueryArg(const LuaInstance& instance, int index, FontParams* params, TypeTag<FontParams>)
 	{
+		NazaraUnused(params);
+
 		instance.CheckType(index, Nz::LuaType_Table);
 
+		// Structure is empty for now
+
 		return 1;
 	}
 

SDK/src/NDK/Console.cpp

@@ -145,6 +145,7 @@ namespace Ndk
 				{
 					case Nz::Keyboard::Down:
 					case Nz::Keyboard::Up:
+					{
 						if (event.key.code == Nz::Keyboard::Up)
 							m_historyPosition = std::min<std::size_t>(m_commandHistory.size(), m_historyPosition + 1);
 						else
@@ -160,6 +161,10 @@ namespace Ndk
 						m_inputTextSprite->Update(m_inputDrawer);
 						break;
 					}
+
+					default:
+						break;
+				}
 				break;
 			}
 		}

SDK/src/NDK/LuaBinding.cpp

@@ -29,8 +29,8 @@ namespace Ndk
 
 	// SDK
 	application("Application"),
-	nodeComponent("NodeComponent"),
 	entityClass("Entity"),
+	nodeComponent("NodeComponent"),
 	velocityComponent("VelocityComponent"),
 	worldClass("World")
 
@@ -39,9 +39,9 @@ namespace Ndk
 
 	// Audio
 	musicClass("Music"),
+	soundClass("Sound"),
 	soundBuffer("SoundBuffer"),
 	soundEmitter("SoundEmitter"),
-	soundClass("Sound"),
 
 	// Graphics
 	instancedRenderable("InstancedRenderable"),

SDK/src/NDK/LuaBinding_Audio.cpp

@@ -76,6 +76,8 @@ namespace Ndk
 		/*********************************** Nz::SoundBuffer **********************************/
 		soundBuffer.SetConstructor([] (Nz::LuaInstance& lua, Nz::SoundBufferRef* instance)
 		{
+			NazaraUnused(lua);
+
 			Nz::PlacementNew(instance, Nz::SoundBuffer::New());
 			return true;
 		});
@@ -115,16 +117,16 @@ namespace Ndk
 			return 1;
 		});
 
-		soundBuffer.BindMethod("__tostring", [] (Nz::LuaInstance& lua, Nz::SoundBufferRef& soundBuffer) -> int
+		soundBuffer.BindMethod("__tostring", [] (Nz::LuaInstance& lua, Nz::SoundBufferRef& instance) -> int
 		{
 			Nz::StringStream stream("SoundBuffer(");
-			if (soundBuffer->IsValid())
+			if (instance->IsValid())
 			{
-				Nz::String filePath = soundBuffer->GetFilePath();
+				Nz::String filePath = instance->GetFilePath();
 				if (!filePath.IsEmpty())
 					stream << "File: " << filePath << ", ";
 
-				stream << "Duration: " << soundBuffer->GetDuration() / 1000.f << "s";
+				stream << "Duration: " << instance->GetDuration() / 1000.f << "s";
 			}
 			stream << ')';
 

SDK/src/NDK/LuaBinding_Math.cpp

@@ -238,9 +238,15 @@ namespace Ndk
 						case 'h':
 							lua.Push(instance.height);
 							return true;
+
+						default:
+							break;
 					}
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			return false;
@@ -290,6 +296,9 @@ namespace Ndk
 					}
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			return false;
@@ -389,6 +398,9 @@ namespace Ndk
 				case 'z':
 					instance.z = value;
 					return true;
+
+				default:
+					break;
 			}
 
 			return false;
@@ -455,9 +467,15 @@ namespace Ndk
 						case 'y':
 							lua.Push(instance.y);
 							return true;
+
+						default:
+							break;
 					}
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			return false;
@@ -496,9 +514,15 @@ namespace Ndk
 						case 'y':
 							instance.y = value;
 							return true;
+
+						default:
+							break;
 					}
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			return false;
@@ -582,9 +606,15 @@ namespace Ndk
 						case 'z':
 							lua.Push(instance.z);
 							return true;
+
+						default:
+							break;
 					}
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			return false;
@@ -627,9 +657,15 @@ namespace Ndk
 						case 'z':
 							instance.z = value;
 							return true;
+
+						default:
+							break;
 					}
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			return false;

include/Nazara/Core/Algorithm.inl

@@ -178,7 +178,7 @@ namespace Nz
 	{
 		T reversed = 0;
 		for (std::size_t i = 0; i < sizeof(T); ++i)
-			reversed |= T(Detail::BitReverseTable256[(integer >> i * 8) & 0xFF]) << sizeof(T) * 8 - (i + 1) * 8;
+			reversed |= T(Detail::BitReverseTable256[(integer >> i * 8) & 0xFF]) << (sizeof(T) * 8 - (i + 1) * 8);
 
 		return reversed;
 	}

include/Nazara/Core/HandledObject.inl

@@ -13,6 +13,7 @@ namespace Nz
 	template<typename T>
 	HandledObject<T>::HandledObject(const HandledObject& object)
 	{
+		NazaraUnused(object);
 		// Don't copy anything, we're a copy of the object, we have no handle right now
 	}
 

include/Nazara/Graphics/Light.inl

@@ -9,9 +9,9 @@ namespace Nz
 {
 	inline Light::Light(const Light& light) :
 	Renderable(light),
+	m_color(light.m_color),
 	m_type(light.m_type),
 	m_shadowMapFormat(light.m_shadowMapFormat),
-	m_color(light.m_color),
 	m_shadowMapSize(light.m_shadowMapSize),
 	m_shadowCastingEnabled(light.m_shadowCastingEnabled),
 	m_shadowMapUpdated(false),

include/Nazara/Lua/LuaClass.inl

@@ -21,6 +21,8 @@ namespace Nz
 	{
 		SetConstructor([] (Nz::LuaInstance& lua, T* instance)
 		{
+			NazaraUnused(lua);
+
 			PlacementNew(instance);
 			return true;
 		});
@@ -132,9 +134,9 @@ namespace Nz
 				lua.SetField(pair.first); // Method name
 			}
 
-			m_info->instanceGetters[m_info->name] = [info = m_info] (LuaInstance& lua)
+			m_info->instanceGetters[m_info->name] = [info = m_info] (LuaInstance& instance)
 			{
-				return static_cast<T*>(lua.CheckUserdata(1, info->name));
+				return static_cast<T*>(instance.CheckUserdata(1, info->name));
 			};
 		}
 		lua.Pop(); // On pop la metatable
@@ -391,11 +393,11 @@ namespace Nz
 
 			if (!lua.IsValid(-1))
 			{
-				for (const ParentFunc& getter : info->parentGetters)
+				for (const ParentFunc& parentGetter : info->parentGetters)
 				{
 					lua.Pop(); //< Pop the last nil value
 
-					getter(lua, instance);
+					parentGetter(lua, instance);
 					if (lua.IsValid(-1))
 						return;
 				}

include/Nazara/Network/IpAddress.inl

@@ -224,7 +224,7 @@ namespace std
 
 			// This is SDBM adapted for IP addresses, tested to generate the least collisions possible
 			// (It doesn't mean it cannot be improved though)
-			std::size_t hash = 0;
+			std::size_t h = 0;
 			switch (ip.GetProtocol())
 			{
 				case Nz::NetProtocol_Any:
@@ -233,20 +233,20 @@ namespace std
 
 				case Nz::NetProtocol_IPv4:
 				{
-					hash = ip.ToUInt32() + (hash << 6) + (hash << 16) - hash;
+					h = ip.ToUInt32() + (h << 6) + (h << 16) - h;
 					break;
 				}
 				case Nz::NetProtocol_IPv6:
 				{
 					Nz::IpAddress::IPv6 v6 = ip.ToIPv6();
 					for (std::size_t i = 0; i < v6.size(); i++)
-						hash = v6[i] + (hash << 6) + (hash << 16) - hash;
+						h = v6[i] + (h << 6) + (h << 16) - h;
 
 					break;
 				}
 			}
 
-			return ip.GetPort() + (hash << 6) + (hash << 16) - hash;
+			return ip.GetPort() + (h << 6) + (h << 16) - h;
 		}
 	};
 }

include/Nazara/Network/TcpClient.hpp

@@ -79,8 +79,8 @@ namespace Nz
 			PendingPacket m_pendingPacket;
 			UInt64 m_keepAliveInterval;
 			UInt64 m_keepAliveTime;
-			bool m_isLowDelayEnabled;
 			bool m_isKeepAliveEnabled;
+			bool m_isLowDelayEnabled;
 	};
 }
 

include/Nazara/Utility/PixelFormat.inl

@@ -12,29 +12,29 @@
 namespace Nz
 {
 	inline PixelFormatInfo::PixelFormatInfo() :
-	bitsPerPixel(0),
-	content(PixelFormatContent_Undefined)
+	content(PixelFormatContent_Undefined),
+	bitsPerPixel(0)
 	{
 	}
 
 	inline PixelFormatInfo::PixelFormatInfo(PixelFormatContent formatContent, UInt8 bpp, PixelFormatSubType subType) :
-	bitsPerPixel(bpp),
-	content(formatContent),
-	redType(subType),
-	greenType(subType),
-	blueType(subType),
-	alphaType(subType)
-	{
-	}
-	
-	inline PixelFormatInfo::PixelFormatInfo(const String& formatName, PixelFormatContent formatContent, UInt8 bpp, PixelFormatSubType subType) :
-	bitsPerPixel(bpp),
 	content(formatContent),
 	redType(subType),
 	greenType(subType),
 	blueType(subType),
 	alphaType(subType),
-	name(formatName)
+	bitsPerPixel(bpp)
+	{
+	}
+
+	inline PixelFormatInfo::PixelFormatInfo(const String& formatName, PixelFormatContent formatContent, UInt8 bpp, PixelFormatSubType subType) :
+	content(formatContent),
+	redType(subType),
+	greenType(subType),
+	blueType(subType),
+	alphaType(subType),
+	name(formatName),
+	bitsPerPixel(bpp)
 	{
 	}
 

plugins/Assimp/Plugin.cpp

@@ -206,8 +206,8 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
 				{
 					aiVector3D position = iMesh->mVertices[j];
 					aiVector3D normal = iMesh->mNormals[j];
-					aiVector3D tangent = iMesh->mTangents[j];
-					aiVector3D uv = iMesh->mTextureCoords[0][j];
+					aiVector3D tangent = (iMesh->HasTangentsAndBitangents()) ? iMesh->mTangents[j] : aiVector3D(0.f, 1.f, 0.f);
+					aiVector3D uv = (iMesh->HasTextureCoords(0)) ? iMesh->mTextureCoords[0][j] : aiVector3D(0.f);
 
 					vertex->position = parameters.scale * Vector3f(position.x, position.y, position.z);
 					vertex->normal.Set(normal.x, normal.y, normal.z);
@@ -246,8 +246,8 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
 					auto ConvertTexture = [&] (aiTextureType aiType, const char* textureKey, const char* wrapKey = nullptr)
 					{
 						aiString path;
-						aiTextureMapMode mapMode;
-						if (aiGetMaterialTexture(aiMat, aiType, 0, &path, nullptr, nullptr, nullptr, nullptr, &mapMode, nullptr) == aiReturn_SUCCESS)
+						aiTextureMapMode mapMode[3];
+						if (aiGetMaterialTexture(aiMat, aiType, 0, &path, nullptr, nullptr, nullptr, nullptr, &mapMode[0], nullptr) == aiReturn_SUCCESS)
 						{
 							matData.SetParameter(MaterialData::CustomDefined);
 							matData.SetParameter(textureKey, stream.GetDirectory() + String(path.data, path.length));
@@ -255,7 +255,7 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
 							if (wrapKey)
 							{
 								SamplerWrap wrap = SamplerWrap_Default;
-								switch (mapMode)
+								switch (mapMode[0])
 								{
 									case aiTextureMapMode_Clamp:
 									case aiTextureMapMode_Decal:
@@ -271,7 +271,7 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
 										break;
 
 									default:
-										NazaraWarning("Assimp texture map mode 0x" + String::Number(mapMode, 16) + " not handled");
+										NazaraWarning("Assimp texture map mode 0x" + String::Number(mapMode[0], 16) + " not handled");
 										break;
 								}
 

src/Nazara/Core/File.cpp

@@ -906,5 +906,5 @@ namespace Nz
 		}
 
 		return true;
-	};
+	}
 }

src/Nazara/Core/ParameterList.cpp

@@ -94,6 +94,7 @@ namespace Nz
 				break;
 			}
 
+			case ParameterType_Color:
 			case ParameterType_Float:
 			case ParameterType_None:
 			case ParameterType_Pointer:
@@ -198,6 +199,7 @@ namespace Nz
 				}
 
 			case ParameterType_Boolean:
+			case ParameterType_Color:
 			case ParameterType_None:
 			case ParameterType_Pointer:
 			case ParameterType_Userdata:
@@ -263,6 +265,7 @@ namespace Nz
 					break;
 				}
 
+			case ParameterType_Color:
 			case ParameterType_None:
 			case ParameterType_Pointer:
 			case ParameterType_Userdata:
@@ -331,6 +334,7 @@ namespace Nz
 				return true;
 
 			case ParameterType_Boolean:
+			case ParameterType_Color:
 			case ParameterType_Float:
 			case ParameterType_Integer:
 			case ParameterType_None:
@@ -639,6 +643,7 @@ namespace Nz
 			switch (it->second.type)
 			{
 				case ParameterType_Boolean:
+				case ParameterType_Color:
 				case ParameterType_Float:
 				case ParameterType_Integer:
 				case ParameterType_Pointer:

src/Nazara/Graphics/ForwardRenderQueue.cpp

@@ -524,9 +524,9 @@ namespace Nz
 		Vector3f viewerPos = viewer->GetEyePosition();
 		Vector3f viewerNormal = viewer->GetForward();
 
-		for (auto& pair : layers)
+		for (auto& layerPair : layers)
 		{
-			Layer& layer = pair.second;
+			Layer& layer = layerPair.second;
 
 			std::sort(layer.transparentModels.begin(), layer.transparentModels.end(), [&layer, &nearPlane, &viewerNormal] (unsigned int index1, unsigned int index2)
 			{

src/Nazara/Renderer/RenderTexture.cpp

@@ -57,11 +57,14 @@ namespace Nz
 
 				case PixelFormatContent_Stencil:
 					return AttachmentPoint_Stencil;
+
+				case PixelFormatContent_Undefined:
+					break;
 			}
 
 			NazaraInternalError("Unexpected pixel format content: 0x" + String::Number(info.content, 16));
 			return AttachmentPoint_Max;
-		};
+		}
 
 		GLuint lockedPrevious = 0;
 		UInt8 lockedLevel = 0;

src/Nazara/Utility/AlgorithmUtility.cpp

@@ -105,9 +105,9 @@ namespace Nz
 					for (unsigned int i = 0; i < recursionLevel; ++i)
 					{
 						std::size_t triangleCount = triangles.size();
-						for (std::size_t i = 0; i < triangleCount; ++i)
+						for (std::size_t j = 0; j < triangleCount; ++j)
 						{
-							Vector3ui& triangle = triangles[i];
+							Vector3ui& triangle = triangles[j];
 
 							unsigned int a = GetMiddleVertex(triangle.x, triangle.y);
 							unsigned int b = GetMiddleVertex(triangle.y, triangle.z);