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

Merge branch 'master' of https://github.com/Zylann/godot_voxel

Browse Source
This commit is contained in:
Marc Gilleron 2020-08-10 19:03:17 +01:00
commit 759bdb9de6
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/classes/VoxelTool.xml
View File

@ -25,6 +25,17 @@
<description>
</description>
</method>
<method name="do_box">
<return type="void">
</return>
<argument index="0" name="begin" type="Vector3">
</argument>
<argument index="1" name="end" type="Vector3">
</argument>
<description>
Operate on a rectangular cuboid section of the terrain. [code]begin[/code] and [code]end[/code] are inclusive. Choose operation and which voxel to use by setting [code]value[/code] and [code]mode[/code] before calling this function.
</description>
</method>
<method name="get_voxel">
<return type="int">
</return>

28
edition/voxel_tool.cpp
View File

@ -185,7 +185,30 @@ void VoxelTool::do_sphere(Vector3 center, float radius) {
}
void VoxelTool::do_box(Vector3i begin, Vector3i end) {
ERR_PRINT("Not implemented");
Vector3i::sort_min_max(begin, end);
Rect3i box = Rect3i::from_min_max(begin, end + Vector3i(1,1,1));
if (!is_area_editable(box)) {
PRINT_VERBOSE("Area not editable");
return;
}
if (_channel == VoxelBuffer::CHANNEL_SDF) {
box.for_each_cell([this](Vector3i pos) {
_set_voxel_f(pos, sdf_blend(-1.0, get_voxel_f(pos), _mode));
});
} else {
int value = _mode == MODE_REMOVE ? _eraser_value : _value;
box.for_each_cell([this, value](Vector3i pos) {
_set_voxel(pos, value);
});
}
_post_edit(box);
}
void VoxelTool::paste(Vector3i p_pos, Ref<VoxelBuffer> p_voxels, uint64_t mask_value) {
@ -231,7 +254,8 @@ void VoxelTool::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_voxel", "pos", "v"), &VoxelTool::_b_set_voxel);
ClassDB::bind_method(D_METHOD("set_voxel_f", "pos", "v"), &VoxelTool::_b_set_voxel_f);
ClassDB::bind_method(D_METHOD("do_point", "pos"), &VoxelTool::_b_do_point);
ClassDB::bind_method(D_METHOD("do_sphere", "center", "radius"), &VoxelTool::_b_do_sphere);
ClassDB::bind_method(D_METHOD("do_sphere", "center", "radius"), &VoxelTool::_b_do_sphere);
ClassDB::bind_method(D_METHOD("do_box", "begin", "end"), &VoxelTool::_b_do_box);
ClassDB::bind_method(D_METHOD("set_voxel_metadata", "pos", "meta"), &VoxelTool::_b_set_voxel_metadata);
ClassDB::bind_method(D_METHOD("get_voxel_metadata", "pos"), &VoxelTool::_b_get_voxel_metadata);