Skip to content

Commit eccb086

Browse files
CookieBadgerCookieBadger
committed
move light param enums to end
1 parent 991149b commit eccb086

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎doc/classes/Light3D.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,40 +161,40 @@
161161
<constant name="PARAM_SPOT_ATTENUATION" value="8" enum="Param">
162162
Constant for accessing [member SpotLight3D.spot_angle_attenuation].
163163
</constant>
164-
<constant name="PARAM_SHADOW_MAX_DISTANCE" value="11" enum="Param">
164+
<constant name="PARAM_SHADOW_MAX_DISTANCE" value="9" enum="Param">
165165
Constant for accessing [member DirectionalLight3D.directional_shadow_max_distance].
166166
</constant>
167-
<constant name="PARAM_SHADOW_SPLIT_1_OFFSET" value="12" enum="Param">
167+
<constant name="PARAM_SHADOW_SPLIT_1_OFFSET" value="10" enum="Param">
168168
Constant for accessing [member DirectionalLight3D.directional_shadow_split_1].
169169
</constant>
170-
<constant name="PARAM_SHADOW_SPLIT_2_OFFSET" value="13" enum="Param">
170+
<constant name="PARAM_SHADOW_SPLIT_2_OFFSET" value="11" enum="Param">
171171
Constant for accessing [member DirectionalLight3D.directional_shadow_split_2].
172172
</constant>
173-
<constant name="PARAM_SHADOW_SPLIT_3_OFFSET" value="14" enum="Param">
173+
<constant name="PARAM_SHADOW_SPLIT_3_OFFSET" value="12" enum="Param">
174174
Constant for accessing [member DirectionalLight3D.directional_shadow_split_3].
175175
</constant>
176-
<constant name="PARAM_SHADOW_FADE_START" value="15" enum="Param">
176+
<constant name="PARAM_SHADOW_FADE_START" value="13" enum="Param">
177177
Constant for accessing [member DirectionalLight3D.directional_shadow_fade_start].
178178
</constant>
179-
<constant name="PARAM_SHADOW_NORMAL_BIAS" value="16" enum="Param">
179+
<constant name="PARAM_SHADOW_NORMAL_BIAS" value="14" enum="Param">
180180
Constant for accessing [member shadow_normal_bias].
181181
</constant>
182-
<constant name="PARAM_SHADOW_BIAS" value="17" enum="Param">
182+
<constant name="PARAM_SHADOW_BIAS" value="15" enum="Param">
183183
Constant for accessing [member shadow_bias].
184184
</constant>
185-
<constant name="PARAM_SHADOW_PANCAKE_SIZE" value="18" enum="Param">
185+
<constant name="PARAM_SHADOW_PANCAKE_SIZE" value="16" enum="Param">
186186
Constant for accessing [member DirectionalLight3D.directional_shadow_pancake_size].
187187
</constant>
188-
<constant name="PARAM_SHADOW_OPACITY" value="19" enum="Param">
188+
<constant name="PARAM_SHADOW_OPACITY" value="17" enum="Param">
189189
Constant for accessing [member shadow_opacity].
190190
</constant>
191-
<constant name="PARAM_SHADOW_BLUR" value="20" enum="Param">
191+
<constant name="PARAM_SHADOW_BLUR" value="18" enum="Param">
192192
Constant for accessing [member shadow_blur].
193193
</constant>
194-
<constant name="PARAM_TRANSMITTANCE_BIAS" value="21" enum="Param">
194+
<constant name="PARAM_TRANSMITTANCE_BIAS" value="19" enum="Param">
195195
Constant for accessing [member shadow_transmittance_bias].
196196
</constant>
197-
<constant name="PARAM_INTENSITY" value="22" enum="Param">
197+
<constant name="PARAM_INTENSITY" value="20" enum="Param">
198198
Constant for accessing [member light_intensity_lumens] and [member light_intensity_lux]. Only used when [member ProjectSettings.rendering/lights_and_shadows/use_physical_light_units] is [code]true[/code].
199199
</constant>
200200
<constant name="PARAM_MAX" value="23" enum="Param">

