Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize terrain quadtree operation #77

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Optimize terrain quadtree operation #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 15 additions & 52 deletions engine/src/Graphics/TerrainQuadTree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,20 +100,15 @@ void TerrainQuadTree::DestroyResources(Allocator* allocator, kokko::render::Devi
allocator->Deallocate(tileTextureIds);
}

void TerrainQuadTree::GetTilesToRender(const FrustumPlanes& frustum, const Mat4x4f& viewProj,
void TerrainQuadTree::GetTilesToRender(const FrustumPlanes& frustum, const Vec3f& cameraPos,
const RenderDebugSettings& renderDebug, Array<TerrainTileId>& resultOut)
{
KOKKO_PROFILE_FUNCTION();

RenderTile(TerrainTileId{}, frustum, viewProj, renderDebug, resultOut);
KOKKO_PROFILE_SCOPE("TerrainQuadTree::GetTilesToRender()");
GetRenderTilesParams params{ frustum, cameraPos, renderDebug, resultOut };
RenderTile(TerrainTileId{}, params);
}

void TerrainQuadTree::RenderTile(
const TerrainTileId& id,
const FrustumPlanes& frustum,
const Mat4x4f& vp,
const RenderDebugSettings& renderDebug,
Array<TerrainTileId>& resultOut)
void TerrainQuadTree::RenderTile(const TerrainTileId& id, GetRenderTilesParams& params)
{
float tileScale = GetTileScale(id.level);

Expand All @@ -127,71 +122,39 @@ void TerrainQuadTree::RenderTile(
tileBounds.extents = tileSize * 0.5f;
tileBounds.center = tileMin + tileBounds.extents;

if (Intersect::FrustumAabb(frustum, tileBounds) == false)
if (Intersect::FrustumAabb(params.frustum, tileBounds) == false)
{
return;
}

if (id.level + 1 == treeLevels)
{
resultOut.PushBack(id);
params.resultOut.PushBack(id);

return;
}

constexpr float maximumSize = 0.5f;

static const Vec3f boxCorners[] = {
Vec3f(-1.0f, 0.0f, -1.0f),
Vec3f(1.0f, 0.0f, -1.0f),
Vec3f(-1.0f, 0.0f, 1.0f),
Vec3f(1.0f, 0.0f, 1.0f)
};

Vec2f min(1e9f, 1e9f);
Vec2f max(-1e9f, -1e9f);

Vec3f screenCoord;

for (unsigned cornerIdx = 0; cornerIdx < 4; ++cornerIdx)
{
Vec3f corner = Vec3f::Hadamard(tileBounds.extents, boxCorners[cornerIdx]);
constexpr float sizeFactor = 0.5f;

Vec4f proj = vp * Vec4f(tileBounds.center + corner, 1.0f);
screenCoord = Vec3f::Hadamard(proj.xyz() * (1.0f / proj.w), Vec3f(0.5f, -0.5f, 0.5f)) +
Vec3f(0.5f, 0.5f, 0.5f);

min.x = std::min(screenCoord.x, min.x);
min.y = std::min(screenCoord.y, min.y);
max.x = std::max(screenCoord.x, max.x);
max.y = std::max(screenCoord.y, max.y);
}

Vec2f size(max.x - min.x, max.y - min.y);

float sizeMaxAxis = std::max(size.x, size.y);
bool tileIsSmallEnough = sizeMaxAxis < maximumSize;
float distance = (tileBounds.center - params.cameraPos).Magnitude();
bool tileIsSmallEnough = tileWidth < distance * sizeFactor;

auto vr = Debug::Get()->GetVectorRenderer();
auto tr = Debug::Get()->GetTextRenderer();
Color col(1.0f, 0.0f, 1.0f);

if (tileIsSmallEnough)
{
resultOut.PushBack(id);
params.resultOut.PushBack(id);

if (renderDebug.IsFeatureEnabled(RenderDebugFeatureFlag::DrawTerrainTiles))
if (params.renderDebug.IsFeatureEnabled(RenderDebugFeatureFlag::DrawTerrainTiles))
{
Vec3f scale = tileSize;
scale.y = 0.0f;

Mat4x4f transform = Mat4x4f::Translate(tileBounds.center) * Mat4x4f::Scale(scale);

vr->DrawWireCube(transform, col);

char buf[32];
auto [out, size] = fmt::format_to_n(buf, sizeof(buf), "{:.3f}", sizeMaxAxis);

tr->AddTextNormalized(ConstStringView(buf, size), screenCoord.xy());
}
}
else
Expand All @@ -205,7 +168,7 @@ void TerrainQuadTree::RenderTile(
tileId.x = id.x * 2 + x;
tileId.y = id.y * 2 + y;

RenderTile(tileId, frustum, vp, renderDebug, resultOut);
RenderTile(tileId, params);
}
}
}
Expand Down Expand Up @@ -283,7 +246,7 @@ TEST_CASE("TerrainQuadTree.GetTileCountForLevelCount")

float TerrainQuadTree::GetTileScale(int level)
{
return std::pow(2.0f, static_cast<float>(-level));
return 1.0f / (1 << level);
}

TEST_CASE("TerrainQuadTree.GetTileScale")
Expand Down
19 changes: 12 additions & 7 deletions engine/src/Graphics/TerrainQuadTree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "Core/Array.hpp"

#include "Math/Vec3.hpp"

class Allocator;

struct FrustumPlanes;
Expand Down Expand Up @@ -42,7 +44,7 @@ class TerrainQuadTree
const TerrainParameters& params);
void DestroyResources(Allocator* allocator, kokko::render::Device* renderDevice);

void GetTilesToRender(const FrustumPlanes& frustum, const Mat4x4f& viewProj,
void GetTilesToRender(const FrustumPlanes& frustum, const Vec3f& cameraPos,
const RenderDebugSettings& renderDebug, Array<TerrainTileId>& resultOut);

int GetLevelCount() const;
Expand All @@ -65,12 +67,15 @@ class TerrainQuadTree
static float GetTileScale(int level);

private:
void RenderTile(
const TerrainTileId& id,
const FrustumPlanes& frustum,
const Mat4x4f& vp,
const RenderDebugSettings& renderDebug,
Array<TerrainTileId>& resultOut);
struct GetRenderTilesParams
{
const FrustumPlanes& frustum;
const Vec3f& cameraPos;
const RenderDebugSettings& renderDebug;
Array<TerrainTileId>& resultOut;
};

void RenderTile(const TerrainTileId& id, GetRenderTilesParams& params);

static void CreateTileTestData(TerrainTile& tile, int tileX, int tileY, float tileScale);

Expand Down
2 changes: 1 addition & 1 deletion engine/src/Graphics/TerrainSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ void TerrainSystem::Render(const RenderParameters& parameters)
// Select tiles to render

TerrainQuadTree& quadTree = data.quadTree[id.i];
quadTree.GetTilesToRender(viewport.frustum, viewport.viewProjection, parameters.renderDebug, tilesToRender);
quadTree.GetTilesToRender(viewport.frustum, viewport.position, parameters.renderDebug, tilesToRender);

// Update uniform buffer

Expand Down
2 changes: 0 additions & 2 deletions engine/src/Math/Intersect3D.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

bool Intersect::FrustumAabb(const FrustumPlanes& frustum, const kokko::AABB& bounds)
{
KOKKO_PROFILE_FUNCTION();

// For each plane in view frustum
for (unsigned int planeIdx = 0; planeIdx < 6; ++planeIdx)
{
Expand Down