Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2025-05-01 21:47:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update _bake_light in VoxelChunkDefault to use the new apis.

Browse Source
This commit is contained in:
Relintai 2020-07-07 17:35:44 +02:00
parent eac68265c1
commit 5ee5b12a4e
1 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
world/default/voxel_chunk_default.cpp
View File

@ -1031,15 +1031,16 @@ void VoxelChunkDefault::_bake_light(Ref<VoxelLight> light) {
ERR_FAIL_COND(size < 0); ERR_FAIL_COND(size < 0);
//float sizef = static_cast<float>(size);
//float rf = (color.r / sizef);
//float gf = (color.g / sizef);
//float bf = (color.b / sizef);
int64_t dsx = static_cast<int64_t>(_data_size_x); int64_t dsx = static_cast<int64_t>(_data_size_x);
int64_t dsy = static_cast<int64_t>(_data_size_y); int64_t dsy = static_cast<int64_t>(_data_size_y);
int64_t dsz = static_cast<int64_t>(_data_size_z); int64_t dsz = static_cast<int64_t>(_data_size_z);
uint8_t *channel_color_r = get_channel(VoxelChunkDefault::DEFAULT_CHANNEL_LIGHT_COLOR_R);
uint8_t *channel_color_g = get_channel(VoxelChunkDefault::DEFAULT_CHANNEL_LIGHT_COLOR_G);
uint8_t *channel_color_b = get_channel(VoxelChunkDefault::DEFAULT_CHANNEL_LIGHT_COLOR_B);
ERR_FAIL_COND(channel_color_r == NULL || channel_color_g == NULL || channel_color_b == NULL);
for (int y = local_y - size; y <= local_y + size; ++y) { for (int y = local_y - size; y <= local_y + size; ++y) {
if (y < 0 || y >= dsy) if (y < 0 || y >= dsy)
continue; continue;
@ -1062,13 +1063,15 @@ void VoxelChunkDefault::_bake_light(Ref<VoxelLight> light) {
if (str < 0) if (str < 0)
continue; continue;
int index = get_data_index(x, y, z);
int r = color.r * str * 255.0; int r = color.r * str * 255.0;
int g = color.g * str * 255.0; int g = color.g * str * 255.0;
int b = color.b * str * 255.0; int b = color.b * str * 255.0;
r += get_voxel(x, y, z, DEFAULT_CHANNEL_LIGHT_COLOR_R); r += channel_color_r[index];
g += get_voxel(x, y, z, DEFAULT_CHANNEL_LIGHT_COLOR_G); g += channel_color_g[index];
b += get_voxel(x, y, z, DEFAULT_CHANNEL_LIGHT_COLOR_B); b += channel_color_b[index];
if (r > 255) if (r > 255)
r = 255; r = 255;
@ -1079,9 +1082,9 @@ void VoxelChunkDefault::_bake_light(Ref<VoxelLight> light) {
if (b > 255) if (b > 255)
b = 255; b = 255;
set_voxel(r, x, y, z, DEFAULT_CHANNEL_LIGHT_COLOR_R); channel_color_r[index] = r;
set_voxel(g, x, y, z, DEFAULT_CHANNEL_LIGHT_COLOR_G); channel_color_g[index] = g;
set_voxel(b, x, y, z, DEFAULT_CHANNEL_LIGHT_COLOR_B); channel_color_b[index] = b;
} }
} }
} }
@ -1111,38 +1114,15 @@ void VoxelChunkDefault::free_chunk() {
} }
VoxelChunkDefault::VoxelChunkDefault() { VoxelChunkDefault::VoxelChunkDefault() {
_lights_dirty = false;
_is_generating = false;
_abort_build = false; _abort_build = false;
_queued_generation = false; _queued_generation = false;
_dirty = false;
_state = VOXEL_CHUNK_STATE_OK;
_enabled = true; _enabled = true;
_current_build_phase = BUILD_PHASE_DONE; _current_build_phase = BUILD_PHASE_DONE;
_max_build_phases = BUILD_PHASE_MAX; _max_build_phases = BUILD_PHASE_MAX;
_voxel_scale = 1;
_lod_size = 1; _lod_size = 1;
_voxel_world = NULL;
_position_x = 0;
_position_y = 0;
_position_z = 0;
_size_x = 0;
_size_y = 0;
_size_z = 0;
_data_size_x = 0;
_data_size_y = 0;
_data_size_z = 0;
_margin_start = 0;
_margin_end = 0;
_build_prioritized = false; _build_prioritized = false;
_build_phase_done = false; _build_phase_done = false;
_build_thread = NULL; _build_thread = NULL;