Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-06 12:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Now TerrainChunks will register their lights into the VertexLights3DServer if use_vertex_lights_3d is enabled in world.

Browse Source
This commit is contained in:
Relintai 2025-04-04 18:15:33 +02:00
parent 1ac803de1c
commit c094e070c7
3 changed files with 134 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/terraman/data/terrain_light.cpp
View File

@ -128,6 +128,15 @@ void TerrainLight::set_item_cull_mask(const int p_item_cull_mask) {
_item_cull_mask = p_item_cull_mask; _item_cull_mask = p_item_cull_mask;
} }
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
RID TerrainLight::get_vertex_lights_3d_rid() const {
return _vertex_lights_3d_rid;
}
void TerrainLight::set_vertex_lights_3d_rid(const RID p_rid) {
_vertex_lights_3d_rid = p_rid;
}
#endif
Dictionary TerrainLight::to_dict() { Dictionary TerrainLight::to_dict() {
Dictionary data; Dictionary data;
@ -254,6 +263,11 @@ void TerrainLight::_bind_methods() {
ClassDB::bind_method(D_METHOD("to_dict"), &TerrainLight::to_dict); ClassDB::bind_method(D_METHOD("to_dict"), &TerrainLight::to_dict);
ClassDB::bind_method(D_METHOD("from_dict", "data"), &TerrainLight::from_dict); ClassDB::bind_method(D_METHOD("from_dict", "data"), &TerrainLight::from_dict);
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
ClassDB::bind_method(D_METHOD("get_vertex_lights_3d_rid"), &TerrainLight::get_vertex_lights_3d_rid);
ClassDB::bind_method(D_METHOD("set_vertex_lights_3d_rid", "rid"), &TerrainLight::set_vertex_lights_3d_rid);
#endif
BIND_ENUM_CONSTANT(OWNER_TYPE_NONE); BIND_ENUM_CONSTANT(OWNER_TYPE_NONE);
#ifdef MODULE_PROPS_ENABLED #ifdef MODULE_PROPS_ENABLED
BIND_ENUM_CONSTANT(OWNER_TYPE_PROP); BIND_ENUM_CONSTANT(OWNER_TYPE_PROP);

9
modules/terraman/data/terrain_light.h
View File

@ -95,6 +95,11 @@ public:
int get_item_cull_mask(); int get_item_cull_mask();
void set_item_cull_mask(const int p_item_cull_mask); void set_item_cull_mask(const int p_item_cull_mask);
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
RID get_vertex_lights_3d_rid() const;
void set_vertex_lights_3d_rid(const RID p_rid);
#endif
Dictionary to_dict(); Dictionary to_dict();
void from_dict(const Dictionary &p_data); void from_dict(const Dictionary &p_data);
@ -123,6 +128,10 @@ private:
LightMode _light_mode; LightMode _light_mode;
int _item_cull_mask; int _item_cull_mask;
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
RID _vertex_lights_3d_rid;
#endif
}; };
VARIANT_ENUM_CAST(TerrainLight::OwnerType); VARIANT_ENUM_CAST(TerrainLight::OwnerType);

111
modules/terraman/world/terrain_chunk.cpp
View File

@ -50,6 +50,11 @@
#include "modules/lz4/lz4_compressor.h" #include "modules/lz4/lz4_compressor.h"
#endif #endif
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
#include "modules/vertex_lights_3d/vertex_lights_3d_server.h"
#include "scene/resources/world_3d.h"
#endif
_FORCE_INLINE_ bool TerrainChunk::get_process() const { _FORCE_INLINE_ bool TerrainChunk::get_process() const {
return _is_processing; return _is_processing;
} }
@ -703,6 +708,27 @@ void TerrainChunk::light_add(Ref<TerrainLight> p_light) {
TerrainWorld *world = get_voxel_world(); TerrainWorld *world = get_voxel_world();
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
if (world) {
if (world->get_use_vertex_lights_3d()) {
RID vertex_light_rid = p_light->get_vertex_lights_3d_rid();
if (vertex_light_rid == RID()) {
vertex_light_rid = VertexLights3DServer::get_singleton()->light_create();
p_light->set_vertex_lights_3d_rid(vertex_light_rid);
VertexLights3DServer::get_singleton()->light_set_attenuation(vertex_light_rid, p_light->get_attenuation());
VertexLights3DServer::get_singleton()->light_set_color(vertex_light_rid, p_light->get_color());
VertexLights3DServer::get_singleton()->light_set_item_cull_mask(vertex_light_rid, p_light->get_item_cull_mask());
VertexLights3DServer::get_singleton()->light_set_mode(vertex_light_rid, (VertexLights3DServer::VertexLight3DMode)(int)p_light->get_light_mode());
VertexLights3DServer::get_singleton()->light_set_range(vertex_light_rid, p_light->get_range());
VertexLights3DServer::get_singleton()->light_set_map(vertex_light_rid, world->get_world_3d()->get_vertex_lights_3d_map());
VertexLights3DServer::get_singleton()->light_set_position(vertex_light_rid, p_light->get_world_data_position() * get_voxel_scale());
}
}
}
#endif
if (ObjectDB::instance_validate(world)) { if (ObjectDB::instance_validate(world)) {
world->world_light_added(p_light); world->world_light_added(p_light);
} }
@ -720,6 +746,19 @@ bool TerrainChunk::light_remove(Ref<TerrainLight> p_light) {
TerrainWorld *world = get_voxel_world(); TerrainWorld *world = get_voxel_world();
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
if (world) {
if (world->get_use_vertex_lights_3d()) {
RID vertex_light_rid = p_light->get_vertex_lights_3d_rid();
if (vertex_light_rid != RID()) {
VertexLights3DServer::get_singleton()->free(vertex_light_rid);
p_light->set_vertex_lights_3d_rid(RID());
}
}
}
#endif
if (ObjectDB::instance_validate(world)) { if (ObjectDB::instance_validate(world)) {
world->world_light_removed(p_light); world->world_light_removed(p_light);
} }
@ -752,6 +791,19 @@ void TerrainChunk::light_remove_index(const int index) {
TerrainWorld *world = get_voxel_world(); TerrainWorld *world = get_voxel_world();
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
if (world) {
if (world->get_use_vertex_lights_3d()) {
RID vertex_light_rid = light->get_vertex_lights_3d_rid();
if (vertex_light_rid != RID()) {
VertexLights3DServer::get_singleton()->free(vertex_light_rid);
light->set_vertex_lights_3d_rid(RID());
}
}
}
#endif
if (ObjectDB::instance_validate(world)) { if (ObjectDB::instance_validate(world)) {
world->world_light_removed(light); world->world_light_removed(light);
} }
@ -851,6 +903,18 @@ void TerrainChunk::owned_lights_set(const Vector<Variant> &p_lights) {
void TerrainChunk::_on_light_moved(const Ref<TerrainLight> &p_light) { void TerrainChunk::_on_light_moved(const Ref<TerrainLight> &p_light) {
TerrainWorld *world = get_voxel_world(); TerrainWorld *world = get_voxel_world();
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
if (world) {
if (world->get_use_vertex_lights_3d()) {
RID vertex_light_rid = p_light->get_vertex_lights_3d_rid();
if (vertex_light_rid != RID()) {
VertexLights3DServer::get_singleton()->light_set_position(vertex_light_rid, p_light->get_world_data_position() * get_voxel_scale());
}
}
}
#endif
if (ObjectDB::instance_validate(world)) { if (ObjectDB::instance_validate(world)) {
world->world_light_moved(p_light); world->world_light_moved(p_light);
} }
@ -1944,6 +2008,34 @@ void TerrainChunk::_enter_tree() {
for (int i = 0; i < _scenes.size(); ++i) { for (int i = 0; i < _scenes.size(); ++i) {
scene_instance(i); scene_instance(i);
} }
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
TerrainWorld *world = get_voxel_world();
if (world) {
if (world->get_use_vertex_lights_3d()) {
for (int i = 0; i < _lights.size(); ++i) {
Ref<TerrainLight> light = _lights[i];
RID vertex_light_rid = light->get_vertex_lights_3d_rid();
if (vertex_light_rid == RID()) {
vertex_light_rid = VertexLights3DServer::get_singleton()->light_create();
light->set_vertex_lights_3d_rid(vertex_light_rid);
VertexLights3DServer::get_singleton()->light_set_attenuation(vertex_light_rid, light->get_attenuation());
VertexLights3DServer::get_singleton()->light_set_color(vertex_light_rid, light->get_color());
VertexLights3DServer::get_singleton()->light_set_item_cull_mask(vertex_light_rid, light->get_item_cull_mask());
VertexLights3DServer::get_singleton()->light_set_mode(vertex_light_rid, (VertexLights3DServer::VertexLight3DMode)(int)light->get_light_mode());
VertexLights3DServer::get_singleton()->light_set_range(vertex_light_rid, light->get_range());
VertexLights3DServer::get_singleton()->light_set_position(vertex_light_rid, light->get_world_data_position() * get_voxel_scale());
}
VertexLights3DServer::get_singleton()->light_set_map(vertex_light_rid, world->get_world_3d()->get_vertex_lights_3d_map());
}
}
}
#endif
} }
void TerrainChunk::_exit_tree() { void TerrainChunk::_exit_tree() {
@ -1971,6 +2063,25 @@ void TerrainChunk::_exit_tree() {
material_cache_key_has_set(false); material_cache_key_has_set(false);
} }
} }
#ifdef MODULE_VERTEX_LIGHTS_3D_ENABLED
TerrainWorld *world = get_voxel_world();
if (world) {
if (world->get_use_vertex_lights_3d()) {
for (int i = 0; i < _lights.size(); ++i) {
Ref<TerrainLight> light = _lights[i];
RID vertex_light_rid = light->get_vertex_lights_3d_rid();
if (vertex_light_rid != RID()) {
VertexLights3DServer::get_singleton()->free(vertex_light_rid);
light->set_vertex_lights_3d_rid(RID());
}
}
}
}
#endif
} }
void TerrainChunk::_generation_process(const float delta) { void TerrainChunk::_generation_process(const float delta) {