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

- fixed UI not rotating correctly

- trigger-grab seems to work decently now
parent cfc96fff
Branches Rendering
No related tags found
No related merge requests found
No preview for this file type
...@@ -17,10 +17,19 @@ UOptiXContext::UOptiXContext(const FObjectInitializer& ObjectInitializer) ...@@ -17,10 +17,19 @@ UOptiXContext::UOptiXContext(const FObjectInitializer& ObjectInitializer)
} }
optix::Context UOptiXContext::Init() optix::Context UOptiXContext::Init()
{
UOptiXGeometryGroup* Group = NewObject<UOptiXGeometryGroup>(this, UOptiXGeometryGroup::StaticClass());
try
{ {
NativeContext = optix::Context::create(); NativeContext = optix::Context::create();
LaserContext = optix::Context::create(); }
UE_LOG(LogTemp, Warning, TEXT("OptiX Context Constructor")); catch (optix::Exception& E)
{
FString Message = FString(E.getErrorString().c_str());
UE_LOG(OptiXPluginContext, Fatal, TEXT("OptiX Error: %s"), *Message);
GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, FString::Printf(TEXT("OptiX Error %s"), *Message));
}
UE_LOG(LogTemp, Warning, TEXT("OptiX Context Init"));
return NativeContext; return NativeContext;
} }
... ...
......
...@@ -404,7 +404,6 @@ private: ...@@ -404,7 +404,6 @@ private:
optix::Context NativeContext; optix::Context NativeContext;
optix::Context LaserContext;
UPROPERTY() // Just here for now so we the objects don't ge GC'd UPROPERTY() // Just here for now so we the objects don't ge GC'd
TMap<FString, UOptiXBuffer*> BufferMap; TMap<FString, UOptiXBuffer*> BufferMap;
... ...
......
...@@ -115,11 +115,12 @@ public: ...@@ -115,11 +115,12 @@ public:
void EndPlay() void EndPlay()
{ {
//bEndPlay.AtomicSet(true);
//CleanupOptiXOnEnd(); //CleanupOptiXOnEnd();
//bCleanup.AtomicSet(true); //bCleanup.AtomicSet(true);
//bStartTracing.AtomicSet(false); //bStartTracing.AtomicSet(false);
//bCleanup.AtomicSet(false); //bCleanup.AtomicSet(false);
//bEndPlay.AtomicSet(true);
} }
UOptiXContext* GetOptiXContext() UOptiXContext* GetOptiXContext()
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment