diff --git a/Source/DasherVR/Private/SDasherWidget.cpp b/Source/DasherVR/Private/SDasherWidget.cpp index 6d993fc67e49d6c65ce0e2ac73101d7c74e213dc..0690f3d26d79a41a805f632ea2efc4e0058ae73b 100644 --- a/Source/DasherVR/Private/SDasherWidget.cpp +++ b/Source/DasherVR/Private/SDasherWidget.cpp @@ -230,11 +230,11 @@ void SDasherWidget::Construct(const FArguments& InArgs) // Bind the cluster events that manage the door state. IDisplayClusterClusterManager* ClusterManager = IDisplayCluster::Get().GetClusterMgr(); - if (ClusterManager && !ClusterEvent.IsBound()) + if (ClusterManager && !ClusterEventListener.IsBound()) { - ClusterEvent = + ClusterEventListener = FOnClusterEventJsonListener::CreateSP(this, &SDasherWidget::HandleClusterEvent); - ClusterManager->AddClusterEventJsonListener(ClusterEvent); + ClusterManager->AddClusterEventJsonListener(ClusterEventListener); } if (URWTHVRUtilities::IsPrimaryNode()) diff --git a/Source/DasherVR/Public/SDasherWidget.h b/Source/DasherVR/Public/SDasherWidget.h index b65371c2c0698f0bb48f8785919fb754b0b95440..4b5bd278e1d74cf42d99aa57be817c5ac8d818cb 100644 --- a/Source/DasherVR/Public/SDasherWidget.h +++ b/Source/DasherVR/Public/SDasherWidget.h @@ -26,8 +26,6 @@ struct DasherDrawGeometry GeometryType Type; DasherDrawGeometry(GeometryType Type) : Type(Type) {} virtual ~DasherDrawGeometry() {}; - - virtual void Serialize(FMemoryWriter& ar) = 0; }; struct FFilledRect : DasherDrawGeometry { @@ -168,7 +166,7 @@ private: TSharedPtr<FSlateFontMeasure> FontMeasureService; //CAVE Sync - FOnClusterEventJsonListener ClusterEvent; + FOnClusterEventJsonListener ClusterEventListener; protected: // stores color information diff --git a/Source/Thirdparty/CMakeLists.txt b/Source/Thirdparty/CMakeLists.txt index 0f69d3bc120cb7128239c46db9184254fd89255f..dc66fff409921184fb5c97aea50af2e039d4f665 100644 --- a/Source/Thirdparty/CMakeLists.txt +++ b/Source/Thirdparty/CMakeLists.txt @@ -17,7 +17,8 @@ project("DasherLib") ############################################################################################################ # Set this to your libc++ path included with Unreal ############################################################################################################ -set(LIBC_PATH "/work/vrdemo/unreal_engines/5.3.2/Engine/Source/ThirdParty/Unix/LibCxx/") +# set(LIBC_PATH "/work/vrdemo/unreal_engines/5.3.2/Engine/Source/ThirdParty/Unix/LibCxx/") +set(LIBC_PATH "/home/ue4/UnrealEngine/Engine/Source/ThirdParty/Unix/LibCxx/") if (UNIX) ############################################################################################################ diff --git a/Source/Thirdparty/Dasher/Lib/DasherCore.a b/Source/Thirdparty/Dasher/Lib/DasherCore.a index cbf7ab7c8b6885aa258789c4043546a98f83ae42..77d401c435ff6fd6b30cf5dced2db7796791c8d9 100644 Binary files a/Source/Thirdparty/Dasher/Lib/DasherCore.a and b/Source/Thirdparty/Dasher/Lib/DasherCore.a differ