From 12705ba271daaf712222ddd80465a1bcf6e84195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Dubouchet?= Date: Thu, 28 Aug 2025 16:56:56 +0200 Subject: [PATCH 1/6] Use dragon model with metal textures in raytracing example --- asset/json/raytracing.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/asset/json/raytracing.json b/asset/json/raytracing.json index 6d2d8b1d..adf51906 100644 --- a/asset/json/raytracing.json +++ b/asset/json/raytracing.json @@ -59,7 +59,7 @@ "pixel_structure": { "value": "RGB" }, - "file_name": "asset/apple/color.jpg" + "file_name": "asset/metal/color.jpg" }, { "name": "normal_texture", @@ -70,7 +70,7 @@ "pixel_structure": { "value": "RGB" }, - "file_name": "asset/apple/normal.jpg" + "file_name": "asset/metal/normal.jpg" }, { "name": "roughness_texture", @@ -81,7 +81,7 @@ "pixel_structure": { "value": "GREY" }, - "file_name": "asset/apple/roughness.jpg" + "file_name": "asset/metal/roughness.jpg" }, { "name": "metallic_texture", @@ -92,7 +92,7 @@ "pixel_structure": { "value": "GREY" }, - "file_name": "asset/apple/metalness.jpg" + "file_name": "asset/metal/metalness.jpg" }, { "name": "ao_texture", @@ -103,7 +103,7 @@ "pixel_structure": { "value": "GREY" }, - "file_name": "asset/apple/ambient_occlusion.jpg" + "file_name": "asset/metal/ambient_occlusion.jpg" } ], "materials": [ @@ -137,15 +137,15 @@ "skybox_env" ], "buffer_names": [ - "AppleMesh.0.triangle", - "AppleMesh.0.bvh" + "DragonMesh.0.triangle", + "DragonMesh.0.bvh" ], "inner_buffer_names": [ "TriangleBuffer", "BvhBuffer" ], "node_names": [ - "AppleMesh" + "DragonMesh" ], "inner_node_names": [ "model" @@ -171,8 +171,8 @@ "skybox_env" ], "buffer_names": [ - "AppleMesh.0.triangle", - "AppleMesh.0.bvh" + "DragonMesh.0.triangle", + "DragonMesh.0.bvh" ], "inner_buffer_names": [ "TriangleBuffer", @@ -382,9 +382,9 @@ "material_name": "RayTraceMaterial" }, { - "name": "AppleMesh", + "name": "DragonMesh", "parent": "mesh_holder", - "file_name": "apple.obj", + "file_name": "dragon.obj", "material_name": "RayTracePreprocessMaterial", "render_time_enum": "PRE_RENDER_TIME" } From e2a6451d916bb69b433d9861b7344dec8c75d5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Dubouchet?= Date: Thu, 28 Aug 2025 17:14:01 +0200 Subject: [PATCH 2/6] Add node references to preprocess material --- asset/json/raytracing.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/asset/json/raytracing.json b/asset/json/raytracing.json index adf51906..4bc4dba4 100644 --- a/asset/json/raytracing.json +++ b/asset/json/raytracing.json @@ -177,6 +177,12 @@ "inner_buffer_names": [ "TriangleBuffer", "BvhBuffer" + ], + "node_names": [ + "DragonMesh" + ], + "inner_node_names": [ + "model" ] } ], From 55061bf4a06a52bca79d4de53af0d5ade234bd1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Dubouchet?= Date: Thu, 28 Aug 2025 17:24:24 +0200 Subject: [PATCH 3/6] Assign RayTraceMaterial to dragon mesh --- asset/json/raytracing.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/asset/json/raytracing.json b/asset/json/raytracing.json index 4bc4dba4..415b4d39 100644 --- a/asset/json/raytracing.json +++ b/asset/json/raytracing.json @@ -391,8 +391,7 @@ "name": "DragonMesh", "parent": "mesh_holder", "file_name": "dragon.obj", - "material_name": "RayTracePreprocessMaterial", - "render_time_enum": "PRE_RENDER_TIME" + "material_name": "RayTraceMaterial" } ], "node_lights": [ From d23d9e0383347460503767e2a56ec6429458232b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Dubouchet?= Date: Thu, 28 Aug 2025 17:39:05 +0200 Subject: [PATCH 4/6] Use preprocess material for dragon mesh --- asset/json/raytracing.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/asset/json/raytracing.json b/asset/json/raytracing.json index 415b4d39..4bc4dba4 100644 --- a/asset/json/raytracing.json +++ b/asset/json/raytracing.json @@ -391,7 +391,8 @@ "name": "DragonMesh", "parent": "mesh_holder", "file_name": "dragon.obj", - "material_name": "RayTraceMaterial" + "material_name": "RayTracePreprocessMaterial", + "render_time_enum": "PRE_RENDER_TIME" } ], "node_lights": [ From 57c6cf635d5589ee81869899560bc19e9dd1e544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Dubouchet?= Date: Thu, 28 Aug 2025 17:50:17 +0200 Subject: [PATCH 5/6] Render dragon mesh every frame --- asset/json/raytracing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asset/json/raytracing.json b/asset/json/raytracing.json index 4bc4dba4..2eeb5d36 100644 --- a/asset/json/raytracing.json +++ b/asset/json/raytracing.json @@ -392,7 +392,7 @@ "parent": "mesh_holder", "file_name": "dragon.obj", "material_name": "RayTracePreprocessMaterial", - "render_time_enum": "PRE_RENDER_TIME" + "render_time_enum": "SCENE_RENDER_TIME" } ], "node_lights": [ From 56c2cac66b68ebb9b81b38e7672ee8601874da00 Mon Sep 17 00:00:00 2001 From: Frederic Dubouchet Date: Tue, 2 Sep 2025 08:26:03 +0200 Subject: [PATCH 6/6] Changed the json to be in accordance to the previous version. --- asset/json/raytracing.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/asset/json/raytracing.json b/asset/json/raytracing.json index 2eeb5d36..adf51906 100644 --- a/asset/json/raytracing.json +++ b/asset/json/raytracing.json @@ -177,12 +177,6 @@ "inner_buffer_names": [ "TriangleBuffer", "BvhBuffer" - ], - "node_names": [ - "DragonMesh" - ], - "inner_node_names": [ - "model" ] } ], @@ -392,7 +386,7 @@ "parent": "mesh_holder", "file_name": "dragon.obj", "material_name": "RayTracePreprocessMaterial", - "render_time_enum": "SCENE_RENDER_TIME" + "render_time_enum": "PRE_RENDER_TIME" } ], "node_lights": [