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

- updated input to only use trigger and grip

- fixed UI bugs
- fixed support rods and UI meshes influencing navigation
- fixed missing pragma once
- enabled blueprint nativization, seems to work and package nicely
parent 600c076e
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
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -244,6 +244,7 @@ void UOptiXLensComponent::UpdateCubemap(FRHICommandListImmediate & RHICmdList) ...@@ -244,6 +244,7 @@ void UOptiXLensComponent::UpdateCubemap(FRHICommandListImmediate & RHICmdList)
void UOptiXLensComponent::CleanOptiXComponent() void UOptiXLensComponent::CleanOptiXComponent()
{ {
if(OptiXContext != NULL && OptiXContext->GetGroup("top_object") != NULL)
OptiXContext->GetGroup("top_object")->RemoveChild(OptiXTransform); OptiXContext->GetGroup("top_object")->RemoveChild(OptiXTransform);
OptiXTransform = nullptr; OptiXTransform = nullptr;
......
...@@ -218,7 +218,7 @@ void UOptiXCubemapComponent::BeginPlay() ...@@ -218,7 +218,7 @@ void UOptiXCubemapComponent::BeginPlay()
continue; continue;
} }
if (Itr->GetWidgetClass()->GetName().Contains("ScreenWidget")) if (Itr->GetWidgetClass() != NULL && Itr->GetWidgetClass()->GetName().Contains("ScreenWidget"))
{ {
HideActorComponents(Itr->GetOwner()); HideActorComponents(Itr->GetOwner());
} }
...@@ -299,8 +299,8 @@ void UOptiXCubemapComponent::CleanOptiXComponent() ...@@ -299,8 +299,8 @@ void UOptiXCubemapComponent::CleanOptiXComponent()
// Remove all the optix stuff again here from top to bottom // Remove all the optix stuff again here from top to bottom
if (OptiXContext == NULL)
OptiXGeometryGroup->RemoveChild(OptiXGeometryInstance); return;
//OptiXGeometryGroup = nullptr; // This should trigger the GC and eat the object if this is the last reference //OptiXGeometryGroup = nullptr; // This should trigger the GC and eat the object if this is the last reference
OptiXGeometryInstance->RemoveFromRoot(); OptiXGeometryInstance->RemoveFromRoot();
......
...@@ -207,10 +207,14 @@ void UOptiXTargetComponent::UpdateOptiXComponentVariables() ...@@ -207,10 +207,14 @@ void UOptiXTargetComponent::UpdateOptiXComponentVariables()
void UOptiXTargetComponent::CleanOptiXComponent() void UOptiXTargetComponent::CleanOptiXComponent()
{ {
if (OptiXContext->GetGroup("top_object") != nullptr) if (OptiXContext == NULL)
{ {
OptiXContext->GetGroup("top_object")->RemoveChild(OptiXTransform); Super::CleanOptiXComponent();
return;
} }
OptiXContext->GetGroup("top_object")->RemoveChild(OptiXTransform);
OptiXTransform = nullptr; OptiXTransform = nullptr;
OptiXAcceleration = nullptr; OptiXAcceleration = nullptr;
......
...@@ -47,6 +47,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -47,6 +47,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
TranslateX->CastShadow = 0; TranslateX->CastShadow = 0;
TranslateX->bVisibleInReflectionCaptures = false; TranslateX->bVisibleInReflectionCaptures = false;
TranslateX->SetCanEverAffectNavigation(false);
ArrowX = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("ArrowX")); ArrowX = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("ArrowX"));
ArrowX->SetupAttachment(TranslateX); ArrowX->SetupAttachment(TranslateX);
...@@ -61,7 +62,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -61,7 +62,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ArrowX->CastShadow = 0; ArrowX->CastShadow = 0;
ArrowX->bVisibleInReflectionCaptures = false; ArrowX->bVisibleInReflectionCaptures = false;
ArrowX->SetCanEverAffectNavigation(false);
TranslateWidgetX = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetX")); TranslateWidgetX = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetX"));
TranslateWidgetX->SetAbsolute(false, true, true); TranslateWidgetX->SetAbsolute(false, true, true);
...@@ -88,6 +89,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -88,6 +89,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
TranslateY->CastShadow = 0; TranslateY->CastShadow = 0;
TranslateY->bVisibleInReflectionCaptures = false; TranslateY->bVisibleInReflectionCaptures = false;
TranslateY->SetCanEverAffectNavigation(false);
ArrowY = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("ArrowY")); ArrowY = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("ArrowY"));
ArrowY->SetupAttachment(TranslateY); ArrowY->SetupAttachment(TranslateY);
...@@ -101,6 +103,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -101,6 +103,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ArrowY->CastShadow = 0; ArrowY->CastShadow = 0;
ArrowY->bVisibleInReflectionCaptures = false; ArrowY->bVisibleInReflectionCaptures = false;
ArrowY->SetCanEverAffectNavigation(false);
TranslateWidgetY = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetY")); TranslateWidgetY = CreateDefaultSubobject<UWidgetComponent>(TEXT("TranslateWidgetY"));
TranslateWidgetY->SetAbsolute(false, true, true); TranslateWidgetY->SetAbsolute(false, true, true);
...@@ -121,7 +124,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -121,7 +124,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
TranslateZ->SetGenerateOverlapEvents(false); TranslateZ->SetGenerateOverlapEvents(false);
TranslateZ->SetHiddenInGame(true); TranslateZ->SetHiddenInGame(true);
TranslateZ->SetWorldRotation(FRotator(90.f, 0.0f, 0.0f)); TranslateZ->SetWorldRotation(FRotator(90.f, 0.0f, 0.0f));
TranslateZ->SetCanEverAffectNavigation(false);
TranslateZ->CastShadow = 0; TranslateZ->CastShadow = 0;
TranslateZ->bVisibleInReflectionCaptures = false; TranslateZ->bVisibleInReflectionCaptures = false;
...@@ -134,7 +137,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -134,7 +137,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ArrowZ->SetGenerateOverlapEvents(false); ArrowZ->SetGenerateOverlapEvents(false);
ArrowZ->SetHiddenInGame(true); ArrowZ->SetHiddenInGame(true);
ArrowZ->SetAbsolute(false, false, true); ArrowZ->SetAbsolute(false, false, true);
ArrowZ->SetCanEverAffectNavigation(false);
ArrowZ->CastShadow = 0; ArrowZ->CastShadow = 0;
ArrowZ->bVisibleInReflectionCaptures = false; ArrowZ->bVisibleInReflectionCaptures = false;
...@@ -163,7 +166,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -163,7 +166,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ScaleH->SetGenerateOverlapEvents(false); ScaleH->SetGenerateOverlapEvents(false);
ScaleH->SetCollisionEnabled(ECollisionEnabled::NoCollision); ScaleH->SetCollisionEnabled(ECollisionEnabled::NoCollision);
ScaleH->SetHiddenInGame(true); ScaleH->SetHiddenInGame(true);
ScaleH->SetCanEverAffectNavigation(false);
ScaleH->CastShadow = 0; ScaleH->CastShadow = 0;
ScaleH->bVisibleInReflectionCaptures = false; ScaleH->bVisibleInReflectionCaptures = false;
...@@ -175,7 +178,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -175,7 +178,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ScaleV->SetGenerateOverlapEvents(false); ScaleV->SetGenerateOverlapEvents(false);
ScaleV->SetCollisionEnabled(ECollisionEnabled::NoCollision); ScaleV->SetCollisionEnabled(ECollisionEnabled::NoCollision);
ScaleV->SetHiddenInGame(true); ScaleV->SetHiddenInGame(true);
ScaleV->SetCanEverAffectNavigation(false);
ScaleV->CastShadow = 0; ScaleV->CastShadow = 0;
ScaleV->bVisibleInReflectionCaptures = false; ScaleV->bVisibleInReflectionCaptures = false;
...@@ -188,7 +191,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -188,7 +191,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
SupportH->SetGenerateOverlapEvents(false); SupportH->SetGenerateOverlapEvents(false);
SupportH->SetHiddenInGame(true); SupportH->SetHiddenInGame(true);
//SupportH->SetWorldLocation(FVector(25, 0, 0)); //SupportH->SetWorldLocation(FVector(25, 0, 0));
SupportH->SetCanEverAffectNavigation(false);
SupportH->CastShadow = 0; SupportH->CastShadow = 0;
SupportH->bVisibleInReflectionCaptures = false; SupportH->bVisibleInReflectionCaptures = false;
...@@ -201,7 +204,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -201,7 +204,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
SupportSphereH->SetGenerateOverlapEvents(false); SupportSphereH->SetGenerateOverlapEvents(false);
SupportSphereH->SetHiddenInGame(true); SupportSphereH->SetHiddenInGame(true);
SupportSphereH->SetRelativeLocation(FVector(0, 0, 100)); SupportSphereH->SetRelativeLocation(FVector(0, 0, 100));
SupportSphereH->SetCanEverAffectNavigation(false);
SupportSphereH->CastShadow = 0; SupportSphereH->CastShadow = 0;
SupportSphereH->bVisibleInReflectionCaptures = false; SupportSphereH->bVisibleInReflectionCaptures = false;
...@@ -223,7 +226,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -223,7 +226,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
SupportV->SetGenerateOverlapEvents(false); SupportV->SetGenerateOverlapEvents(false);
SupportV->SetHiddenInGame(true); SupportV->SetHiddenInGame(true);
//SupportV->SetWorldLocation(FVector(0, 25, 0)); //SupportV->SetWorldLocation(FVector(0, 25, 0));
SupportV->SetCanEverAffectNavigation(false);
SupportV->CastShadow = 0; SupportV->CastShadow = 0;
SupportV->bVisibleInReflectionCaptures = false; SupportV->bVisibleInReflectionCaptures = false;
...@@ -236,7 +239,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -236,7 +239,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
SupportSphereV->SetGenerateOverlapEvents(false); SupportSphereV->SetGenerateOverlapEvents(false);
SupportSphereV->SetHiddenInGame(true); SupportSphereV->SetHiddenInGame(true);
SupportSphereV->SetRelativeLocation(FVector(0, 0, 100)); SupportSphereV->SetRelativeLocation(FVector(0, 0, 100));
SupportSphereV->SetCanEverAffectNavigation(false);
SupportSphereV->CastShadow = 0; SupportSphereV->CastShadow = 0;
SupportSphereV->bVisibleInReflectionCaptures = false; SupportSphereV->bVisibleInReflectionCaptures = false;
...@@ -264,7 +267,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -264,7 +267,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ConnectorV->SetCollisionEnabled(ECollisionEnabled::NoCollision); ConnectorV->SetCollisionEnabled(ECollisionEnabled::NoCollision);
ConnectorV->SetMaterial(0, MetalMaterial.Object); ConnectorV->SetMaterial(0, MetalMaterial.Object);
ConnectorV->SetMaterial(1, MetalMaterial.Object); ConnectorV->SetMaterial(1, MetalMaterial.Object);
ConnectorV->SetCanEverAffectNavigation(false);
ConnectorV->CastShadow = 0; ConnectorV->CastShadow = 0;
ConnectorV->bVisibleInReflectionCaptures = false; ConnectorV->bVisibleInReflectionCaptures = false;
...@@ -279,7 +282,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -279,7 +282,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
Sphere->SetCollisionEnabled(ECollisionEnabled::NoCollision); Sphere->SetCollisionEnabled(ECollisionEnabled::NoCollision);
Sphere->SetWorldScale3D(FVector(0.05, 0.05, 0.05)); Sphere->SetWorldScale3D(FVector(0.05, 0.05, 0.05));
Sphere->SetRelativeLocation(FVector(0, 0, 100)); Sphere->SetRelativeLocation(FVector(0, 0, 100));
Sphere->SetCanEverAffectNavigation(false);
Sphere->CastShadow = 0; Sphere->CastShadow = 0;
Sphere->bVisibleInReflectionCaptures = false; Sphere->bVisibleInReflectionCaptures = false;
...@@ -293,7 +296,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -293,7 +296,7 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
ConnectorH->SetMaterial(1, MetalMaterial.Object); ConnectorH->SetMaterial(1, MetalMaterial.Object);
ConnectorH->SetGenerateOverlapEvents(false); ConnectorH->SetGenerateOverlapEvents(false);
ConnectorH->SetCollisionEnabled(ECollisionEnabled::NoCollision); ConnectorH->SetCollisionEnabled(ECollisionEnabled::NoCollision);
ConnectorH->SetCanEverAffectNavigation(false);
ConnectorH->CastShadow = 0; ConnectorH->CastShadow = 0;
ConnectorH->bVisibleInReflectionCaptures = false; ConnectorH->bVisibleInReflectionCaptures = false;
......
#pragma once
#include "PickupActorInterface.generated.h" #include "PickupActorInterface.generated.h"
UINTERFACE(BlueprintType) UINTERFACE(BlueprintType)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment