diff options
| -rw-r--r-- | assets/final/demo_assets.txt | 3 | ||||
| -rw-r--r-- | assets/final/dodecahedron.obj | 61 | ||||
| -rw-r--r-- | src/tests/test_3d_render.cc | 8 |
3 files changed, 71 insertions, 1 deletions
diff --git a/assets/final/demo_assets.txt b/assets/final/demo_assets.txt index 0febd75..d5ce9b4 100644 --- a/assets/final/demo_assets.txt +++ b/assets/final/demo_assets.txt @@ -48,4 +48,5 @@ SHADER_RENDER_SCENE_QUERY_BVH, NONE, shaders/render/scene_query_bvh.wgsl, "Scene SHADER_RENDER_SCENE_QUERY_LINEAR, NONE, shaders/render/scene_query_linear.wgsl, "Scene Query Snippet (Linear)" SHADER_RENDER_LIGHTING_UTILS, NONE, shaders/render/lighting_utils.wgsl, "Lighting Utils Snippet" SHADER_MESH, NONE, shaders/mesh_render.wgsl, "Mesh Rasterization Shader" -MESH_CUBE, NONE, test_mesh.obj, "A simple cube mesh"
\ No newline at end of file +MESH_CUBE, NONE, test_mesh.obj, "A simple cube mesh" +DODECAHEDRON, NONE, dodecahedron.obj, "A dodecahedron mesh"
\ No newline at end of file diff --git a/assets/final/dodecahedron.obj b/assets/final/dodecahedron.obj new file mode 100644 index 0000000..c3d6c09 --- /dev/null +++ b/assets/final/dodecahedron.obj @@ -0,0 +1,61 @@ +# OBJ file created by ply_to_obj.c +# +g Object001 + +v -0.57735 -0.57735 0.57735 +v 0.934172 0.356822 0 +v 0.934172 -0.356822 0 +v -0.934172 0.356822 0 +v -0.934172 -0.356822 0 +v 0 0.934172 0.356822 +v 0 0.934172 -0.356822 +v 0.356822 0 -0.934172 +v -0.356822 0 -0.934172 +v 0 -0.934172 -0.356822 +v 0 -0.934172 0.356822 +v 0.356822 0 0.934172 +v -0.356822 0 0.934172 +v 0.57735 0.57735 -0.57735 +v 0.57735 0.57735 0.57735 +v -0.57735 0.57735 -0.57735 +v -0.57735 0.57735 0.57735 +v 0.57735 -0.57735 -0.57735 +v 0.57735 -0.57735 0.57735 +v -0.57735 -0.57735 -0.57735 + +f 19 3 2 +f 12 19 2 +f 15 12 2 +f 8 14 2 +f 18 8 2 +f 3 18 2 +f 20 5 4 +f 9 20 4 +f 16 9 4 +f 13 17 4 +f 1 13 4 +f 5 1 4 +f 7 16 4 +f 6 7 4 +f 17 6 4 +f 6 15 2 +f 7 6 2 +f 14 7 2 +f 10 18 3 +f 11 10 3 +f 19 11 3 +f 11 1 5 +f 10 11 5 +f 20 10 5 +f 20 9 8 +f 10 20 8 +f 18 10 8 +f 9 16 7 +f 8 9 7 +f 14 8 7 +f 12 15 6 +f 13 12 6 +f 17 13 6 +f 13 1 11 +f 12 13 11 +f 19 12 11 diff --git a/src/tests/test_3d_render.cc b/src/tests/test_3d_render.cc index ae00819..00de60e 100644 --- a/src/tests/test_3d_render.cc +++ b/src/tests/test_3d_render.cc @@ -150,6 +150,14 @@ void setup_scene() { mesh_obj.mesh_asset_id = AssetId::ASSET_MESH_CUBE; g_scene.add_object(mesh_obj); + // Dodecahedron (Rasterized) + Object3D dodeca(ObjectType::MESH); + dodeca.position = vec3(4.0f, 2.0f, 2.0f); + dodeca.scale = vec3(1.0f, 1.0f, 1.0f); + dodeca.color = vec4(1.0, 0.5, 0.0, 1); // Orange + dodeca.mesh_asset_id = AssetId::ASSET_DODECAHEDRON; + g_scene.add_object(dodeca); + // Random objects for (int i = 0; i < 30; ++i) { ObjectType type = ObjectType::SPHERE; |