adapt to 2.5 - v2

RichardGe · RichardGe · commit 9976cf8707e5 · 2025-02-06T17:03:28.000+01:00
diff --git a/tutorials/01_geom_intersection/premake5.lua b/tutorials/01_geom_intersection/premake5.lua
@@ -10,6 +10,4 @@ project "01_geom_intersection"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/02_scene_intersection/premake5.lua b/tutorials/02_scene_intersection/premake5.lua
@@ -10,6 +10,4 @@ project "02_scene_intersection"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/03_custom_intersection/premake5.lua b/tutorials/03_custom_intersection/premake5.lua
@@ -10,6 +10,4 @@ project "03_custom_intersection"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/04_compaction/premake5.lua b/tutorials/04_compaction/premake5.lua
@@ -10,6 +10,4 @@ project "04_compaction"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/05_global_stack/premake5.lua b/tutorials/05_global_stack/premake5.lua
@@ -10,6 +10,4 @@ project "05_global_stack"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/06_dynamic_stack/premake5.lua b/tutorials/06_dynamic_stack/premake5.lua
@@ -10,6 +10,4 @@ project "06_dynamic_stack"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/07_custom_bvh_import/premake5.lua b/tutorials/07_custom_bvh_import/premake5.lua
@@ -10,6 +10,4 @@ project "07_custom_bvh_import"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/08_ambient_occlusion/premake5.lua b/tutorials/08_ambient_occlusion/premake5.lua
@@ -10,6 +10,4 @@ project "08_ambient_occlusion"
 
     includedirs{ "../../", "../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/09_motion_blur_srt/premake5.lua b/tutorials/09_motion_blur_srt/premake5.lua
@@ -10,6 +10,4 @@ project "09_motion_blur_srt"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/10_motion_blur_matrix/premake5.lua b/tutorials/10_motion_blur_matrix/premake5.lua
@@ -10,6 +10,4 @@ project "10_motion_blur_matrix"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/11_multi_custom_intersection/premake5.lua b/tutorials/11_multi_custom_intersection/premake5.lua
@@ -10,6 +10,4 @@ project "11_multi_custom_intersection"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/12_cutout/premake5.lua b/tutorials/12_cutout/premake5.lua
@@ -10,6 +10,4 @@ project "12_cutout"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/13_concurrent_scene_build/premake5.lua b/tutorials/13_concurrent_scene_build/premake5.lua
@@ -10,6 +10,4 @@ project "13_concurrent_scene_build"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/14_batch_build/premake5.lua b/tutorials/14_batch_build/premake5.lua
@@ -10,6 +10,4 @@ project "14_batch_build"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/15_multi_level_instancing/premake5.lua b/tutorials/15_multi_level_instancing/premake5.lua
@@ -10,6 +10,4 @@ project "15_multi_level_instancing"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/16_fluid_simulation/premake5.lua b/tutorials/16_fluid_simulation/premake5.lua
@@ -10,6 +10,4 @@ project "16_fluid_simulation"
 
     includedirs{ "../../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/18_shadow_ray/premake5.lua b/tutorials/18_shadow_ray/premake5.lua
@@ -10,6 +10,4 @@ project "18_shadow_ray"
 
     includedirs{ "../../", "../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/19_primary_ray/premake5.lua b/tutorials/19_primary_ray/premake5.lua
@@ -10,6 +10,4 @@ project "19_primary_ray"
 
     includedirs{ "../../", "../" } 
 
-    targetdir "../dist/bin/%{cfg.buildcfg}"
-
-    defines {"HIPRT_EXPORTS"}
+    targetdir "../dist/bin/%{cfg.buildcfg}"
diff --git a/tutorials/common/Common.h b/tutorials/common/Common.h
@@ -27,6 +27,19 @@
 #endif
 
 #include <hiprt/hiprt_vec.h>
+
+#if !defined( __KERNELCC__ )
+using int2	 = hiprt::Vector<int, 2>;
+using int3	 = hiprt::Vector<int, 3>;
+using int4	 = hiprt::Vector<int, 4>;
+using uint2	 = hiprt::Vector<unsigned int, 2>;
+using uint3	 = hiprt::Vector<unsigned int, 3>;
+using uint4	 = hiprt::Vector<unsigned int, 4>;
+using float2 = hiprt::Vector<float, 2>;
+using float3 = hiprt::Vector<float, 3>;
+using float4 = hiprt::Vector<float, 4>;
+#endif
+
 #include <hiprt/hiprt_math.h>
 
 #if !defined( __KERNELCC__ )
diff --git a/tutorials/common/SceneDemo.cpp b/tutorials/common/SceneDemo.cpp
@@ -426,8 +426,8 @@ void SceneDemo::createScene(
 	if ( shapeMaterials.empty() )
 	{ // default material to prevent crash
 		Material mat;
-		mat.m_diffuse  = { 1.0f };
-		mat.m_emission = { 0.0f };
+		mat.m_diffuse  = hiprt::make_float3( 1.0f );
+		mat.m_emission = hiprt::make_float3( 0.0f );
 		shapeMaterials.push_back( mat );
 	}
 	OrochiUtils::malloc( scene.m_bufMaterials, shapeMaterials.size() );
diff --git a/tutorials/common/TutorialBase.h b/tutorials/common/TutorialBase.h
@@ -26,8 +26,6 @@
 #include <filesystem>
 #include <fstream>
 #include <hiprt/hiprt.h>
-#include <hiprt/hiprt_vec.h>
-#include <hiprt/hiprt_math.h>
 #include <optional>
 #include <string>
 #include <tutorials/common/Common.h>
