diff --git a/include/flamegpu/visualiser/config/Stock.h b/include/flamegpu/visualiser/config/Stock.h index bc9cb21..9dbfa7e 100644 --- a/include/flamegpu/visualiser/config/Stock.h +++ b/include/flamegpu/visualiser/config/Stock.h @@ -33,6 +33,27 @@ const Model TEAPOT{ "resources/teapot.obj", "" }; * Created following this tutorial: https://www.youtube.com/watch?v=qiK6A4HJhmA */ const Model STUNTPLANE{ "resources/stuntplane.obj", "" }; +/** + * Equilateral triangular pyramid (4 poly, 4 vertices) + * + * Orientation: + * - Front: +X + * - Top: +Y + * + * Made with blender by zeyus (https://github.com/zeyus) + */ +const Model PYRAMID{ "resources/pyramid.obj", "" }; +/** + * Arrow-head triangular pyramid (4 poly, 4 vertices) + * useful for visualising vectors + * + * Orientation: + * - Front: +X + * - Top: +Y + * + * Made with blender by zeyus (https://github.com/zeyus) + */ +const Model ARROWHEAD{ "resources/arrowhead.obj", "" }; } // namespace Models } // namespace Stock } // namespace visualiser diff --git a/resources/arrowhead.obj b/resources/arrowhead.obj new file mode 100644 index 0000000..f908879 --- /dev/null +++ b/resources/arrowhead.obj @@ -0,0 +1,16 @@ +# Blender 3.2.0 +# www.blender.org +o arrowtripyr +v 1.000000 0.000000 0.000000 +v -0.500000 0.000000 0.866025 +v -0.500000 0.000000 -0.866025 +v -0.500000 0.500000 0.000000 +vn 0.2774 0.8321 0.4804 +vn -0.0000 -1.0000 -0.0000 +vn -1.0000 -0.0000 -0.0000 +vn 0.2774 0.8321 -0.4804 +s 0 +f 1//1 4//1 2//1 +f 1//2 2//2 3//2 +f 2//3 4//3 3//3 +f 3//4 4//4 1//4 diff --git a/resources/pyramid.obj b/resources/pyramid.obj new file mode 100644 index 0000000..74298f2 --- /dev/null +++ b/resources/pyramid.obj @@ -0,0 +1,16 @@ +# Blender 3.2.0 +# www.blender.org +o eqtripyr +v 1.000000 0.000000 0.000000 +v -0.500000 0.000000 0.866025 +v -0.500000 0.000000 -0.866025 +v 0.000000 1.414213 0.000000 +vn 0.4714 0.3333 0.8165 +vn -0.0000 -1.0000 -0.0000 +vn -0.9428 0.3333 -0.0000 +vn 0.4714 0.3333 -0.8165 +s 0 +f 1//1 4//1 2//1 +f 1//2 2//2 3//2 +f 2//3 4//3 3//3 +f 3//4 4//4 1//4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a47797f..52a8e33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -313,6 +313,8 @@ SET(RESOURCES_ALL ${CMAKE_CURRENT_SOURCE_DIR}/../resources/cube.obj ${CMAKE_CURRENT_SOURCE_DIR}/../resources/teapot.obj ${CMAKE_CURRENT_SOURCE_DIR}/../resources/stuntplane.obj + ${CMAKE_CURRENT_SOURCE_DIR}/../resources/pyramid.obj + ${CMAKE_CURRENT_SOURCE_DIR}/../resources/arrowhead.obj # Tdir: These shaders are setup to receive an appended rotation function # Tcolor: These shaders are setup to receive an appended color function ${CMAKE_CURRENT_SOURCE_DIR}/../resources/instanced_default_Tpos_Tdir_Tscale.vert