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

removing more boost usage

Browse Source
This commit is contained in:
Alister
2021-12-12 20:14:38 +00:00
parent cb226c4b65
commit f41ef1914f
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/noggit/MapChunk.cpp
View File

@@ -1053,7 +1053,7 @@ bool MapChunk::blurTerrain ( glm::vec3 const& pos
, float radius
, int BrushType
, flatten_mode const& mode
, std::function<boost::optional<float> (float, float)> height
, std::function<std::optional<float> (float, float)> height
)
{
bool changed (false);
@@ -1087,7 +1087,7 @@ bool MapChunk::blurTerrain ( glm::vec3 const& pos
auto h (height (tx, tz));
if (h)
{
TotalHeight += (1.0f - dist2 / radius) * h.get();
TotalHeight += (1.0f - dist2 / radius) * h.value();
TotalWeight += (1.0f - dist2 / radius);
}
}

4
src/noggit/MapChunk.h
View File

@@ -13,7 +13,7 @@
#include <opengl/scoped.hpp>
#include <opengl/texture.hpp>
#include <noggit/Misc.h>
#include <optional>
#include <map>
#include <memory>
#include <array>
@@ -143,7 +143,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<boost::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);

3
src/noggit/MapView.h
View File

@@ -21,8 +21,7 @@
#include <external/QtAdvancedDockingSystem/src/DockManager.h>
#include <opengl/texture.hpp>
#include <opengl/scoped.hpp>
#include <boost/optional.hpp>
#include <optional>
#include <QtCore/QElapsedTimer>
#include <QtCore/QSettings>

4
src/noggit/World.cpp
View File

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