fix bug

netwarm007 · Jan 6, 2023 · a12275d · a12275d
1 parent d5c6433
commit a12275d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Asset/Shaders/CUDA/OptixTest.shader.cu b/Asset/Shaders/CUDA/OptixTest.shader.cu
@@ -176,15 +176,15 @@ __global__ void __miss__ms() {
 
     vec3 unit_direction = _V(optixGetWorldRayDirection());
     float t = 0.5f * (unit_direction[1] + 1.0f);
-    vec3 c = (1.0f - t) * color({0, 0, 0}) + t * (missData->bg_color);
+    vec3 c = (1.0f - t) * color({1, 1, 1}) + t * (missData->bg_color);
 
     setPayload(c, false);
 }
 
 extern "C"
 __global__ void __closesthit__ch() {
     auto payload = getPayload();
-    if(payload.max_depth < 0) {
+    if(payload.max_depth <= 0) {
         setPayload({0.f, 0.f, 0.f}, false);
         return;
     }

diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt
@@ -45,7 +45,7 @@ if(USE_CUDA)
 
         add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/Asset/Shaders/CUDA/OptixTest.shader.optixir 
             COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Asset/Shaders/CUDA
-            COMMAND nvcc -G -O0 --std c++20 -o ${PROJECT_BINARY_DIR}/Asset/Shaders/CUDA/OptixTest.shader.optixir --optix-ir ${PROJECT_SOURCE_DIR}/Asset/Shaders/CUDA/OptixTest.shader.cu
+            COMMAND nvcc --std c++20 -o ${PROJECT_BINARY_DIR}/Asset/Shaders/CUDA/OptixTest.shader.optixir --optix-ir ${PROJECT_SOURCE_DIR}/Asset/Shaders/CUDA/OptixTest.shader.cu
                     -I ${OPTIX76_INCLUDE_DIR} 
                     -I ${PROJECT_SOURCE_DIR} 
                     -I ${PROJECT_SOURCE_DIR}/Framework/GeomMath/ 

diff --git a/Test/OptixTest.cu b/Test/OptixTest.cu
@@ -111,7 +111,7 @@ int main() {
         for (int a = -11; a < 11; a++) {
             for (int b = -11; b < 11; b++) {
                 g_mat_indices[index]    = index; 
-                sphereVertex[index]     = make_float3(a + RND, 0.2f, b + RND);
+                sphereVertex[index]     = make_float3(a + 0.9 * RND, 0.2f, b + 0.9 * RND);
                 sphereRadius[index++]   = 0.2f;
             }
         }
@@ -419,7 +419,7 @@ int main() {
 						optixSbtRecordPackHeader(hitgroup_prog_group, &hg_sbt[index]));
                     hg_sbt[index].data.material_type = Material::MAT_METAL;
                     hg_sbt[index].data.base_color = {0.5f * (1.0f + RND), 0.5f * (1.0f + RND), 0.5f * (1.0f + RND)};
-                    hg_sbt[index++].data.fuzz = 0.5f * (1.0f + RND);
+                    hg_sbt[index++].data.fuzz = 0.5f * RND;
                 } else {
 					checkOptiXErrors(
 						optixSbtRecordPackHeader(hitgroup_prog_group, &hg_sbt[index]));
@@ -432,7 +432,7 @@ int main() {
 		checkOptiXErrors(
 			optixSbtRecordPackHeader(hitgroup_prog_group, &hg_sbt[index]));
         hg_sbt[index].data.material_type = Material::MAT_DIELECTRIC;
-        hg_sbt[index++].data.base_color = 1.5f;
+        hg_sbt[index++].data.ir = 1.5f;
 
 		checkOptiXErrors(
 			optixSbtRecordPackHeader(hitgroup_prog_group, &hg_sbt[index]));

diff --git a/Test/RayTracingCUDATest.cu b/Test/RayTracingCUDATest.cu