diff --git a/apps/imguiapp/camera.xml b/apps/imguiapp/camera.xml index 70dcdc5c9..b372e5626 100644 --- a/apps/imguiapp/camera.xml +++ b/apps/imguiapp/camera.xml @@ -1,5 +1,5 @@ - + 40 0 0 diff --git a/apps/imguiapp/main.cpp b/apps/imguiapp/main.cpp index cb936bf3c..2394d7988 100644 --- a/apps/imguiapp/main.cpp +++ b/apps/imguiapp/main.cpp @@ -52,13 +52,6 @@ void PrepareScene() // Compensate for different evaluation in PBRT sky->worldToLight = mat4::RotateX( -PI / 2 ); scene->SetSkyDome( sky ); -#if 1 - // escher - materialFile = string( "data/materials.xml" ); - int mesh = renderer->AddMesh( "../_shareddata/escher/escher2010.obj" ); - int inst = renderer->AddInstance( mesh ); - renderer->SetNodeTransform( inst, mat4::RotateX( PI / 4 ) * mat4::RotateZ( PI / 2 ) ); -#else // classic scene materialFile = string( "data/pica_materials.xml" ); int rootNode = renderer->AddScene( "../_shareddata/pica/scene.gltf" ); @@ -69,7 +62,6 @@ void PrepareScene() int lightQuad = renderer->AddQuad( make_float3( 0, -1, 0 ), make_float3( 0, 21, 0 ), 10.9f, 10.9f, whiteMat ); renderer->AddInstance( lightQuad ); renderer->AddScene( "../_shareddata/drone/scene.gltf", mat4::Translate( 4.5f, -3.4f, -5.2f ) * mat4::Scale( 0.02f ) ); -#endif // optional animated models // renderer->AddScene( "../_shareddata/CesiumMan.glb", mat4::Translate( 0, -2, -9 ) ); // renderer->AddScene( "../_shareddata/project_polly.glb", mat4::Translate( 4.5f, -5.45f, -5.2f ) * mat4::Scale( 2 ) ); @@ -148,8 +140,8 @@ void Initialize() // initialize renderer: pick one // renderer = RenderAPI::CreateRenderAPI( "RenderCore_Optix7filter" ); // OPTIX7 core, with filtering (static scenes only for now) - // renderer = RenderAPI::CreateRenderAPI( "RenderCore_Optix7" ); // OPTIX7 core, best for RTX devices - renderer = RenderAPI::CreateRenderAPI( "RenderCore_OptixPrime_B" ); // OPTIX PRIME, best for pre-RTX CUDA devices + renderer = RenderAPI::CreateRenderAPI( "RenderCore_Optix7" ); // OPTIX7 core, best for RTX devices + // renderer = RenderAPI::CreateRenderAPI( "RenderCore_OptixPrime_B" ); // OPTIX PRIME, best for pre-RTX CUDA devices // renderer = RenderAPI::CreateRenderAPI( "RenderCore_PrimeRef" ); // REFERENCE, for image validation // renderer = RenderAPI::CreateRenderAPI( "RenderCore_SoftRasterizer" ); // RASTERIZER, your only option if not on NVidia // renderer = RenderAPI::CreateRenderAPI( "RenderCore_Minimal" ); // MINIMAL example, to get you started on your own core diff --git a/apps/imguiapp/main_tools.h b/apps/imguiapp/main_tools.h index 22a1760a1..e7e18211d 100644 --- a/apps/imguiapp/main_tools.h +++ b/apps/imguiapp/main_tools.h @@ -37,8 +37,8 @@ void ReshapeWindowCallback( GLFWwindow* window, int w, int h ) void KeyEventCallback( GLFWwindow* window, int key, int scancode, int action, int mods ) { if (key == GLFW_KEY_ESCAPE) running = false; - if (action == GLFW_PRESS) keystates[key] = true; - else if (action == GLFW_RELEASE) keystates[key] = false; + if (action == GLFW_PRESS && key >= 0 && key < 1024) keystates[key] = true; + else if (action == GLFW_RELEASE && key >= 0 && key < 1024) keystates[key] = false; } void CharEventCallback( GLFWwindow* window, uint code ) { /* nothing here yet */ } void WindowFocusCallback( GLFWwindow* window, int focused ) { hasFocus = (focused == GL_TRUE); } diff --git a/apps/imguiapp/nvrtc-builtins64_102.dll b/apps/imguiapp/nvrtc-builtins64_102.dll new file mode 100644 index 000000000..9ad603a4b Binary files /dev/null and b/apps/imguiapp/nvrtc-builtins64_102.dll differ diff --git a/apps/imguiapp/nvrtc64_102_0.dll b/apps/imguiapp/nvrtc64_102_0.dll new file mode 100644 index 000000000..d2ebb14dc Binary files /dev/null and b/apps/imguiapp/nvrtc64_102_0.dll differ diff --git a/apps/imguiapp/optix.6.0.0.dll b/apps/imguiapp/optix.6.0.0.dll new file mode 100644 index 000000000..d4df47fe9 Binary files /dev/null and b/apps/imguiapp/optix.6.0.0.dll differ diff --git a/apps/pbrtdemoapp/nvrtc-builtins64_102.dll b/apps/pbrtdemoapp/nvrtc-builtins64_102.dll new file mode 100644 index 000000000..9ad603a4b Binary files /dev/null and b/apps/pbrtdemoapp/nvrtc-builtins64_102.dll differ diff --git a/apps/pbrtdemoapp/nvrtc64_102_0.dll b/apps/pbrtdemoapp/nvrtc64_102_0.dll new file mode 100644 index 000000000..d2ebb14dc Binary files /dev/null and b/apps/pbrtdemoapp/nvrtc64_102_0.dll differ