From d309ed0b2ac06d7ba48322303d56bf39c8b57fe4 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 29 Oct 2022 18:21:25 +0200 Subject: add wall outline wireframes --- draw/quad-floor.cpp | 28 ++++++++++++++++++++++++++++ draw/quad-floor.hpp | 30 ++++++++++++++++++++++++++++++ draw/quad-wall-n.cpp | 28 ++++++++++++++++++++++++++++ draw/quad-wall-n.hpp | 29 +++++++++++++++++++++++++++++ draw/quad-wall-w.cpp | 28 ++++++++++++++++++++++++++++ draw/quad-wall-w.hpp | 29 +++++++++++++++++++++++++++++ draw/quad.cpp | 27 --------------------------- draw/quad.hpp | 30 ------------------------------ 8 files changed, 172 insertions(+), 57 deletions(-) create mode 100644 draw/quad-floor.cpp create mode 100644 draw/quad-floor.hpp create mode 100644 draw/quad-wall-n.cpp create mode 100644 draw/quad-wall-n.hpp create mode 100644 draw/quad-wall-w.cpp create mode 100644 draw/quad-wall-w.hpp delete mode 100644 draw/quad.cpp delete mode 100644 draw/quad.hpp (limited to 'draw') diff --git a/draw/quad-floor.cpp b/draw/quad-floor.cpp new file mode 100644 index 00000000..8d072a90 --- /dev/null +++ b/draw/quad-floor.cpp @@ -0,0 +1,28 @@ +#include "quad-floor.hpp" +#include +#include + +namespace floormat::wireframe { + +auto quad_floor::make_vertex_array() const -> vertex_array +{ + const float x = size[0]*.5f, y = size[1]*.5f; + const auto cx = center[0], cy = center[1], cz = center[2]; + return {{ + { -x + cx, -y + cy, cz }, + { x + cx, -y + cy, cz }, + { x + cx, y + cy, cz }, + { -x + cx, y + cy, cz }, + }}; +} + +quad_floor::quad_floor(Vector3 center, Vector2 size, float line_width) : + center(center), size(size), line_width{line_width} +{} + +void quad_floor::on_draw() const +{ + GL::Renderer::setLineWidth(line_width); +} + +} // namespace floormat::wireframe diff --git a/draw/quad-floor.hpp b/draw/quad-floor.hpp new file mode 100644 index 00000000..7a8ec59a --- /dev/null +++ b/draw/quad-floor.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include +#include +#include +#include +#include + +namespace floormat::wireframe { + +struct quad_floor final +{ + quad_floor(Vector3 center, Vector2 size, float line_width); + + static constexpr std::size_t num_vertices = 4, num_indexes = 0; + static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::LineLoop; + + using vertex_array = std::array; + + static ArrayView make_index_array() { return {}; } + vertex_array make_vertex_array() const; + void on_draw() const; + +private: + Vector3 center; + Vector2 size; + float line_width; +}; + +} // namespace floormat::wireframe diff --git a/draw/quad-wall-n.cpp b/draw/quad-wall-n.cpp new file mode 100644 index 00000000..2db11eb7 --- /dev/null +++ b/draw/quad-wall-n.cpp @@ -0,0 +1,28 @@ +#include "quad-wall-n.hpp" +#include +#include + +namespace floormat::wireframe { + +auto quad_wall_n::make_vertex_array() const -> vertex_array +{ + const float x = size[0]*.5f, y = size[1]*.5f, z = size[2]; + const auto cx = center[0], cy = center[1], cz = center[2]; + return {{ + { -x + cx, -y + cy, cz }, + { x + cx, -y + cy, cz }, + { x + cx, -y + cy, z + cz }, + { -x + cx, -y + cy, z + cz }, + }}; +} + +quad_wall_n::quad_wall_n(Vector3 center, Vector3 size, float line_width) : + center(center), size(size), line_width{line_width} +{} + +void quad_wall_n::on_draw() const +{ + GL::Renderer::setLineWidth(line_width); +} + +} // namespace floormat::wireframe diff --git a/draw/quad-wall-n.hpp b/draw/quad-wall-n.hpp new file mode 100644 index 00000000..30d69e01 --- /dev/null +++ b/draw/quad-wall-n.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include +#include +#include +#include + +namespace floormat::wireframe { + +struct quad_wall_n final +{ + quad_wall_n(Vector3 center, Vector3 size, float line_width); + + static constexpr std::size_t num_vertices = 4, num_indexes = 0; + static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::LineLoop; + + using vertex_array = std::array; + + static ArrayView make_index_array() { return {}; } + vertex_array make_vertex_array() const; + void on_draw() const; + +private: + Vector3 center; + Vector3 size; + float line_width; +}; + +} // namespace floormat::wireframe diff --git a/draw/quad-wall-w.cpp b/draw/quad-wall-w.cpp new file mode 100644 index 00000000..ad0e2ca0 --- /dev/null +++ b/draw/quad-wall-w.cpp @@ -0,0 +1,28 @@ +#include "quad-wall-w.hpp" +#include +#include + +namespace floormat::wireframe { + +auto quad_wall_w::make_vertex_array() const -> vertex_array +{ + const float x = size[0]*.5f, y = size[1]*.5f, z = size[2]; + const auto cx = center[0], cy = center[1], cz = center[2]; + return {{ + { -x + cx, -y + cy, cz }, + { -x + cx, y + cy, cz }, + { -x + cx, y + cy, z + cz }, + { -x + cx, -y + cy, z + cz }, + }}; +} + +quad_wall_w::quad_wall_w(Vector3 center, Vector3 size, float line_width) : + center(center), size(size), line_width{line_width} +{} + +void quad_wall_w::on_draw() const +{ + GL::Renderer::setLineWidth(line_width); +} + +} // namespace floormat::wireframe diff --git a/draw/quad-wall-w.hpp b/draw/quad-wall-w.hpp new file mode 100644 index 00000000..fb087865 --- /dev/null +++ b/draw/quad-wall-w.hpp @@ -0,0 +1,29 @@ +#pragma once + +#include +#include +#include +#include + +namespace floormat::wireframe { + +struct quad_wall_w final +{ + quad_wall_w(Vector3 center, Vector3 size, float line_width); + + static constexpr std::size_t num_vertices = 4, num_indexes = 0; + static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::LineLoop; + + using vertex_array = std::array; + + static ArrayView make_index_array() { return {}; } + vertex_array make_vertex_array() const; + void on_draw() const; + +private: + Vector3 center; + Vector3 size; + float line_width; +}; + +} // namespace floormat::wireframe diff --git a/draw/quad.cpp b/draw/quad.cpp deleted file mode 100644 index dee53a75..00000000 --- a/draw/quad.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "quad.hpp" -#include -#include - -namespace floormat::wireframe { - -quad::vertex_array quad::make_vertex_array() const -{ - const float X = size[0]*.5f, Y = size[1]*.5f; - return {{ - { -X + center[0], -Y + center[1], center[2] }, - { X + center[0], -Y + center[1], center[2] }, - { X + center[0], Y + center[1], center[2] }, - { -X + center[0], Y + center[1], center[2] }, - }}; -} - -quad::quad(Vector3 center, Vector2 size, float line_width) : - center(center), size(size), line_width{line_width} -{} - -void quad::on_draw() const -{ - GL::Renderer::setLineWidth(line_width); -} - -} // namespace floormat::wireframe diff --git a/draw/quad.hpp b/draw/quad.hpp deleted file mode 100644 index 050eeb78..00000000 --- a/draw/quad.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include - -namespace floormat::wireframe { - -struct quad final -{ - quad(Vector3 center, Vector2 size, float line_width); - - static constexpr std::size_t num_vertices = 4, num_indexes = 0; - static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::LineLoop; - - using vertex_array = std::array; - - static ArrayView make_index_array() { return {}; } - vertex_array make_vertex_array() const; - void on_draw() const; - -private: - Vector3 center; - Vector2 size; - float line_width; -}; - -} // namespace floormat::wireframe -- cgit v1.2.3