Chewico/DeerithEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed to __data

Browse Source
This commit is contained in:
Chewico 2026-11-03 23:02:44 +01:00
parent c828c656b7
commit 12f52f6987
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deerith_client/src/world/cluster_generation.cpp
View File

@ -57,7 +57,7 @@ void deerith::generate_cluster(voxel_cluster_t *_cluster)
void deerith::generate_voxel(int x, int y, int z) void deerith::generate_voxel(int x, int y, int z)
{ {
voxel_type_id_t cur_type_id = cluster->data[x][y][z]; voxel_type_id_t cur_type_id = cluster->__data[x][y][z];
const voxel_type_t &cur_type = get_voxel_type(cur_type_id); const voxel_type_t &cur_type = get_voxel_type(cur_type_id);
if (!cur_type.is_solid) if (!cur_type.is_solid)
@ -120,7 +120,7 @@ deerith::voxel_type_id_t deerith::get_cluster_voxel(int x, int y, int z)
if (in_bounds_check) if (in_bounds_check)
{ {
return cluster->data[x][y][z]; return cluster->__data[x][y][z];
} }
glm::ivec3 coords; glm::ivec3 coords;

2
deerith_client/src/world/server_communication.cpp
View File

@ -99,7 +99,7 @@ void deerith::process_packet(deerith::packet_cluster_data_t &packet, client_t *c
surface_t *surface = get_create_surface(packet.surface_id); surface_t *surface = get_create_surface(packet.surface_id);
voxel_cluster_t *cluster = surface->get_create_cluster(packet.layer); voxel_cluster_t *cluster = surface->get_create_cluster(packet.layer);
cluster->data = *packet.__cluster_data; cluster->__data = *packet.__cluster_data;
generate_cluster(cluster); generate_cluster(cluster);
} }

2
deerith_engine_core/include/deerith/world/environment.h
View File

@ -18,7 +18,7 @@ namespace deerith
int32_t layer; int32_t layer;
glm::ivec2 surface_id; glm::ivec2 surface_id;
uint32_t last_update_tick_id; uint32_t last_update_tick_id;
cluster_voxel_type_id_data_t data = {}; cluster_voxel_type_id_data_t __data = {};
}; };
struct surface_t struct surface_t

4
deerith_engine_core/src/world/environment.cpp
View File

@ -137,7 +137,7 @@ void deerith::set_voxel(voxel_type_id_t voxel_id, glm::ivec3 coordinates)
voxel_cluster_t *cluster = surface->get_create_cluster(layer); voxel_cluster_t *cluster = surface->get_create_cluster(layer);
cluster->last_update_tick_id = get_world_tick(); cluster->last_update_tick_id = get_world_tick();
cluster->data[internal_voxel_id.x][internal_voxel_id.y][internal_voxel_id.z] = voxel_id; cluster->__data[internal_voxel_id.x][internal_voxel_id.y][internal_voxel_id.z] = voxel_id;
} }
deerith::voxel_type_id_t deerith::get_voxel_id(glm::ivec3 coordinates) deerith::voxel_type_id_t deerith::get_voxel_id(glm::ivec3 coordinates)
@ -160,7 +160,7 @@ deerith::voxel_type_id_t deerith::get_voxel_id(glm::ivec3 coordinates)
return 0; return 0;
} }
return cluster->data[internal_voxel_id.x][internal_voxel_id.y][internal_voxel_id.z]; return cluster->__data[internal_voxel_id.x][internal_voxel_id.y][internal_voxel_id.z];
} }
const deerith::voxel_type_t &deerith::get_voxel(glm::ivec3 coordinates) const deerith::voxel_type_t &deerith::get_voxel(glm::ivec3 coordinates)

2
deerith_engine_server/src/world/voxel_data_managment.cpp
View File

@ -103,7 +103,7 @@ void deerith::send_cluster_info_to_client(client_t *client, voxel_cluster_t *clu
cluster_data.layer = cluster->layer; cluster_data.layer = cluster->layer;
cluster_data.__cluster_data = std::make_unique<cluster_voxel_type_id_data_t>(); cluster_data.__cluster_data = std::make_unique<cluster_voxel_type_id_data_t>();
*cluster_data.__cluster_data = cluster->data; *cluster_data.__cluster_data = cluster->__data;
router_send_packet(cluster_data, client); router_send_packet(cluster_data, client);
deerith_trace("sent cluster data to client in {} ms", get_chrono_ms()); deerith_trace("sent cluster data to client in {} ms", get_chrono_ms());