Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#5584: Create base class from RenderableEntityBox, extracting the box…
… part
- Loading branch information
1 parent
90f1a31
commit 01b5971
Showing
7 changed files
with
209 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| #pragma once | ||
|
|
||
| #include "render/RenderableGeometry.h" | ||
|
|
||
| namespace render | ||
| { | ||
|
|
||
| namespace detail | ||
| { | ||
|
|
||
| inline std::vector<ArbitraryMeshVertex> getFillBoxVertices(const Vector3& min, const Vector3& max, const Vector4& colour) | ||
| { | ||
| // Load the 6 times 4 = 24 corner points, each with the correct face normal | ||
| return | ||
| { | ||
| // Bottom quad | ||
| ArbitraryMeshVertex({ min[0], min[1], min[2] }, {0,0,-1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], min[1], min[2] }, {0,0,-1}, {1,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], min[2] }, {0,0,-1}, {1,1}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], min[2] }, {0,0,-1}, {0,1}, colour), | ||
|
|
||
| // Top quad | ||
| ArbitraryMeshVertex({ min[0], min[1], max[2] }, {0,0,+1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], min[1], max[2] }, {0,0,+1}, {1,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], max[2] }, {0,0,+1}, {1,1}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], max[2] }, {0,0,+1}, {0,1}, colour), | ||
|
|
||
| // Front quad | ||
| ArbitraryMeshVertex({ min[0], min[1], min[2] }, {0,-1,0}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], min[1], min[2] }, {0,-1,0}, {1,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], min[1], max[2] }, {0,-1,0}, {1,1}, colour), | ||
| ArbitraryMeshVertex({ min[0], min[1], max[2] }, {0,-1,0}, {0,1}, colour), | ||
|
|
||
| // Back quad | ||
| ArbitraryMeshVertex({ max[0], max[1], min[2] }, {0,+1,0}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], min[2] }, {0,+1,0}, {1,0}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], max[2] }, {0,+1,0}, {1,1}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], max[2] }, {0,+1,0}, {0,1}, colour), | ||
|
|
||
| // Right quad | ||
| ArbitraryMeshVertex({ max[0], min[1], min[2] }, {+1,0,0}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], min[2] }, {+1,0,0}, {1,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], max[2] }, {+1,0,0}, {1,1}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], max[2] }, {+1,0,0}, {0,1}, colour), | ||
|
|
||
| // Left quad | ||
| ArbitraryMeshVertex({ min[0], max[1], min[2] }, {-1,0,0}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ min[0], min[1], min[2] }, {-1,0,0}, {1,0}, colour), | ||
| ArbitraryMeshVertex({ min[0], min[1], max[2] }, {-1,0,0}, {1,1}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], max[2] }, {-1,0,0}, {0,1}, colour), | ||
| }; | ||
| } | ||
|
|
||
| inline std::vector<ArbitraryMeshVertex> getWireframeBoxVertices(const Vector3& min, const Vector3& max, const Vector4& colour) | ||
| { | ||
| // Load the 8 corner points | ||
| return | ||
| { | ||
| // Bottom quad | ||
| ArbitraryMeshVertex({ min[0], min[1], min[2] }, {0,0,1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], min[1], min[2] }, {0,0,1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], min[2] }, {0,0,1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], min[2] }, {0,0,1}, {0,0}, colour), | ||
|
|
||
| // Top quad | ||
| ArbitraryMeshVertex({ min[0], min[1], max[2] }, {0,0,1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], min[1], max[2] }, {0,0,1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ max[0], max[1], max[2] }, {0,0,1}, {0,0}, colour), | ||
| ArbitraryMeshVertex({ min[0], max[1], max[2] }, {0,0,1}, {0,0}, colour), | ||
| }; | ||
| } | ||
|
|
||
| // Indices drawing a hollow box outline, corresponding to the order in getWireframeBoxVertices() | ||
| inline std::vector<unsigned int> generateWireframeBoxIndices() | ||
| { | ||
| return | ||
| { | ||
| 0, 1, // bottom rectangle | ||
| 1, 2, // | ||
| 2, 3, // | ||
| 3, 0, // | ||
|
|
||
| 4, 5, // top rectangle | ||
| 5, 6, // | ||
| 6, 7, // | ||
| 7, 4, // | ||
|
|
||
| 0, 4, // vertical edges | ||
| 1, 5, // | ||
| 2, 6, // | ||
| 3, 7, // | ||
| }; | ||
| }; | ||
|
|
||
| // Indices drawing a hollow box outline, corresponding to the order in getFillBoxVertices() | ||
| inline std::vector<unsigned int> generateFillBoxIndices() | ||
| { | ||
| return | ||
| { | ||
| 3, 2, 1, 0, // bottom rectangle | ||
| 7, 6, 5, 4, // top rectangle | ||
|
|
||
| 4, 5, 1, 0, // sides | ||
| 5, 6, 2, 1, | ||
| 6, 7, 3, 2, | ||
| 7, 4, 0, 3, | ||
| }; | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| class RenderableBox : | ||
| public render::RenderableGeometry | ||
| { | ||
| private: | ||
| const AABB& _bounds; | ||
| const Vector3& _worldPos; | ||
| bool _needsUpdate; | ||
| bool _filledBox; | ||
|
|
||
| public: | ||
| RenderableBox(const AABB& bounds, const Vector3& worldPos) : | ||
| _bounds(bounds), | ||
| _worldPos(worldPos), | ||
| _needsUpdate(true), | ||
| _filledBox(true) | ||
| {} | ||
|
|
||
| void queueUpdate() | ||
| { | ||
| _needsUpdate = true; | ||
| } | ||
|
|
||
| void setFillMode(bool fill) | ||
| { | ||
| if (_filledBox != fill) | ||
| { | ||
| _filledBox = fill; | ||
| clear(); | ||
| queueUpdate(); | ||
| } | ||
| } | ||
|
|
||
| virtual Vector4 getVertexColour() | ||
| { | ||
| return Vector4(1, 1, 1, 1); | ||
| } | ||
|
|
||
| virtual void updateGeometry() override | ||
| { | ||
| if (!_needsUpdate) return; | ||
|
|
||
| _needsUpdate = false; | ||
|
|
||
| static Vector3 Origin(0, 0, 0); | ||
|
|
||
| // Calculate the corner vertices of this bounding box, plus the mid-point | ||
| Vector3 max(Origin + _bounds.extents); | ||
| Vector3 min(Origin - _bounds.extents); | ||
|
|
||
| auto colour = getVertexColour(); | ||
|
|
||
| auto vertices = _filledBox ? | ||
| detail::getFillBoxVertices(min, max, colour) : | ||
| detail::getWireframeBoxVertices(min, max, colour); | ||
|
|
||
| // Move the points to their world position | ||
| for (auto& vertex : vertices) | ||
| { | ||
| vertex.vertex += _worldPos; | ||
| } | ||
|
|
||
| static auto FillBoxIndices = detail::generateFillBoxIndices(); | ||
| static auto WireframeBoxIndices = detail::generateWireframeBoxIndices(); | ||
|
|
||
| if (_filledBox) | ||
| { | ||
| RenderableGeometry::updateGeometry(render::GeometryType::Quads, vertices, FillBoxIndices); | ||
| } | ||
| else | ||
| { | ||
| RenderableGeometry::updateGeometry(render::GeometryType::Lines, vertices, WireframeBoxIndices); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,23 @@ | ||
| #pragma once | ||
|
|
||
| #include "render/RenderableGeometry.h" | ||
| #include "render/RenderableBox.h" | ||
|
|
||
| namespace entity | ||
| { | ||
|
|
||
| class EntityNode; | ||
|
|
||
| class RenderableEntityBox : | ||
| public render::RenderableGeometry | ||
| class RenderableEntityBox final : | ||
| public render::RenderableBox | ||
| { | ||
| private: | ||
| const IEntityNode& _entity; | ||
| const AABB& _bounds; | ||
| const Vector3& _worldPos; | ||
| bool _needsUpdate; | ||
| bool _filledBox; | ||
|
|
||
| public: | ||
| RenderableEntityBox(const IEntityNode& entity, const AABB& bounds, const Vector3& worldPos); | ||
|
|
||
| void queueUpdate(); | ||
| void setFillMode(bool fill); | ||
|
|
||
| virtual void updateGeometry() override; | ||
| protected: | ||
| Vector4 getVertexColour() override; | ||
| }; | ||
|
|
||
| } |
Oops, something went wrong.