From e962900f2344b4ca797002ddf440625087f63291 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 26 Nov 2021 17:47:37 +0100 Subject: Rename and reorder bake mode properties for consistency The order now goes from least to most computationally expensive: - Disabled - Static - Dynamic --- servers/rendering/renderer_rd/shaders/light_data_inc.glsl | 4 ++-- servers/rendering_server.cpp | 2 +- servers/rendering_server.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'servers') diff --git a/servers/rendering/renderer_rd/shaders/light_data_inc.glsl b/servers/rendering/renderer_rd/shaders/light_data_inc.glsl index fdc7729338..52787bb204 100644 --- a/servers/rendering/renderer_rd/shaders/light_data_inc.glsl +++ b/servers/rendering/renderer_rd/shaders/light_data_inc.glsl @@ -1,6 +1,6 @@ #define LIGHT_BAKE_DISABLED 0 -#define LIGHT_BAKE_DYNAMIC 1 -#define LIGHT_BAKE_STATIC 2 +#define LIGHT_BAKE_STATIC 1 +#define LIGHT_BAKE_DYNAMIC 2 struct LightData { //this structure needs to be as packed as possible highp vec3 position; diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 7a958546b6..919e2d71c4 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -1928,8 +1928,8 @@ void RenderingServer::_bind_methods() { BIND_ENUM_CONSTANT(LIGHT_PARAM_MAX); BIND_ENUM_CONSTANT(LIGHT_BAKE_DISABLED); - BIND_ENUM_CONSTANT(LIGHT_BAKE_DYNAMIC); BIND_ENUM_CONSTANT(LIGHT_BAKE_STATIC); + BIND_ENUM_CONSTANT(LIGHT_BAKE_DYNAMIC); BIND_ENUM_CONSTANT(LIGHT_OMNI_SHADOW_DUAL_PARABOLOID); BIND_ENUM_CONSTANT(LIGHT_OMNI_SHADOW_CUBE); diff --git a/servers/rendering_server.h b/servers/rendering_server.h index 85f92bc003..d8f4046162 100644 --- a/servers/rendering_server.h +++ b/servers/rendering_server.h @@ -445,8 +445,8 @@ public: enum LightBakeMode { LIGHT_BAKE_DISABLED, - LIGHT_BAKE_DYNAMIC, LIGHT_BAKE_STATIC, + LIGHT_BAKE_DYNAMIC, }; virtual void light_set_bake_mode(RID p_light, LightBakeMode p_bake_mode) = 0; -- cgit v1.2.3