Relintai/godot_voxel
1
0
Fork 0
mirror of https://github.com/Relintai/godot_voxel.git synced 2024-12-25 16:27:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added get/set_voxel_f in VoxelMap

Browse Source
This commit is contained in:
Marc Gilleron 2019-04-28 00:25:33 +01:00
parent 2e419db855
commit 227bf5ad36
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
voxel_buffer.h
View File

@ -65,6 +65,7 @@ public:
void try_set_voxel(int x, int y, int z, int value, unsigned int channel_index = 0); void try_set_voxel(int x, int y, int z, int value, unsigned int channel_index = 0);
// TODO Rename set_voxel_iso to set_voxel_f etc.
_FORCE_INLINE_ void set_voxel_iso(real_t value, int x, int y, int z, unsigned int channel_index = 0) { set_voxel(iso_to_byte(value), x, y, z, channel_index); } _FORCE_INLINE_ void set_voxel_iso(real_t value, int x, int y, int z, unsigned int channel_index = 0) { set_voxel(iso_to_byte(value), x, y, z, channel_index); }
_FORCE_INLINE_ real_t get_voxel_iso(int x, int y, int z, unsigned int channel_index = 0) const { return byte_to_iso(get_voxel(x, y, z, channel_index)); } _FORCE_INLINE_ real_t get_voxel_iso(int x, int y, int z, unsigned int channel_index = 0) const { return byte_to_iso(get_voxel(x, y, z, channel_index)); }

34
voxel_map.cpp
View File

@ -38,10 +38,10 @@ int VoxelMap::get_voxel(Vector3i pos, unsigned int c) {
if (block == NULL) { if (block == NULL) {
return _default_voxel[c]; return _default_voxel[c];
} }
return block->voxels->get_voxel(VoxelMap::to_local(pos), c); return block->voxels->get_voxel(to_local(pos), c);
} }
void VoxelMap::set_voxel(int value, Vector3i pos, unsigned int c) { VoxelBlock *VoxelMap::get_or_create_block_at_voxel_pos(Vector3i pos) {
Vector3i bpos = voxel_to_block(pos); Vector3i bpos = voxel_to_block(pos);
VoxelBlock *block = get_block(bpos); VoxelBlock *block = get_block(bpos);
@ -57,7 +57,33 @@ void VoxelMap::set_voxel(int value, Vector3i pos, unsigned int c) {
set_block(bpos, block); set_block(bpos, block);
} }
block->voxels->set_voxel(value, VoxelMap::to_local(pos), c); return block;
}
void VoxelMap::set_voxel(int value, Vector3i pos, unsigned int c) {
VoxelBlock *block = get_or_create_block_at_voxel_pos(pos);
block->voxels->set_voxel(value, to_local(pos), c);
}
float VoxelMap::get_voxel_f(int x, int y, int z, unsigned int c) {
Vector3i pos(x, y, z);
Vector3i bpos = voxel_to_block(pos);
VoxelBlock *block = get_block(bpos);
if (block == NULL) {
return _default_voxel[c];
}
Vector3i lpos = to_local(pos);
return block->voxels->get_voxel_iso(lpos.x, lpos.y, lpos.z, c);
}
void VoxelMap::set_voxel_f(real_t value, int x, int y, int z, unsigned int c) {
Vector3i pos(x, y, z);
VoxelBlock *block = get_or_create_block_at_voxel_pos(pos);
Vector3i lpos = to_local(pos);
block->voxels->set_voxel_iso(value, lpos.x, lpos.y, lpos.z, c);
} }
void VoxelMap::set_default_voxel(int value, unsigned int channel) { void VoxelMap::set_default_voxel(int value, unsigned int channel) {
@ -177,6 +203,8 @@ void VoxelMap::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_voxel", "x", "y", "z", "c"), &VoxelMap::_get_voxel_binding, DEFVAL(0)); ClassDB::bind_method(D_METHOD("get_voxel", "x", "y", "z", "c"), &VoxelMap::_get_voxel_binding, DEFVAL(0));
ClassDB::bind_method(D_METHOD("set_voxel", "value", "x", "y", "z", "c"), &VoxelMap::_set_voxel_binding, DEFVAL(0)); ClassDB::bind_method(D_METHOD("set_voxel", "value", "x", "y", "z", "c"), &VoxelMap::_set_voxel_binding, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_voxel_f", "x", "y", "z", "c"), &VoxelMap::_get_voxel_binding, DEFVAL(VoxelBuffer::CHANNEL_ISOLEVEL));
ClassDB::bind_method(D_METHOD("set_voxel_f", "value", "x", "y", "z", "c"), &VoxelMap::_set_voxel_binding, DEFVAL(VoxelBuffer::CHANNEL_ISOLEVEL));
ClassDB::bind_method(D_METHOD("get_voxel_v", "pos", "c"), &VoxelMap::_get_voxel_v_binding, DEFVAL(0)); ClassDB::bind_method(D_METHOD("get_voxel_v", "pos", "c"), &VoxelMap::_get_voxel_v_binding, DEFVAL(0));
ClassDB::bind_method(D_METHOD("set_voxel_v", "value", "pos", "c"), &VoxelMap::_set_voxel_v_binding, DEFVAL(0)); ClassDB::bind_method(D_METHOD("set_voxel_v", "value", "pos", "c"), &VoxelMap::_set_voxel_v_binding, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_default_voxel", "channel"), &VoxelMap::get_default_voxel, DEFVAL(0)); ClassDB::bind_method(D_METHOD("get_default_voxel", "channel"), &VoxelMap::get_default_voxel, DEFVAL(0));

4
voxel_map.h
View File

@ -45,6 +45,9 @@ public:
int get_voxel(Vector3i pos, unsigned int c = 0); int get_voxel(Vector3i pos, unsigned int c = 0);
void set_voxel(int value, Vector3i pos, unsigned int c = 0); void set_voxel(int value, Vector3i pos, unsigned int c = 0);
float get_voxel_f(int x, int y, int z, unsigned int c = VoxelBuffer::CHANNEL_ISOLEVEL);
void set_voxel_f(real_t value, int x, int y, int z, unsigned int c = VoxelBuffer::CHANNEL_ISOLEVEL);
void set_default_voxel(int value, unsigned int channel = 0); void set_default_voxel(int value, unsigned int channel = 0);
int get_default_voxel(unsigned int channel = 0); int get_default_voxel(unsigned int channel = 0);
@ -122,6 +125,7 @@ public:
private: private:
void set_block(Vector3i bpos, VoxelBlock *block); void set_block(Vector3i bpos, VoxelBlock *block);
VoxelBlock *get_or_create_block_at_voxel_pos(Vector3i pos);
void set_block_size_pow2(unsigned int p); void set_block_size_pow2(unsigned int p);