Skip to content

Commit 0bb7a6a

Browse files
committed
RenderingServer enums were moved to a dedicated namespace
1 parent fb62ae6 commit 0bb7a6a

17 files changed

+63
-51
lines changed

meshers/transvoxel/voxel_mesher_transvoxel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,15 +383,15 @@ void VoxelMesherTransvoxel::build(VoxelMesher::Output &output, const VoxelMesher
383383
output.primitive_type = Mesh::PRIMITIVE_TRIANGLES;
384384

385385
// Transvoxel transitions data
386-
output.mesh_flags = (RenderingServer::ARRAY_CUSTOM_RGBA_FLOAT << Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT);
386+
output.mesh_flags = (RenderingServerEnums::ARRAY_CUSTOM_RGBA_FLOAT << Mesh::ARRAY_FORMAT_CUSTOM0_SHIFT);
387387

388388
// Texture data
389389
switch (texture_mode) {
390390
case TEXTURES_NONE:
391391
break;
392392
case TEXTURES_MIXEL4_S4:
393393
case TEXTURES_SINGLE_S4:
394-
output.mesh_flags |= (RenderingServer::ARRAY_CUSTOM_RG_FLOAT << Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT);
394+
output.mesh_flags |= (RenderingServerEnums::ARRAY_CUSTOM_RG_FLOAT << Mesh::ARRAY_FORMAT_CUSTOM1_SHIFT);
395395
break;
396396
default:
397397
ZN_PRINT_ERROR("Unhandled texture mode");

terrain/fixed_lod/voxel_mesh_block_vt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ class VoxelMeshBlockVT : public VoxelMeshBlock {
5959
void set_mesh(
6060
Ref<Mesh> mesh,
6161
GeometryInstance3D::GIMode gi_mode,
62-
RenderingServer::ShadowCastingSetting shadow_setting,
62+
RenderingServerEnums::ShadowCastingSetting shadow_setting,
6363
int render_layers_mask,
6464
Ref<Mesh> shadow_occluder_mesh
6565
#ifdef TOOLS_ENABLED
6666
,
67-
RenderingServer::ShadowCastingSetting shadow_occluder_mode
67+
RenderingServerEnums::ShadowCastingSetting shadow_occluder_mode
6868
#endif
6969
) {
7070
if (shadow_occluder_mesh.is_null()) {

terrain/fixed_lod/voxel_terrain.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,8 @@ void VoxelTerrain::_on_gi_mode_changed() {
299299
}
300300

301301
void VoxelTerrain::_on_shadow_casting_changed() {
302-
const RenderingServer::ShadowCastingSetting mode = RenderingServer::ShadowCastingSetting(get_shadow_casting());
302+
const RenderingServerEnums::ShadowCastingSetting mode =
303+
RenderingServerEnums::ShadowCastingSetting(get_shadow_casting());
303304
_mesh_map.for_each_block([mode](VoxelMeshBlockVT &block) { //
304305
block.set_shadow_casting(mode);
305306
});
@@ -2070,15 +2071,15 @@ void VoxelTerrain::apply_mesh_update(const VoxelEngine::BlockMeshOutput &ob) {
20702071
}
20712072

20722073
#ifdef TOOLS_ENABLED
2073-
const RenderingServer::ShadowCastingSetting shadow_occluder_mode = _debug_draw_shadow_occluders
2074-
? RenderingServer::SHADOW_CASTING_SETTING_ON
2075-
: RenderingServer::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
2074+
const RenderingServerEnums::ShadowCastingSetting shadow_occluder_mode = _debug_draw_shadow_occluders
2075+
? RenderingServerEnums::SHADOW_CASTING_SETTING_ON
2076+
: RenderingServerEnums::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
20762077
#endif
20772078

20782079
block->set_mesh(
20792080
mesh,
20802081
get_gi_mode(),
2081-
static_cast<RenderingServer::ShadowCastingSetting>(get_shadow_casting()),
2082+
static_cast<RenderingServerEnums::ShadowCastingSetting>(get_shadow_casting()),
20822083
get_render_layers_mask(),
20832084
shadow_occluder_mesh
20842085
#ifdef TOOLS_ENABLED
@@ -2286,8 +2287,9 @@ void VoxelTerrain::debug_set_draw_shadow_occluders(bool enable) {
22862287
return;
22872288
}
22882289
_debug_draw_shadow_occluders = enable;
2289-
const RenderingServer::ShadowCastingSetting mode =
2290-
enable ? RenderingServer::SHADOW_CASTING_SETTING_ON : RenderingServer::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
2290+
const RenderingServerEnums::ShadowCastingSetting mode = enable
2291+
? RenderingServerEnums::SHADOW_CASTING_SETTING_ON
2292+
: RenderingServerEnums::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
22912293
_mesh_map.for_each_block([mode](VoxelMeshBlockVT &block) {
22922294
if (block.shadow_occluder.is_valid()) {
22932295
block.shadow_occluder.set_cast_shadows_setting(mode);

terrain/instancing/voxel_instance_library_multimesh_item.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Ref<Material> VoxelInstanceLibraryMultiMeshItem::get_material_override() const {
167167
return settings.material_override;
168168
}
169169

170-
void VoxelInstanceLibraryMultiMeshItem::set_cast_shadows_setting(RenderingServer::ShadowCastingSetting mode) {
170+
void VoxelInstanceLibraryMultiMeshItem::set_cast_shadows_setting(RenderingServerEnums::ShadowCastingSetting mode) {
171171
Settings &settings = _manual_settings;
172172
if (mode == settings.shadow_casting_setting) {
173173
return;
@@ -190,7 +190,7 @@ GeometryInstance3D::GIMode VoxelInstanceLibraryMultiMeshItem::get_gi_mode() cons
190190
return settings.gi_mode;
191191
}
192192

193-
RenderingServer::ShadowCastingSetting VoxelInstanceLibraryMultiMeshItem::get_cast_shadows_setting() const {
193+
RenderingServerEnums::ShadowCastingSetting VoxelInstanceLibraryMultiMeshItem::get_cast_shadows_setting() const {
194194
const Settings &settings = _manual_settings;
195195
return settings.shadow_casting_setting;
196196
}
@@ -384,23 +384,23 @@ bool VoxelInstanceLibraryMultiMeshItem::_get(const StringName &p_name, Variant &
384384

385385
namespace {
386386

387-
RenderingServer::ShadowCastingSetting node_to_visual_server_enum(GeometryInstance3D::ShadowCastingSetting v) {
387+
RenderingServerEnums::ShadowCastingSetting node_to_visual_server_enum(GeometryInstance3D::ShadowCastingSetting v) {
388388
switch (v) {
389389
case GeometryInstance3D::SHADOW_CASTING_SETTING_OFF:
390-
return RenderingServer::SHADOW_CASTING_SETTING_OFF;
390+
return RenderingServerEnums::SHADOW_CASTING_SETTING_OFF;
391391

392392
case GeometryInstance3D::SHADOW_CASTING_SETTING_ON:
393-
return RenderingServer::SHADOW_CASTING_SETTING_ON;
393+
return RenderingServerEnums::SHADOW_CASTING_SETTING_ON;
394394

395395
case GeometryInstance3D::SHADOW_CASTING_SETTING_DOUBLE_SIDED:
396-
return RenderingServer::SHADOW_CASTING_SETTING_DOUBLE_SIDED;
396+
return RenderingServerEnums::SHADOW_CASTING_SETTING_DOUBLE_SIDED;
397397

398398
case GeometryInstance3D::SHADOW_CASTING_SETTING_SHADOWS_ONLY:
399-
return RenderingServer::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
399+
return RenderingServerEnums::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
400400

401401
default:
402402
ERR_PRINT("Unknown ShadowCastingSetting value");
403-
return RenderingServer::SHADOW_CASTING_SETTING_OFF;
403+
return RenderingServerEnums::SHADOW_CASTING_SETTING_OFF;
404404
}
405405
}
406406

@@ -568,7 +568,7 @@ void VoxelInstanceLibraryMultiMeshItem::deserialize_multimesh_item_properties(Ar
568568
settings.mesh_lod_count = a[ai++];
569569
settings.material_override = a[ai++];
570570
settings.render_layer = a[ai++];
571-
settings.shadow_casting_setting = RenderingServer::ShadowCastingSetting(int(a[ai++])); // ugh...
571+
settings.shadow_casting_setting = RenderingServerEnums::ShadowCastingSetting(int(a[ai++])); // ugh...
572572
settings.gi_mode = GeometryInstance3D::GIMode(int(a[ai++])); // ugh...
573573
settings.collision_layer = a[ai++];
574574
settings.collision_mask = a[ai++];

terrain/instancing/voxel_instance_library_multimesh_item.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct InstanceLibraryMultiMeshItemSettings {
3535
// but this is in case OBJ meshes are used, which often dont have a material of their own
3636
Ref<Material> material_override;
3737

38-
RenderingServer::ShadowCastingSetting shadow_casting_setting = RenderingServer::SHADOW_CASTING_SETTING_ON;
38+
RenderingServerEnums::ShadowCastingSetting shadow_casting_setting = RenderingServerEnums::SHADOW_CASTING_SETTING_ON;
3939
GeometryInstance3D::GIMode gi_mode = GeometryInstance3D::GIMode::GI_MODE_STATIC;
4040

4141
int collision_mask = 1;
@@ -83,8 +83,8 @@ class VoxelInstanceLibraryMultiMeshItem : public VoxelInstanceLibraryItem {
8383
void set_material_override(Ref<Material> material);
8484
Ref<Material> get_material_override() const;
8585

86-
void set_cast_shadows_setting(RenderingServer::ShadowCastingSetting mode);
87-
RenderingServer::ShadowCastingSetting get_cast_shadows_setting() const;
86+
void set_cast_shadows_setting(RenderingServerEnums::ShadowCastingSetting mode);
87+
RenderingServerEnums::ShadowCastingSetting get_cast_shadows_setting() const;
8888

8989
void set_gi_mode(GeometryInstance3D::GIMode mode);
9090
GeometryInstance3D::GIMode get_gi_mode() const;

terrain/variable_lod/voxel_lod_terrain.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,8 @@ void VoxelLodTerrain::_on_gi_mode_changed() {
364364
}
365365

366366
void VoxelLodTerrain::_on_shadow_casting_changed() {
367-
const RenderingServer::ShadowCastingSetting mode = RenderingServer::ShadowCastingSetting(get_shadow_casting());
367+
const RenderingServerEnums::ShadowCastingSetting mode =
368+
RenderingServerEnums::ShadowCastingSetting(get_shadow_casting());
368369
for (unsigned int lod_index = 0; lod_index < _update_data->state.lods.size(); ++lod_index) {
369370
_mesh_maps_per_lod[lod_index].for_each_block([mode](VoxelMeshBlockVLT &block) { //
370371
block.set_shadow_casting(mode);
@@ -2058,15 +2059,15 @@ void VoxelLodTerrain::apply_mesh_update(VoxelEngine::BlockMeshOutput &ob) {
20582059
}
20592060

20602061
#ifdef TOOLS_ENABLED
2061-
const RenderingServer::ShadowCastingSetting shadow_occluder_mode = _debug_draw_shadow_occluders
2062-
? RenderingServer::SHADOW_CASTING_SETTING_ON
2063-
: RenderingServer::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
2062+
const RenderingServerEnums::ShadowCastingSetting shadow_occluder_mode = _debug_draw_shadow_occluders
2063+
? RenderingServerEnums::SHADOW_CASTING_SETTING_ON
2064+
: RenderingServerEnums::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
20642065
#endif
20652066

20662067
block->set_mesh(
20672068
mesh,
20682069
get_gi_mode(),
2069-
RenderingServer::ShadowCastingSetting(get_shadow_casting()),
2070+
RenderingServerEnums::ShadowCastingSetting(get_shadow_casting()),
20702071
get_render_layers_mask(),
20712072
shadow_occluder_mesh,
20722073
ob.surfaces.collision_surface.submesh_vertex_end,
@@ -2106,7 +2107,7 @@ void VoxelLodTerrain::apply_mesh_update(VoxelEngine::BlockMeshOutput &ob) {
21062107
transition_mesh,
21072108
dir,
21082109
get_gi_mode(),
2109-
RenderingServer::ShadowCastingSetting(get_shadow_casting()),
2110+
RenderingServerEnums::ShadowCastingSetting(get_shadow_casting()),
21102111
get_render_layers_mask()
21112112
);
21122113
}
@@ -3357,8 +3358,9 @@ void VoxelLodTerrain::debug_set_draw_shadow_occluders(bool enable) {
33573358
return;
33583359
}
33593360
_debug_draw_shadow_occluders = enable;
3360-
const RenderingServer::ShadowCastingSetting mode =
3361-
enable ? RenderingServer::SHADOW_CASTING_SETTING_ON : RenderingServer::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
3361+
const RenderingServerEnums::ShadowCastingSetting mode = enable
3362+
? RenderingServerEnums::SHADOW_CASTING_SETTING_ON
3363+
: RenderingServerEnums::SHADOW_CASTING_SETTING_SHADOWS_ONLY;
33623364
for (VoxelMeshMap<VoxelMeshBlockVLT> &mesh_map : _mesh_maps_per_lod) {
33633365
mesh_map.for_each_block([mode](VoxelMeshBlockVLT &block) { //
33643366
block.set_shadow_occluder_mode(mode);

terrain/variable_lod/voxel_mesh_block_vlt.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ VoxelMeshBlockVLT::~VoxelMeshBlockVLT() {
5252
void VoxelMeshBlockVLT::set_mesh(
5353
Ref<Mesh> mesh,
5454
GeometryInstance3D::GIMode gi_mode,
55-
RenderingServer::ShadowCastingSetting shadow_casting,
55+
RenderingServerEnums::ShadowCastingSetting shadow_casting,
5656
int render_layers_mask,
5757
Ref<Mesh> shadow_occluder_mesh,
5858
int32_t p_col_vertex_end,
5959
int32_t p_col_index_end
6060
#ifdef TOOLS_ENABLED
6161
,
62-
RenderingServer::ShadowCastingSetting shadow_occluder_mode
62+
RenderingServerEnums::ShadowCastingSetting shadow_occluder_mode
6363
#endif
6464
) {
6565
// TODO Don't add mesh instance to the world if it's not visible.
@@ -160,7 +160,7 @@ void VoxelMeshBlockVLT::set_gi_mode(GeometryInstance3D::GIMode mode) {
160160
}
161161
}
162162

163-
void VoxelMeshBlockVLT::set_shadow_casting(RenderingServer::ShadowCastingSetting mode) {
163+
void VoxelMeshBlockVLT::set_shadow_casting(RenderingServerEnums::ShadowCastingSetting mode) {
164164
VoxelMeshBlock::set_shadow_casting(mode);
165165

166166
for (unsigned int i = 0; i < _transition_mesh_instances.size(); ++i) {
@@ -185,7 +185,7 @@ void VoxelMeshBlockVLT::set_transition_mesh(
185185
Ref<Mesh> mesh,
186186
unsigned int side,
187187
GeometryInstance3D::GIMode gi_mode,
188-
RenderingServer::ShadowCastingSetting shadow_casting,
188+
RenderingServerEnums::ShadowCastingSetting shadow_casting,
189189
int render_layers_mask
190190
) {
191191
DirectMeshInstance &mesh_instance = _transition_mesh_instances[side];

terrain/variable_lod/voxel_mesh_block_vlt.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ class VoxelMeshBlockVLT : public VoxelMeshBlock {
5959
void set_mesh(
6060
Ref<Mesh> mesh,
6161
GeometryInstance3D::GIMode gi_mode,
62-
RenderingServer::ShadowCastingSetting shadow_casting,
62+
RenderingServerEnums::ShadowCastingSetting shadow_casting,
6363
int render_layers_mask,
6464
Ref<Mesh> shadow_occluder_mesh,
6565
int32_t p_col_vertex_max,
6666
int32_t p_col_index_max
6767
#ifdef TOOLS_ENABLED
6868
,
69-
RenderingServer::ShadowCastingSetting shadow_occluder_mode
69+
RenderingServerEnums::ShadowCastingSetting shadow_occluder_mode
7070
#endif
7171
);
7272
void drop_visuals();
@@ -77,14 +77,14 @@ class VoxelMeshBlockVLT : public VoxelMeshBlock {
7777
}
7878

7979
void set_gi_mode(GeometryInstance3D::GIMode mode);
80-
void set_shadow_casting(RenderingServer::ShadowCastingSetting mode);
80+
void set_shadow_casting(RenderingServerEnums::ShadowCastingSetting mode);
8181
void set_render_layers_mask(int mask);
8282

8383
void set_transition_mesh(
8484
Ref<Mesh> mesh,
8585
unsigned int side,
8686
GeometryInstance3D::GIMode gi_mode,
87-
RenderingServer::ShadowCastingSetting shadow_casting,
87+
RenderingServerEnums::ShadowCastingSetting shadow_casting,
8888
int render_layers_mask
8989
);
9090

@@ -115,7 +115,7 @@ class VoxelMeshBlockVLT : public VoxelMeshBlock {
115115
}
116116

117117
#ifdef TOOLS_ENABLED
118-
inline void set_shadow_occluder_mode(RenderingServer::ShadowCastingSetting mode) {
118+
inline void set_shadow_occluder_mode(RenderingServerEnums::ShadowCastingSetting mode) {
119119
_shadow_occluder.set_cast_shadows_setting(mode);
120120
}
121121
#endif

terrain/voxel_mesh_block.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void VoxelMeshBlock::set_gi_mode(GeometryInstance3D::GIMode mode) {
3636
}
3737
}
3838

39-
void VoxelMeshBlock::set_shadow_casting(RenderingServer::ShadowCastingSetting setting) {
39+
void VoxelMeshBlock::set_shadow_casting(RenderingServerEnums::ShadowCastingSetting setting) {
4040
if (_mesh_instance.is_valid()) {
4141
_mesh_instance.set_cast_shadows_setting(setting);
4242
}
@@ -51,7 +51,7 @@ void VoxelMeshBlock::set_render_layers_mask(int mask) {
5151
void VoxelMeshBlock::set_mesh(
5252
Ref<Mesh> mesh,
5353
GeometryInstance3D::GIMode gi_mode,
54-
RenderingServer::ShadowCastingSetting shadow_setting,
54+
RenderingServerEnums::ShadowCastingSetting shadow_setting,
5555
int render_layers_mask
5656
) {
5757
// TODO Don't add mesh instance to the world if it's not visible.

terrain/voxel_mesh_block.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class VoxelMeshBlock : public NonCopyable {
3838
void set_mesh(
3939
Ref<Mesh> mesh,
4040
GeometryInstance3D::GIMode gi_mode,
41-
RenderingServer::ShadowCastingSetting shadow_setting,
41+
RenderingServerEnums::ShadowCastingSetting shadow_setting,
4242
int render_layers_mask
4343
);
4444
Ref<Mesh> get_mesh() const;
@@ -51,7 +51,7 @@ class VoxelMeshBlock : public NonCopyable {
5151

5252
// Note, ShadowCastingSetting is not stored per block, it is a shared option so we provide it in several functions.
5353
// Call this function only if the mesh block already exists and has not changed mesh
54-
void set_shadow_casting(RenderingServer::ShadowCastingSetting setting);
54+
void set_shadow_casting(RenderingServerEnums::ShadowCastingSetting setting);
5555

5656
// Note, render layers is not stored per block, it is a shared option so we provide it in several functions.
5757
// Call this function only if the mesh block already exists and has not changed mesh

0 commit comments

Comments
 (0)