Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Namespace ImageRangeGrid

master
Marc Gilleron 2022-01-03 03:39:59 +00:00
parent 5bb4efa204
commit 8777bb2bf1
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
generators/graph/image_range_grid.cpp
View File

@ -3,6 +3,8 @@
#include <core/io/image.h>
namespace zylann {
ImageRangeGrid::~ImageRangeGrid() {
clear();
}
@ -165,3 +167,5 @@ Interval ImageRangeGrid::get_range(Interval xr, Interval yr) const {
return r;
}
} // namespace zylann

8
generators/graph/image_range_grid.h
View File

@ -6,6 +6,8 @@
class Image;
namespace zylann {
// Stores minimum and maximum values over a 2D image at multiple levels of detail
class ImageRangeGrid {
public:
@ -13,7 +15,9 @@ public:
void clear();
void generate(Image &im);
inline Interval get_range() const { return _total_range; }
inline Interval get_range() const {
return _total_range;
}
Interval get_range(Interval xr, Interval yr) const;
private:
@ -37,4 +41,6 @@ private:
FixedArray<Lod, MAX_LODS> _lods;
};
} // namespace zylann
#endif // IMAGE_RANGE_GRID_H

18
generators/graph/voxel_graph_node_db.cpp
View File

@ -138,6 +138,8 @@ inline Interval select(const Interval &a, const Interval &b, const Interval &thr
return Interval(min(a.min, b.min), max(a.max, b.max));
}
namespace zylann {
inline float skew3(float x) {
return (x * x * x + x) * 0.5f;
}
@ -204,6 +206,8 @@ inline Interval sdf_sphere_heightmap(Interval x, Interval y, Interval z, float r
return sd - m * h;
}
} // namespace zylann
VoxelGraphNodeDB *VoxelGraphNodeDB::get_singleton() {
CRASH_COND(g_node_type_db == nullptr);
return g_node_type_db;
@ -920,7 +924,7 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
{
struct Params {
const Image *image;
const ImageRangeGrid *image_range_grid;
const zylann::ImageRangeGrid *image_range_grid;
};
NodeType &t = types[VoxelGeneratorGraph::NODE_IMAGE_2D];
t.name = "Image";
@ -935,7 +939,7 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
ctx.make_error("Image instance is null");
return;
}
ImageRangeGrid *im_range = memnew(ImageRangeGrid);
zylann::ImageRangeGrid *im_range = memnew(zylann::ImageRangeGrid);
im_range->generate(**image);
Params p;
p.image = *image;
@ -1297,7 +1301,7 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
float norm_x;
float norm_y;
const Image *image;
const ImageRangeGrid *image_range_grid;
const zylann::ImageRangeGrid *image_range_grid;
};
NodeType &t = types[VoxelGeneratorGraph::NODE_SDF_SPHERE_HEIGHTMAP];
@ -1317,7 +1321,7 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
ctx.make_error("Image instance is null");
return;
}
ImageRangeGrid *im_range = memnew(ImageRangeGrid);
zylann::ImageRangeGrid *im_range = memnew(zylann::ImageRangeGrid);
im_range->generate(**image);
const float factor = ctx.get_param(2);
const Interval range = im_range->get_range() * factor;
@ -1344,7 +1348,7 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
const Params p = ctx.get_params<Params>();
const Image &im = *p.image;
for (uint32_t i = 0; i < out.size; ++i) {
out.data[i] = sdf_sphere_heightmap(x.data[i], y.data[i], z.data[i], p.radius, p.factor, im,
out.data[i] = zylann::sdf_sphere_heightmap(x.data[i], y.data[i], z.data[i], p.radius, p.factor, im,
p.min_height, p.max_height, p.norm_x, p.norm_y);
}
};
@ -1354,8 +1358,8 @@ VoxelGraphNodeDB::VoxelGraphNodeDB() {
const Interval y = ctx.get_input(1);
const Interval z = ctx.get_input(2);
const Params p = ctx.get_params<Params>();
ctx.set_output(
0, sdf_sphere_heightmap(x, y, z, p.radius, p.factor, p.image_range_grid, p.norm_x, p.norm_y));
ctx.set_output(0,
zylann::sdf_sphere_heightmap(x, y, z, p.radius, p.factor, p.image_range_grid, p.norm_x, p.norm_y));
};
}
{