‎doc/classes/RenderingServer.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4821,39 +4821,39 @@
48214821
<constant name="LIGHT_PARAM_SPOT_ATTENUATION" value="8" enum="LightParam">
48224822
The spotlight's attenuation.
48234823
</constant>
4824-
<constant name="LIGHT_PARAM_SHADOW_MAX_DISTANCE" value="11" enum="LightParam">
4824+
<constant name="LIGHT_PARAM_SHADOW_MAX_DISTANCE" value="9" enum="LightParam">
48254825
The maximum distance for shadow splits. Increasing this value will make directional shadows visible from further away, at the cost of lower overall shadow detail and performance (since more objects need to be included in the directional shadow rendering).
48264826
</constant>
4827-
<constant name="LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET" value="12" enum="LightParam">
4827+
<constant name="LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET" value="10" enum="LightParam">
48284828
Proportion of shadow atlas occupied by the first split.
48294829
</constant>
4830-
<constant name="LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET" value="13" enum="LightParam">
4830+
<constant name="LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET" value="11" enum="LightParam">
48314831
Proportion of shadow atlas occupied by the second split.
48324832
</constant>
4833-
<constant name="LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET" value="14" enum="LightParam">
4833+
<constant name="LIGHT_PARAM_SHADOW_SPLIT_3_OFFSET" value="12" enum="LightParam">
48344834
Proportion of shadow atlas occupied by the third split. The fourth split occupies the rest.
48354835
</constant>
4836-
<constant name="LIGHT_PARAM_SHADOW_FADE_START" value="15" enum="LightParam">
4836+
<constant name="LIGHT_PARAM_SHADOW_FADE_START" value="13" enum="LightParam">
48374837
Proportion of shadow max distance where the shadow will start to fade out.
48384838
</constant>
4839-
<constant name="LIGHT_PARAM_SHADOW_NORMAL_BIAS" value="16" enum="LightParam">
4839+
<constant name="LIGHT_PARAM_SHADOW_NORMAL_BIAS" value="14" enum="LightParam">
48404840
Normal bias used to offset shadow lookup by object normal. Can be used to fix self-shadowing artifacts.
48414841
</constant>
4842-
<constant name="LIGHT_PARAM_SHADOW_BIAS" value="17" enum="LightParam">
4842+
<constant name="LIGHT_PARAM_SHADOW_BIAS" value="15" enum="LightParam">
48434843
Bias for the shadow lookup to fix self-shadowing artifacts.
48444844
</constant>
4845-
<constant name="LIGHT_PARAM_SHADOW_PANCAKE_SIZE" value="18" enum="LightParam">
4845+
<constant name="LIGHT_PARAM_SHADOW_PANCAKE_SIZE" value="16" enum="LightParam">
48464846
Sets the size of the directional shadow pancake. The pancake offsets the start of the shadow's camera frustum to provide a higher effective depth resolution for the shadow. However, a high pancake size can cause artifacts in the shadows of large objects that are close to the edge of the frustum. Reducing the pancake size can help. Setting the size to [code]0[/code] turns off the pancaking effect.
48474847
</constant>
4848-
<constant name="LIGHT_PARAM_SHADOW_OPACITY" value="19" enum="LightParam">
4848+
<constant name="LIGHT_PARAM_SHADOW_OPACITY" value="17" enum="LightParam">
48494849
The light's shadow opacity. Values lower than [code]1.0[/code] make the light appear through shadows. This can be used to fake global illumination at a low performance cost.
48504850
</constant>
4851-
<constant name="LIGHT_PARAM_SHADOW_BLUR" value="20" enum="LightParam">
4851+
<constant name="LIGHT_PARAM_SHADOW_BLUR" value="18" enum="LightParam">
48524852
Blurs the edges of the shadow. Can be used to hide pixel artifacts in low resolution shadow maps. A high value can make shadows appear grainy and can cause other unwanted artifacts. Try to keep as near default as possible.
48534853
</constant>
4854-
<constant name="LIGHT_PARAM_TRANSMITTANCE_BIAS" value="21" enum="LightParam">
4854+
<constant name="LIGHT_PARAM_TRANSMITTANCE_BIAS" value="19" enum="LightParam">
48554855
</constant>
4856-
<constant name="LIGHT_PARAM_INTENSITY" value="22" enum="LightParam">
4856+
<constant name="LIGHT_PARAM_INTENSITY" value="20" enum="LightParam">
48574857
Constant representing the intensity of the light, measured in Lumens when dealing with a [SpotLight3D] or [OmniLight3D], or measured in Lux with a [DirectionalLight3D]. Only used when [member ProjectSettings.rendering/lights_and_shadows/use_physical_light_units] is [code]true[/code].
48584858
</constant>
48594859
<constant name="LIGHT_PARAM_MAX" value="23" enum="LightParam">

