Merge pull request #45 from 902D9/feature/compatible

feat(UE_Assimp): rename ToVector to aiVector3DToVector, because the engine plugin "LidarPointCloud" already has a ToVector

Author: irajsb

Source/UE_Assimp/Private/AICamera.cpp

@@ -34,15 +34,15 @@ float UAICamera::GetAspectRatio()
 
 FVector UAICamera::GetPosition()
 {
-	return ToVector( camera->mPosition);
+	return aiVector3DToVector( camera->mPosition);
 }
 
 FVector UAICamera::GetUpVector()
 {
-	return ToVector( camera->mUp);
+	return aiVector3DToVector( camera->mUp);
 }
 
 FVector UAICamera::GetLookAtVector()
 {
-	return ToVector( camera->mLookAt);
+	return aiVector3DToVector( camera->mLookAt);
 }

Source/UE_Assimp/Private/AILight.cpp

@@ -20,17 +20,17 @@ TEnumAsByte<EAssimpLightType> UAILight::GetLightType()
 
 FVector UAILight::GetLightPosition()
 {
-	return ToVector(Light->mPosition);
+	return aiVector3DToVector(Light->mPosition);
 }
 
 FVector UAILight::GetLightDirection()
 {
-	return  ToVector(Light->mDirection);
+	return  aiVector3DToVector(Light->mDirection);
 }
 
 FVector UAILight::GetUpDirection()
 {
-	return  ToVector(Light->mUp);
+	return  aiVector3DToVector(Light->mUp);
 }
 
 float UAILight::GetAttenuationConstant()

Source/UE_Assimp/Private/AIMesh.cpp

@@ -32,7 +32,7 @@ void UAIMesh::GetMeshVertices(TArray<FVector>& Vertices)
 	Vertices.AddUninitialized(Mesh->mNumVertices);
 	for (unsigned int Index = 0; Index < Mesh->mNumVertices; Index++)
 	{
-		Vertices[Index] = ToVector(Mesh->mVertices[Index]);
+		Vertices[Index] = aiVector3DToVector(Mesh->mVertices[Index]);
 	}
 }
 
@@ -52,7 +52,7 @@ void UAIMesh::GetMeshNormals(TArray<FVector>& Normals)
 	Normals.AddUninitialized(Mesh->mNumVertices);
 	for (unsigned int Index = 0; Index < Mesh->mNumVertices; Index++)
 	{
-		Normals[Index] = ToVector(Mesh->mNormals[Index]);
+		Normals[Index] = aiVector3DToVector(Mesh->mNormals[Index]);
 	}
 }
 
@@ -93,12 +93,12 @@ void UAIMesh::GetMeshDataForProceduralMesh(TArray<FVector>& Vertices, TArray<int
 
 	for (unsigned int Index = 0; Index < Mesh->mNumVertices; Index++)
 	{
-		Normals[Index] = ToVector(Mesh->mNormals[Index]);
-		Vertices[Index] = ToVector(Mesh->mVertices[Index]);
+		Normals[Index] = aiVector3DToVector(Mesh->mNormals[Index]);
+		Vertices[Index] = aiVector3DToVector(Mesh->mVertices[Index]);
 
 		if (Mesh->mTangents)
 		{
-			Tangents[Index].TangentX = ToVector(Mesh->mTangents[Index]);
+			Tangents[Index].TangentX = aiVector3DToVector(Mesh->mTangents[Index]);
 		}
 
 		if (Mesh->HasTextureCoords(0))
@@ -136,14 +136,14 @@ UStaticMesh* UAIMesh::GetStaticMesh()
 	VertexInstances.AddUninitialized(Mesh->mNumVertices);
 	for (unsigned int Index = 0; Index < Mesh->mNumVertices; Index++)
 	{
-		auto VertexID = MeshDescBuilder.AppendVertex(ToVector(Mesh->mVertices[Index]));
+		auto VertexID = MeshDescBuilder.AppendVertex(aiVector3DToVector(Mesh->mVertices[Index]));
 
 		auto Instance = MeshDescBuilder.AppendInstance(VertexID);
 		VertexInstances[Index] = Instance;
 
 		if(Mesh->HasNormals())
 		{
-		MeshDescBuilder.SetInstanceNormal(Instance,ToVector(Mesh->mNormals[Index]));
+		MeshDescBuilder.SetInstanceNormal(Instance,aiVector3DToVector(Mesh->mNormals[Index]));
 		}else
 		{
 			UE_LOG(LogAssimp,Warning,TEXT("Normals not found consider generating them with assimp"))

Source/UE_Assimp/Public/UE_Assimp.h

@@ -3,10 +3,10 @@
 #pragma once
 
 #include "assimp/Logger.hpp"
-#include "assimp/LogStream.hpp"
 #include "Modules/ModuleManager.h"
-#define ToVector(In) FVector(In.x, In.y, In.z)
-#define ToVectorCM(In) FVector(In.x*100, In.y*100, In.z*100) //convert Meters to cm (DEPRECATED)
+// rename ToVector to aiVector3DToVector, because the engine plugin "LidarPointCloud" already has a ToVector
+#define aiVector3DToVector(In) FVector(In.x, In.y, In.z)
+#define aiVector3DToVectorCM(In) FVector(In.x*100, In.y*100, In.z*100) //convert Meters to cm (DEPRECATED)
 DECLARE_LOG_CATEGORY_EXTERN(LogAssimp, Log, All);