Skip to content
Snippets Groups Projects
Commit cfc96fff authored by David Gilbert's avatar David Gilbert :bug:
Browse files

- changed grab to trigger button as well

- fixed packaging error due to natviz (disabled for the two problematic widgets)
parent c85e6168
No related branches found
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
No preview for this file type
File added
......@@ -74,20 +74,6 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ArrowX->bVisibleInReflectionCaptures = false;
ArrowX->SetCanEverAffectNavigation(false);
TranslateWidgetX = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetX"));
TranslateWidgetX->SetAbsolute(false, true, true);
TranslateWidgetX->SetupAttachment(ArrowX);
static ConstructorHelpers::FClassFinder<UUserWidget> PosWidgetClass(TEXT("/OptiX/UI/Translator/PositionCounter"));
TranslateWidgetX->SetWidgetClass(PosWidgetClass.Class);
//TranslateWidgetX->SetRelativeLocationAndRotation(FVector(0, 0, 0), FRotator(0, 90, 0));
//TranslateWidgetX->SetWorldRotation(FRotator());
TranslateWidgetX->SetRelativeScale3D(FVector(0.05, 0.05, 0.05));
TranslateWidgetX->SetDrawSize(FVector2D(300, 300));
TranslateWidgetX->SetHiddenInGame(true);
TranslateWidgetX->SetGenerateOverlapEvents(false);
//TranslateWidgetX->SetTwoSided(true);
// todo
TranslateY = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("TranslateY"));
TranslateY->SetAbsolute(false, true, true);
......@@ -117,17 +103,6 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ArrowY->bVisibleInReflectionCaptures = false;
ArrowY->SetCanEverAffectNavigation(false);
TranslateWidgetY = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetY"));
TranslateWidgetY->SetAbsolute(false, true, true);
TranslateWidgetY->SetupAttachment(ArrowY);
TranslateWidgetY->SetWidgetClass(PosWidgetClass.Class);
//TranslateWidgetY->SetWorldRotation(FRotator());
TranslateWidgetY->SetRelativeScale3D(FVector(0.05, 0.05, 0.05));
TranslateWidgetY->SetDrawSize(FVector2D(300, 300));
TranslateWidgetY->SetHiddenInGame(true);
TranslateWidgetY->SetGenerateOverlapEvents(false);
//TranslateWidgetY->SetTwoSided(true);
TranslateZ = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("TranslateZ"));
TranslateZ->SetAbsolute(false, true, true);
TranslateZ->SetupAttachment(TranslationSupport);
......@@ -154,20 +129,6 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ArrowZ->CastShadow = 0;
ArrowZ->bVisibleInReflectionCaptures = false;
TranslateWidgetZ = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetZ"));
TranslateWidgetZ->SetAbsolute(false, true, true);
//TranslateWidgetZ->SetTwoSided(true);
TranslateWidgetZ->SetupAttachment(ArrowZ);
TranslateWidgetZ->SetWidgetClass(PosWidgetClass.Class);
//TranslateWidgetZ->SetWorldRotation(FRotator());
TranslateWidgetZ->SetRelativeScale3D(FVector(0.05, 0.05, 0.05));
TranslateWidgetZ->SetDrawSize(FVector2D(300, 300));
TranslateWidgetZ->SetRelativeLocation(FVector(8, 0, 0));
TranslateWidgetZ->SetHiddenInGame(true);
TranslateWidgetZ->SetGenerateOverlapEvents(false);
UE_LOG(LogTemp, Display, TEXT("OptiX ASelectableActorBase Constructor 2/4"));
......@@ -336,6 +297,47 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ConnectorH->CastShadow = 0;
ConnectorH->bVisibleInReflectionCaptures = false;
static ConstructorHelpers::FClassFinder<UUserWidget> PosWidgetClass(TEXT("/OptiX/UI/Translator/PositionCounter"));
TranslateWidgetX = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetX"));
TranslateWidgetX->SetAbsolute(false, true, true);
TranslateWidgetX->SetupAttachment(ArrowX);
TranslateWidgetX->SetWidgetClass(PosWidgetClass.Class);
//TranslateWidgetX->SetRelativeLocationAndRotation(FVector(0, 0, 0), FRotator(0, 90, 0));
//TranslateWidgetX->SetWorldRotation(FRotator());
TranslateWidgetX->SetRelativeScale3D(FVector(0.05, 0.05, 0.05));
TranslateWidgetX->SetDrawSize(FVector2D(300, 300));
TranslateWidgetX->SetHiddenInGame(true);
TranslateWidgetX->SetGenerateOverlapEvents(false);
//TranslateWidgetX->SetTwoSided(true);
// todo
TranslateWidgetY = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetY"));
TranslateWidgetY->SetAbsolute(false, true, true);
TranslateWidgetY->SetupAttachment(ArrowY);
TranslateWidgetY->SetWidgetClass(PosWidgetClass.Class);
//TranslateWidgetY->SetWorldRotation(FRotator());
TranslateWidgetY->SetRelativeScale3D(FVector(0.05, 0.05, 0.05));
TranslateWidgetY->SetDrawSize(FVector2D(300, 300));
TranslateWidgetY->SetHiddenInGame(true);
TranslateWidgetY->SetGenerateOverlapEvents(false);
//TranslateWidgetY->SetTwoSided(true);
TranslateWidgetZ = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetZ"));
TranslateWidgetZ->SetAbsolute(false, true, true);
//TranslateWidgetZ->SetTwoSided(true);
TranslateWidgetZ->SetupAttachment(ArrowZ);
TranslateWidgetZ->SetWidgetClass(PosWidgetClass.Class);
//TranslateWidgetZ->SetWorldRotation(FRotator());
TranslateWidgetZ->SetRelativeScale3D(FVector(0.05, 0.05, 0.05));
TranslateWidgetZ->SetDrawSize(FVector2D(300, 300));
TranslateWidgetZ->SetRelativeLocation(FVector(8, 0, 0));
TranslateWidgetZ->SetHiddenInGame(true);
TranslateWidgetZ->SetGenerateOverlapEvents(false);
UE_LOG(LogTemp, Display, TEXT("OptiX ASelectableActorBase Constructor End 4/4"));
......
......@@ -192,13 +192,14 @@ public:
void BroadcastWavelengthChange(float WL)
{
WavelengthChangedEvent.Broadcast(WL);
//UE_LOG(LogTemp, Error, TEXT("LaserMaterialDynamic is invalid!"));
}
public:
FThreadSafeBool bStartTracing = false;
//FThreadSafeBool bEndPlay = false;
FThreadSafeBool bIsInitialized = false;
FThreadSafeBool bLaserIsInitialized = false;
FThreadSafeBool bSceneChanged = true;
......@@ -207,6 +208,7 @@ public:
FThreadSafeBool bCleanup = false;
FThreadSafeBool bValidCubemap = false;
FThreadSafeBool bRequestOrthoPass = false;
//FThreadSafeBool bEndPlay = false;
FLaserTraceFinishedEvent LaserTraceFinishedEvent;
FWavelengthChangedEvent WavelengthChangedEvent;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment