Merge pull request #87 from specklesystems/jrm/converter/collections

Support for receiving Collections and various other Bug fixes

Author: JR-Morgan

Content/Converters/DefaultCollectionConverter.uasset

@@ -6,8 +6,8 @@
 #include "Kismet/GameplayStatics.h"
 #include "LogSpeckle.h"
 #include "Interfaces/IHttpResponse.h"
-#include "Launch/Resources/Version.h"
 #include "Misc/Base64.h"
+#include "Runtime/Launch/Resources/Version.h"
 #include "Policies/CondensedJsonPrintPolicy.h"
 #include "Serialization/JsonSerializerMacros.h"
 #include "Serialization/JsonWriter.h"

Content/Examples/BlueprintReceiving.uasset

@@ -0,0 +1,53 @@
+
+#include "Conversion/Converters/CollectionConverter.h"
+
+#include "Objects/Collection.h"
+
+UCollectionConverter::UCollectionConverter()
+{
+    SpeckleTypes.Add(UCollection::StaticClass());
+
+    
+    ActorType = AActor::StaticClass();
+    ActorMobility = EComponentMobility::Static;
+}
+
+UObject* UCollectionConverter::ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World,
+                                                            TScriptInterface<ISpeckleConverter>& AvailableConverters )
+{
+    const UCollection* p = Cast<UCollection>(SpeckleBase);
+	
+    if(p == nullptr) return nullptr;
+	
+    return CollectionToNative(p, World);
+}
+
+AActor* UCollectionConverter::CollectionToNative(const UCollection*, UWorld* World)
+{
+    AActor* MeshActor = CreateEmptyActor(World);
+
+    
+    return MeshActor;
+}
+
+AActor* UCollectionConverter::CreateEmptyActor(UWorld* World, const FActorSpawnParameters& SpawnParameters)
+{
+    AActor* Actor = World->SpawnActor<AActor>(ActorType, SpawnParameters);
+    USceneComponent* Scene = NewObject<USceneComponent>(Actor, "Root");
+    Actor->SetRootComponent(Scene);
+    Scene->RegisterComponent();
+    Scene->SetMobility(ActorMobility);
+    return Actor;
+}
+
+
+UBase* UCollectionConverter::ConvertToSpeckle_Implementation(const UObject* Object)
+{
+    return nullptr; //TODO implement ToSpeckle function
+}
+
+
+UCollection* UCollectionConverter::CollectionToSpeckle(const AActor* Object)
+{
+    return nullptr; //TODO implement ToSpeckle function
+}

Source/SpeckleUnreal/Private/Analytics.cpp

@@ -101,10 +101,10 @@ AActor* UStaticMeshConverter::MeshesToNativeActor(const UBase* Parent, const TAr
 	FMatrix Transform = FMatrix::Identity;
 	// For single mesh, we check for transform
 	//TODO figure out how to handle DisplayValueElement with transform. Maybe we just grab transform from parent unconditionally? How does this affect blocks?
-	if(Parent == SpeckleMeshes[0])
-	{
-		Transform = SpeckleMeshes[0]->Transform;
-	}
+	// if(Parent == SpeckleMeshes[0])
+	// {
+	// 	Transform = SpeckleMeshes[0]->Transform;
+	// }
 
 	AActor* Actor = CreateEmptyActor(World, USpeckleObjectUtils::CreateTransform(Transform));
 	TInlineComponentArray<UStaticMeshComponent*> Components;

Source/SpeckleUnreal/Private/Conversion/Converters/CollectionConverter.cpp

@@ -5,6 +5,7 @@
 #include "API/SpeckleSerializer.h"
 #include "Conversion/Converters/AggregateConverter.h"
 #include "Conversion/Converters/BlockConverter.h"
+#include "Conversion/Converters/CollectionConverter.h"
 #include "Conversion/Converters/PointCloudConverter.h"
 #include "Conversion/Converters/StaticMeshConverter.h"
 #include "Conversion/Converters/MaterialConverter.h"
@@ -22,6 +23,7 @@ USpeckleConverterComponent::USpeckleConverterComponent()
 	static ConstructorHelpers::FObjectFinder<UPointCloudConverter> PointCloudConverter(TEXT("PointCloudConverter'/SpeckleUnreal/Converters/DefaultPointCloudConverter.DefaultPointCloudConverter'"));
 	static ConstructorHelpers::FObjectFinder<UBlockConverter> BlockConverter(TEXT("BlockConverter'/SpeckleUnreal/Converters/DefaultBlockConverter.DefaultBlockConverter'"));
 	static ConstructorHelpers::FObjectFinder<UMaterialConverter> MaterialConverter(TEXT("MaterialConverter'/SpeckleUnreal/Converters/DefaultMaterialConverter.DefaultMaterialConverter'"));
+	static ConstructorHelpers::FObjectFinder<UCollectionConverter> CollectionConverter(TEXT("CollectionConverter'/SpeckleUnreal/Converters/DefaultCollectionConverter.DefaultCollectionConverter'"));
 	static ConstructorHelpers::FObjectFinder<UObject> CameraConverter(TEXT("CameraConverter'/SpeckleUnreal/Converters/DefaultCameraConverter.DefaultCameraConverter'"));
 	//static ConstructorHelpers::FObjectFinder<ULightConverter> LightConverter(TEXT("LightConverter'/SpeckleUnreal/Converters/DefaultLightConverter.DefaultLightConverter'"));
 
@@ -31,6 +33,7 @@ USpeckleConverterComponent::USpeckleConverterComponent()
 	SpeckleConverter->SpeckleConverters.Add(PointCloudConverter.Object);
 	SpeckleConverter->SpeckleConverters.Add(BlockConverter.Object);
 	SpeckleConverter->SpeckleConverters.Add(MaterialConverter.Object);
+	SpeckleConverter->SpeckleConverters.Add(CollectionConverter.Object);
 	SpeckleConverter->SpeckleConverters.Add(CameraConverter.Object);
 	//SpeckleConverter->SpeckleConverters.Add(LightConverter.Object);
 
@@ -41,8 +44,19 @@ AActor* USpeckleConverterComponent::RecursivelyConvertToNative(AActor* AOwner, c
 	const TScriptInterface<ITransport>& LocalTransport, bool DisplayProgressBar, TArray<AActor*>& OutActors)
 {
 	float ObjectsToConvert{};
-	Base->TryGetDynamicNumber("totalChildrenCount", ObjectsToConvert);
-
+	if(Base->TotalChildrenCount > 0)
+	{
+		ObjectsToConvert = Base->TotalChildrenCount;
+	}
+	else
+	{
+		Base->TryGetDynamicNumber("totalChildrenCount", ObjectsToConvert);
+	}
+	if(ObjectsToConvert <= 1)
+	{
+		ObjectsToConvert = 99999; //A large number
+	}
+	
 	// Progress bar
 	FScopedSlowTask Progress(ObjectsToConvert + 2,
 		LOCTEXT("SpeckleConvertoNative","Converting Speckle Objects to Native"), DisplayProgressBar);

Source/SpeckleUnreal/Private/Conversion/Converters/StaticMeshConverter.cpp

@@ -0,0 +1,20 @@
+
+#include "Objects/Collection.h"
+
+
+
+
+bool UCollection::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport)
+{
+	if(!Super::Parse(Obj, ReadTransport)) return false;
+
+	// Parse Name property
+	if(!Obj->TryGetStringField("name", Name)) return false;
+	//DynamicProperties.Remove("name"); //Don't remove from dynamic, as we pick this up to name the actor
+
+	// Parse collectionType
+	if(!Obj->TryGetStringField("collectionType", CollectionType)) return false;
+	DynamicProperties.Remove("collectionType");
+	
+	return true;
+}

Source/SpeckleUnreal/Private/Conversion/SpeckleConverterComponent.cpp

@@ -31,12 +31,12 @@ bool UMesh::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITra
 
 		for (size_t i = 0, j = 0; i < NumberOfVertices; i++, j += 3)
 		{
-			Vertices.Add(Transform.InverseTransformPosition(FVector
+			Vertices.Add(FVector
 			(
 				ObjectVertices[j].Get()->AsNumber(),
 				-ObjectVertices[j + 1].Get()->AsNumber(),
 				ObjectVertices[j + 2].Get()->AsNumber()
-			) * ScaleFactor ));
+			) * ScaleFactor );
 		}
 		DynamicProperties.Remove("vertices");
 	}

Source/SpeckleUnreal/Private/Objects/Collection.cpp

@@ -3,6 +3,7 @@
 
 #include "LogSpeckle.h"
 #include "Mixpanel.h"
+#include "Runtime/Launch/Resources/Version.h"
 #include "JsonObjectConverter.h"
 #include "HttpModule.h"
 #include "Interfaces/IHttpRequest.h"
@@ -79,7 +80,12 @@ void UServerTransport::CopyObjectAndChildren(const FString& ObjectId,
 	Request->SetHeader("apollographql-client-version", SPECKLE_CONNECTOR_VERSION);
 
 	// Response Callback
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3
+	auto ResponseHandler = [=, this](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#else
+	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#endif
+	
 	{
 		if(!bWasSuccessful)
 		{
@@ -163,7 +169,11 @@ void UServerTransport::FetchChildren(TScriptInterface<ITransport> TargetTranspor
 	}
 
 	// Response Callback
-	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
+#if ENGINE_MAJOR_VERSION == 5 && ENGINE_MINOR_VERSION >= 3
+	auto ResponseHandler = [=, this](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#else
+	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable
+#endif
 	{
 		// Request Fail
 		if(!bWasSuccessful)

Source/SpeckleUnreal/Private/Objects/Geometry/Mesh.cpp

@@ -34,7 +34,7 @@ struct FSpeckleUser
 	FString Avatar;
 
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
-	bool Verified;
+	bool Verified = false;
 
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
 	FString Role;

Source/SpeckleUnreal/Private/Transports/ServerTransport.cpp

@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Conversion/SpeckleConverter.h"
+#include "Engine/EngineTypes.h"
+#include "Engine/World.h"
+
+#include "CollectionConverter.generated.h"
+
+class UCollection;
+
+
+/**
+ * Converts Speckle Mesh objects into native actors with a procedural mesh component.
+ * 
+ * Compared with the StaticMeshConverter, this converter has some serious limitations
+ * - Cannot convert displayValues,
+ * - N-gon faces will be ignored,
+ * - Meshes are transient, and won't persist on level reload
+ */
+UCLASS()
+class SPECKLEUNREAL_API UCollectionConverter :  public UObject, public ISpeckleConverter
+{
+	GENERATED_BODY()
+
+	CONVERTS_SPECKLE_TYPES()
+	
+public:
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
+	TSubclassOf<AActor> ActorType;
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
+	TEnumAsByte<EComponentMobility::Type> ActorMobility;
+	
+	// Sets default values for this actor's properties
+	UCollectionConverter();
+	
+	virtual UObject* ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World,
+													 TScriptInterface<ISpeckleConverter>& AvailableConverters) override;
+	
+	virtual UBase* ConvertToSpeckle_Implementation(const UObject* Object) override;
+	
+	UFUNCTION(BlueprintCallable, Category="ToNative")
+	virtual AActor* CollectionToNative(const UCollection* SpeckleCollection, UWorld* World);
+	
+	UFUNCTION(BlueprintCallable, Category="ToNative")
+	virtual UCollection* CollectionToSpeckle(const AActor* Object);
+	
+	virtual AActor* CreateEmptyActor(UWorld* World, const FActorSpawnParameters& SpawnParameters = FActorSpawnParameters());
+	
+};

Source/SpeckleUnreal/Public/API/Models/SpeckleUser.h

@@ -34,6 +34,7 @@ class SPECKLEUNREAL_API ISpeckleConverter
 	UObject* ConvertToNative(const UBase* SpeckleBase, UWorld* World, UPARAM(ref) TScriptInterface<ISpeckleConverter>& AvailableConverters);
 
 	/// Tries to convert a given Actor or Component into a Speckle Base
+	/// NOT IMPLEMENTED!!!
 	UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category="ToSpeckle")
 	UBase* ConvertToSpeckle(const UObject* Object);
 

Source/SpeckleUnreal/Public/Conversion/Converters/CollectionConverter.h

@@ -17,7 +17,7 @@ struct FSlowTask;
 /**
  * An Actor Component for encapsulating recursive conversion of Speckle Objects
  */
-UCLASS(ClassGroup=(Speckle), meta=(BlueprintSpawnableComponent))
+UCLASS(ClassGroup=(Speckle), meta=(BlueprintSpawnableComponent), HideCategories=(Activation, Collision, Cooking, Tags))
 class SPECKLEUNREAL_API USpeckleConverterComponent : public UActorComponent
 {
 	GENERATED_BODY()

Source/SpeckleUnreal/Public/Conversion/SpeckleConverter.h

@@ -33,7 +33,7 @@ class SPECKLEUNREAL_API UBase : public UObject
 	FString Id;
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
-	int64 TotalChildrenCount;
+	int64 TotalChildrenCount = 0;
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
 	FString ApplicationId;

Source/SpeckleUnreal/Public/Conversion/SpeckleConverterComponent.h

@@ -0,0 +1,28 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Objects/Base.h"
+
+#include "Collection.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class SPECKLEUNREAL_API UCollection : public UBase
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|Objects")
+	FString Name;
+
+	UPROPERTY(BlueprintReadWrite, Category="Speckle|Objects")
+	FString CollectionType;
+	
+	UCollection() : UBase(TEXT("Speckle.Core.Models.Collection")) {}
+	
+	virtual bool Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport) override;
+};

Source/SpeckleUnreal/Public/Objects/Base.h

@@ -13,7 +13,7 @@
  * Either by Stream Id + Object Id (Object selection mode)
  * Or by Stream + Branch + Commit (Commit selection mode)
  */
-UCLASS(ClassGroup=(Speckle), meta=(BlueprintSpawnableComponent))
+UCLASS(ClassGroup=(Speckle), meta=(BlueprintSpawnableComponent), HideCategories=(Activation, Collision, Cooking, Tags))
 class SPECKLEUNREAL_API UReceiveSelectionComponent : public UActorComponent
 {
     GENERATED_BODY()
@@ -126,7 +126,7 @@ class SPECKLEUNREAL_API UReceiveSelectionComponent : public UActorComponent
 #pragma endregion
 
 #pragma region Branch
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Transient, Category="Speckle", meta=(DisplayName="Branch", GetOptions=GetBranchOptions, EditCondition="IsStreamValid && !bManualMode", NoResetToDefault))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Transient, Category="Speckle", meta=(DisplayName="Branch", GetOptions=GetBranchOptions, EditCondition="IsAccountValid && !bManualMode", NoResetToDefault))
 	FString SelectedBranchText;
 
 	UPROPERTY(BlueprintReadOnly, Transient, Category="Speckle")
@@ -150,7 +150,7 @@ class SPECKLEUNREAL_API UReceiveSelectionComponent : public UActorComponent
 #pragma endregion
 
 #pragma region Commit
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Transient, Category="Speckle", meta=(DisplayName="Commit", GetOptions=GetCommitOptions, EditCondition="IsCommitValid && !bManualMode", NoResetToDefault))
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Transient, Category="Speckle", meta=(DisplayName="Commit", GetOptions=GetCommitOptions, EditCondition="IsAccountValid && !bManualMode", NoResetToDefault))
 	FString SelectedCommitText;
 
 	UPROPERTY(BlueprintReadOnly, Transient, Category="Speckle")

Source/SpeckleUnreal/Public/Objects/Collection.h

@@ -13,7 +13,7 @@ class FJsonObject;
 /**
  * An Actor to handle the receiving of Speckle objects into a level
  */
-UCLASS(ClassGroup=(Speckle), AutoCollapseCategories=("Speckle|Conversion"), BlueprintType)
+UCLASS(ClassGroup=(Speckle), AutoCollapseCategories=("Speckle|Conversion"), BlueprintType, HideCategories = (Collision, Rendering, Replication, HLOD, Physics, Networking, Input, Actor))
 class SPECKLEUNREAL_API ASpeckleUnrealManager : public AActor
 {
 	GENERATED_BODY()

Source/SpeckleUnreal/Public/ReceiveSelectionComponent.h

@@ -15,7 +15,7 @@ public SpeckleUnreal(ReadOnlyTargetRules Target) : base(Target)
 		//
 		// bUseUnity = false;
 
-		PublicDefinitions.Add("SPECKLE_CONNECTOR_VERSION=\"2.15.1\"");
+		PublicDefinitions.Add("SPECKLE_CONNECTOR_VERSION=\"2.15.2\"");
 
         PublicIncludePaths.AddRange(
 			new string[] {

Source/SpeckleUnreal/Public/SpeckleUnrealManager.h

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.15.1",
+	"VersionName": "2.15.2",
 	"FriendlyName": "Speckle Unreal",
 	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
 	"Category": "AEC",