‎scene/3d/light_3d.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ class Light3D : public VisualInstance3D {
4646
PARAM_ATTENUATION = RS::LIGHT_PARAM_ATTENUATION,
4747
PARAM_SPOT_ANGLE = RS::LIGHT_PARAM_SPOT_ANGLE,
4848
PARAM_SPOT_ATTENUATION = RS::LIGHT_PARAM_SPOT_ATTENUATION,
49-
PARAM_AREA_WIDTH = RS::LIGHT_PARAM_AREA_WIDTH,
50-
PARAM_AREA_HEIGHT = RS::LIGHT_PARAM_AREA_HEIGHT,
5149
PARAM_SHADOW_MAX_DISTANCE = RS::LIGHT_PARAM_SHADOW_MAX_DISTANCE,
5250
PARAM_SHADOW_SPLIT_1_OFFSET = RS::LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
5351
PARAM_SHADOW_SPLIT_2_OFFSET = RS::LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
@@ -60,7 +58,9 @@ class Light3D : public VisualInstance3D {
6058
PARAM_SHADOW_BLUR = RS::LIGHT_PARAM_SHADOW_BLUR,
6159
PARAM_TRANSMITTANCE_BIAS = RS::LIGHT_PARAM_TRANSMITTANCE_BIAS,
6260
PARAM_INTENSITY = RS::LIGHT_PARAM_INTENSITY,
63-
PARAM_MAX = RS::LIGHT_PARAM_MAX,
61+
PARAM_AREA_WIDTH = RS::LIGHT_PARAM_AREA_WIDTH,
62+
PARAM_AREA_HEIGHT = RS::LIGHT_PARAM_AREA_HEIGHT,
63+
PARAM_MAX = RS::LIGHT_PARAM_MAX
6464
};
6565

6666
enum BakeMode {

‎servers/rendering_server.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,6 @@ class RenderingServer : public Object {
546546
LIGHT_PARAM_ATTENUATION,
547547
LIGHT_PARAM_SPOT_ANGLE,
548548
LIGHT_PARAM_SPOT_ATTENUATION,
549-
LIGHT_PARAM_AREA_WIDTH,
550-
LIGHT_PARAM_AREA_HEIGHT,
551549
LIGHT_PARAM_SHADOW_MAX_DISTANCE,
552550
LIGHT_PARAM_SHADOW_SPLIT_1_OFFSET,
553551
LIGHT_PARAM_SHADOW_SPLIT_2_OFFSET,
@@ -560,6 +558,8 @@ class RenderingServer : public Object {
560558
LIGHT_PARAM_SHADOW_BLUR,
561559
LIGHT_PARAM_TRANSMITTANCE_BIAS,
562560
LIGHT_PARAM_INTENSITY,
561+
LIGHT_PARAM_AREA_WIDTH,
562+
LIGHT_PARAM_AREA_HEIGHT,
563563
LIGHT_PARAM_MAX
564564
};
565565

0 commit comments

Comments
 (0)