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

- reverted laser trace only on scene change, as the detector needs a continuous laser trace

- added custom depth stencil buffer to highlight outlines when hovering over objects
parent e5e9f5dd
No related branches found
No related tags found
No related merge requests found
Showing
with 5 additions and 3 deletions
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
No preview for this file type
No preview for this file type
No preview for this file type
File added
No preview for this file type
...@@ -237,7 +237,7 @@ void FOptiXContextManager::PostRenderView_RenderThread(FRHICommandListImmediate ...@@ -237,7 +237,7 @@ void FOptiXContextManager::PostRenderView_RenderThread(FRHICommandListImmediate
void FOptiXContextManager::LaunchLaser(FRHICommandListImmediate & RHICmdList) void FOptiXContextManager::LaunchLaser(FRHICommandListImmediate & RHICmdList)
{ {
TRACE_CPUPROFILER_EVENT_SCOPE(TEXT("FOptiXContextManager::LaunchLaser")) TRACE_CPUPROFILER_EVENT_SCOPE(TEXT("FOptiXContextManager::LaunchLaser"))
if (bSceneChanged && bIsInitializedLaser && !CVarDisableLaserTrace.GetValueOnRenderThread()) if (/*bSceneChanged &&*/ bIsInitializedLaser && !CVarDisableLaserTrace.GetValueOnRenderThread())
{ {
// Analyze this // Analyze this
...@@ -293,7 +293,7 @@ void FOptiXContextManager::LaunchLaser(FRHICommandListImmediate & RHICmdList) ...@@ -293,7 +293,7 @@ void FOptiXContextManager::LaunchLaser(FRHICommandListImmediate & RHICmdList)
{ {
TRACE_CPUPROFILER_EVENT_SCOPE(TEXT("FOptiXContextManager::LaunchLaser::BroadcastFinish")) TRACE_CPUPROFILER_EVENT_SCOPE(TEXT("FOptiXContextManager::LaunchLaser::BroadcastFinish"))
bSceneChanged.AtomicSet(false); //bSceneChanged.AtomicSet(false);
for (const auto& Pair : LaserTraceFinishedCallbacks) for (const auto& Pair : LaserTraceFinishedCallbacks)
{ {
optix::TextureSampler Sampler = nullptr; optix::TextureSampler Sampler = nullptr;
...@@ -444,7 +444,7 @@ void FOptiXContextManager::Init() ...@@ -444,7 +444,7 @@ void FOptiXContextManager::Init()
void FOptiXContextManager::SceneChangedCallback() void FOptiXContextManager::SceneChangedCallback()
{ {
bSceneChanged.AtomicSet(true); //bSceneChanged.AtomicSet(true);
} }
void FOptiXContextManager::InitContext() void FOptiXContextManager::InitContext()
......
...@@ -19,6 +19,8 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti ...@@ -19,6 +19,8 @@ ASelectableActorBase::ASelectableActorBase(const FObjectInitializer& ObjectIniti
GetStaticMeshComponent()->SetGenerateOverlapEvents(true); GetStaticMeshComponent()->SetGenerateOverlapEvents(true);
GetStaticMeshComponent()->CastShadow = 0; GetStaticMeshComponent()->CastShadow = 0;
GetStaticMeshComponent()->SetHiddenInGame(false);
GetStaticMeshComponent()->SetRenderInMainPass(false);
UE_LOG(LogTemp, Display, TEXT("OptiX ASelectableActorBase Constructor Component Setup Start")); UE_LOG(LogTemp, Display, TEXT("OptiX ASelectableActorBase Constructor Component Setup Start"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment