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

- disabled natviz, needs to be enabled again - currently doesn't work with packaging tho

- updated scene loading with empty Scene
- updated tablet ui for sceneloading
- fixed dll loading string bug in cuda plugin
parent fca0499f
Branches
No related tags found
No related merge requests found
Showing
with 17 additions and 2 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
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
......@@ -146,6 +146,17 @@ void FOptiXModule::LoadSceneData()
TArray<FString> FoundFiles;
FSceneData EmptyScene;
EmptyScene.SceneName = "EmptyScene";
EmptyScene.LaserPosition = 0;
EmptyScene.Wavelength = 500;
SceneDataArray.Push(EmptyScene);
PlatformFile.FindFiles(FoundFiles, *SceneDataDirectory, TEXT(".zmx"));
for (const FString& SceneFile : FoundFiles)
......@@ -189,7 +200,7 @@ void FOptiXModule::LoadSceneData()
if(Arguments.IsValidIndex(2))
SceneData.Wavelength = FCString::Atof(*Arguments[2]) *1000.0f;
else
UE_LOG(LogTemp, Warning, TEXT("Could not parse wavelength, using defualt of 500.0. Line is: '%s'."), *Line);
UE_LOG(LogTemp, Warning, TEXT("Could not parse wavelength, using default of 500.0. Line is: '%s'."), *Line);
}
else if (Arguments[0] == "SURF")
{
......
......@@ -77,7 +77,10 @@ public class CUDALibrary : ModuleRules
PublicDelayLoadDLLs.Add("nvrtc-builtins64_101.dll");
// Delay-load the DLL, so we can load it from the right place first
RuntimeDependencies.Add("cudart64_101.dll");
string BaseBinDir = ModuleDirectory + "/../../../Binaries/ThirdParty";
RuntimeDependencies.Add(BaseBinDir + "/Win64/cudart64_101.dll");
}
......
......@@ -145,6 +145,7 @@ public class OptiXLibrary : ModuleRules
"optix.6.5.0.dll",
"optix_prime.6.5.0.dll",
"optixu.6.5.0.dll",
"cudart64_101.dll"
//"optix_denoiser.6.0.0.dll",
//"optix_ssim_predictor.6.0.0.dll",
//"cudnn64_7.dll"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment