natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try optimizing blur a bit

Browse Source
This commit is contained in:
T1ti
2024-08-05 00:16:01 +02:00
parent 4fc83e4ad3
commit 1c3b62f49d
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/noggit/MapChunk.cpp
View File

@@ -1084,10 +1084,10 @@ bool MapChunk::blurTerrain ( glm::vec3 const& pos
, float radius
, int BrushType
, flatten_mode const& mode
, std::function<std::optional<float> (float, float)> height
/*, std::function<std::optional<float>(float, float)> height*/
)
{
bool changed (false);
bool changed = false;
if (BrushType == eFlattenType_Origin)
{
@@ -1096,7 +1096,7 @@ bool MapChunk::blurTerrain ( glm::vec3 const& pos
for (int i (0); i < mapbufsize; ++i)
{
float const dist(misc::dist(mVertices[i], pos));
float const dist = misc::dist(mVertices[i], pos);
if (dist >= radius)
{
@@ -1111,16 +1111,28 @@ bool MapChunk::blurTerrain ( glm::vec3 const& pos
float tz = pos.z + j * UNITSIZE / 2;
for (int k = -Rad; k <= Rad; ++k)
{
float tx = pos.x + k*UNITSIZE + (j % 2) * UNITSIZE / 2.0f;
float dist2 = misc::dist (tx, tz, mVertices[i].x, mVertices[i].z);
float const tx = pos.x + k*UNITSIZE + (j % 2) * UNITSIZE / 2.0f;
float const dist2 = misc::dist (tx, tz, mVertices[i].x, mVertices[i].z);
if (dist2 > radius)
continue;
auto h (height (tx, tz));
glm::vec3 vec;
bool res = mt->getWorld()->GetVertex(tx, tz, &vec);
if (res)
{
// float h = vec.y;
TotalHeight += (1.0f - dist2 / radius) * vec.y;
TotalWeight += (1.0f - dist2 / radius);
}
/*
// auto h (height (tx, tz));
auto h = height(tx, tz);
if (h)
{
TotalHeight += (1.0f - dist2 / radius) * h.value();
TotalWeight += (1.0f - dist2 / radius);
}
}*/
}
}

2
src/noggit/MapChunk.h
View File

@@ -150,7 +150,7 @@ public:
bool changeTerrain(glm::vec3 const& pos, float change, float radius, int BrushType, float inner_radius);
bool flattenTerrain(glm::vec3 const& pos, float remain, float radius, int BrushType, flatten_mode const& mode, const glm::vec3& origin, math::degrees angle, math::degrees orientation);
bool blurTerrain ( glm::vec3 const& pos, float remain, float radius, int BrushType, flatten_mode const& mode
, std::function<std::optional<float> (float, float)> height
/*, std::function<std::optional<float>(float, float)> height*/
);
bool changeTerrainProcessVertex(glm::vec3 const& pos, glm::vec3 const& vertex, float& dt, float radiusOuter, float radiusInner, int brushType);

4
src/noggit/World.cpp
View File

@@ -1540,12 +1540,12 @@ void World::blurTerrain(glm::vec3 const& pos, float remain, float radius, int Br
, radius
, BrushType
, mode
, [this] (float x, float z) -> std::optional<float>
/*, [this](float x, float z) -> std::optional<float>
{
glm::vec3 vec;
auto res (GetVertex (x, z, &vec));
return res ? std::optional<float>(vec.y) : std::nullopt;
}
}*/
);
}
, [this] (MapChunk* chunk)