Skip to content
Snippets Groups Projects
Commit 72997b03 authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Adding binaries

parent a2976462
No related branches found
No related tags found
1 merge request!2Backporting many features from the study on top of the Dasher3D-Core
...@@ -230,11 +230,11 @@ void SDasherWidget::Construct(const FArguments& InArgs) ...@@ -230,11 +230,11 @@ void SDasherWidget::Construct(const FArguments& InArgs)
// Bind the cluster events that manage the door state. // Bind the cluster events that manage the door state.
IDisplayClusterClusterManager* ClusterManager = IDisplayCluster::Get().GetClusterMgr(); IDisplayClusterClusterManager* ClusterManager = IDisplayCluster::Get().GetClusterMgr();
if (ClusterManager && !ClusterEvent.IsBound()) if (ClusterManager && !ClusterEventListener.IsBound())
{ {
ClusterEvent = ClusterEventListener =
FOnClusterEventJsonListener::CreateSP(this, &SDasherWidget::HandleClusterEvent); FOnClusterEventJsonListener::CreateSP(this, &SDasherWidget::HandleClusterEvent);
ClusterManager->AddClusterEventJsonListener(ClusterEvent); ClusterManager->AddClusterEventJsonListener(ClusterEventListener);
} }
if (URWTHVRUtilities::IsPrimaryNode()) if (URWTHVRUtilities::IsPrimaryNode())
......
...@@ -26,8 +26,6 @@ struct DasherDrawGeometry ...@@ -26,8 +26,6 @@ struct DasherDrawGeometry
GeometryType Type; GeometryType Type;
DasherDrawGeometry(GeometryType Type) : Type(Type) {} DasherDrawGeometry(GeometryType Type) : Type(Type) {}
virtual ~DasherDrawGeometry() {}; virtual ~DasherDrawGeometry() {};
virtual void Serialize(FMemoryWriter& ar) = 0;
}; };
struct FFilledRect : DasherDrawGeometry { struct FFilledRect : DasherDrawGeometry {
...@@ -168,7 +166,7 @@ private: ...@@ -168,7 +166,7 @@ private:
TSharedPtr<FSlateFontMeasure> FontMeasureService; TSharedPtr<FSlateFontMeasure> FontMeasureService;
//CAVE Sync //CAVE Sync
FOnClusterEventJsonListener ClusterEvent; FOnClusterEventJsonListener ClusterEventListener;
protected: protected:
// stores color information // stores color information
......
...@@ -17,7 +17,8 @@ project("DasherLib") ...@@ -17,7 +17,8 @@ project("DasherLib")
############################################################################################################ ############################################################################################################
# Set this to your libc++ path included with Unreal # 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) if (UNIX)
############################################################################################################ ############################################################################################################
......
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment