diff --git a/Content/Map/Test_Level.umap b/Content/Map/Test_Level.umap index e2e6cc48..6175377d 100644 Binary files a/Content/Map/Test_Level.umap and b/Content/Map/Test_Level.umap differ diff --git a/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.dll b/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.dll index bce79f0c..c4cca2ec 100644 Binary files a/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.dll and b/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.dll differ diff --git a/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.exp b/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.exp index e09329a9..375faf8e 100644 Binary files a/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.exp and b/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.exp differ diff --git a/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.pdb b/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.pdb index 9f56f44b..940c0f0f 100644 Binary files a/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.pdb and b/Plugins/LuckyDataTransfer/Binaries/Win64/UnrealEditor-LuckyDataTransfer.pdb differ diff --git a/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Private/LuckyDataTransferSubsystem.cpp b/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Private/LuckyDataTransferSubsystem.cpp index fb4bd789..85b78a88 100644 --- a/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Private/LuckyDataTransferSubsystem.cpp +++ b/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Private/LuckyDataTransferSubsystem.cpp @@ -17,6 +17,7 @@ #include "JsonObjectConverter.h" #include "ReviewComments.h" #include "WebSocketsModule.h" +#include "IWebSocket.h" #include "Kismet/KismetStringLibrary.h" #include "Camera/CameraActor.h" #include "Camera/CameraComponent.h" @@ -55,7 +56,7 @@ void ULuckyDataTransferSubsystem::Deinitialize() void ULuckyDataTransferSubsystem::Internal_OpenWebsocket(const FString& URL, const FString& Protocol) { - const FString NewUrl = URL.IsEmpty() ? TEXT("ws://127.0.0.1:3000/ws") : URL; + const FString NewUrl = URL.IsEmpty() ? TEXT("ws://127.0.0.1:3000/world") : URL; const FString NewProtocol = Protocol.IsEmpty() ? TEXT("ws") : Protocol; UE_LOG(LogTemp, Warning, TEXT("Opening WebSocket URL: %s"), *NewUrl); @@ -66,6 +67,9 @@ void ULuckyDataTransferSubsystem::Internal_OpenWebsocket(const FString& URL, con } Socket = FWebSocketsModule::Get().CreateWebSocket(NewUrl); + + if (Socket.IsValid()) UE_LOG(LogTemp, Warning, TEXT("socket Valid %s"), *NewUrl); + Socket->Connect(); //Set up callbacks @@ -80,8 +84,9 @@ void ULuckyDataTransferSubsystem::Callback_OnConnected() if (OnSocketReady.IsBound()) { OnSocketReady.Broadcast(true); - UE_LOG(LogTemp, VeryVerbose, TEXT("WebSocket connected successfully")); } + + UE_LOG(LogTemp, Warning, TEXT("WebSocket connected successfully")); } void ULuckyDataTransferSubsystem::Callback_OnConnectionError(const FString& Error) @@ -207,7 +212,7 @@ bool ULuckyDataTransferSubsystem::WriteImageToDisk(const FString& inPath, const return false; } - FString Path = inPath.IsEmpty() ? TEXT("C:/LuckyRobotsImages") : inPath; + FString Path = inPath.IsEmpty() ? TEXT("../Saved/LuckyRobotsData") : inPath; // swap this for const path if (!SensorPawns.IsEmpty()) { diff --git a/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Public/ObservationData.h b/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Public/ObservationData.h index 8d685ef9..1c8732dd 100644 --- a/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Public/ObservationData.h +++ b/Plugins/LuckyDataTransfer/Source/LuckyDataTransfer/Public/ObservationData.h @@ -58,6 +58,9 @@ public: UPROPERTY(BlueprintReadWrite, Category = "Observation") FString filePath = FString(); + + UPROPERTY(BlueprintReadWrite, Category = "Observation") + FString timeStamp = FString(); }; USTRUCT(BlueprintType) @@ -67,10 +70,14 @@ struct FObservationPayload public: UPROPERTY(BlueprintReadWrite, Category = "Observation") - FString timeStamp = FString(); - + FString type = FString(); + UPROPERTY(BlueprintReadWrite, Category = "Observation") - FString id = FString(); + FString request_id = FString(); + + + UPROPERTY(BlueprintReadWrite, Category = "Observation") + FString timeStamp = FString(); UPROPERTY(BlueprintReadWrite, Category = "Observation") TMap ObservationState;