godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix spelling of a var, a struct, and message output

Browse Source
This commit is contained in:
Andy Maloney
2020-07-17 12:02:06 -04:00
parent 9e34ba4855
commit 8b949918b1
5 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/container_type_validate.h
View File

@@ -38,7 +38,7 @@ struct ContainerTypeValidate {
Variant::Type type = Variant::NIL; Variant::Type type = Variant::NIL;
StringName class_name; StringName class_name;
Ref<Script> script; Ref<Script> script;
const char *where = "conatiner"; const char *where = "container";
_FORCE_INLINE_ bool can_reference(const ContainerTypeValidate &p_type) const { _FORCE_INLINE_ bool can_reference(const ContainerTypeValidate &p_type) const {
if (type == p_type.type) { if (type == p_type.type) {

14
drivers/vulkan/rendering_device_vulkan.cpp
View File

@@ -5068,13 +5068,13 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
input_assembly_create_info.topology = topology_list[p_render_primitive]; input_assembly_create_info.topology = topology_list[p_render_primitive];
input_assembly_create_info.primitiveRestartEnable = (p_render_primitive == RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_RESTART_INDEX); input_assembly_create_info.primitiveRestartEnable = (p_render_primitive == RENDER_PRIMITIVE_TRIANGLE_STRIPS_WITH_RESTART_INDEX);
//tesselation //tessellation
VkPipelineTessellationStateCreateInfo tesselation_create_info; VkPipelineTessellationStateCreateInfo tessellation_create_info;
tesselation_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; tessellation_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO;
tesselation_create_info.pNext = nullptr; tessellation_create_info.pNext = nullptr;
tesselation_create_info.flags = 0; tessellation_create_info.flags = 0;
ERR_FAIL_COND_V(p_rasterization_state.patch_control_points < 1 || p_rasterization_state.patch_control_points > limits.maxTessellationPatchSize, RID()); ERR_FAIL_COND_V(p_rasterization_state.patch_control_points < 1 || p_rasterization_state.patch_control_points > limits.maxTessellationPatchSize, RID());
tesselation_create_info.patchControlPoints = p_rasterization_state.patch_control_points; tessellation_create_info.patchControlPoints = p_rasterization_state.patch_control_points;
VkPipelineViewportStateCreateInfo viewport_state_create_info; VkPipelineViewportStateCreateInfo viewport_state_create_info;
viewport_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; viewport_state_create_info.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO;
@@ -5286,7 +5286,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
graphics_pipeline_create_info.pStages = shader->pipeline_stages.ptr(); graphics_pipeline_create_info.pStages = shader->pipeline_stages.ptr();
graphics_pipeline_create_info.pVertexInputState = &pipeline_vertex_input_state_create_info; graphics_pipeline_create_info.pVertexInputState = &pipeline_vertex_input_state_create_info;
graphics_pipeline_create_info.pInputAssemblyState = &input_assembly_create_info; graphics_pipeline_create_info.pInputAssemblyState = &input_assembly_create_info;
graphics_pipeline_create_info.pTessellationState = &tesselation_create_info; graphics_pipeline_create_info.pTessellationState = &tessellation_create_info;
graphics_pipeline_create_info.pViewportState = &viewport_state_create_info; graphics_pipeline_create_info.pViewportState = &viewport_state_create_info;
graphics_pipeline_create_info.pRasterizationState = &rasterization_state_create_info; graphics_pipeline_create_info.pRasterizationState = &rasterization_state_create_info;
graphics_pipeline_create_info.pMultisampleState = &multisample_state_create_info; graphics_pipeline_create_info.pMultisampleState = &multisample_state_create_info;

78
servers/rendering/rasterizer_rd/rasterizer_scene_rd.cpp
View File

@@ -238,7 +238,7 @@ void RasterizerSceneRD::_sdfgi_erase(RenderBuffers *rb) {
const Vector3i RasterizerSceneRD::SDFGI::Cascade::DIRTY_ALL = Vector3i(0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF); const Vector3i RasterizerSceneRD::SDFGI::Cascade::DIRTY_ALL = Vector3i(0x7FFFFFFF, 0x7FFFFFFF, 0x7FFFFFFF);
void RasterizerSceneRD::sdfgi_update(RID p_render_buffers, RID p_environment, const Vector3 &p_world_position) { void RasterizerSceneRD::sdfgi_update(RID p_render_buffers, RID p_environment, const Vector3 &p_world_position) {
Environent *env = environment_owner.getornull(p_environment); Environment *env = environment_owner.getornull(p_environment);
RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers); RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers);
bool needs_sdfgi = env && env->sdfgi_enabled; bool needs_sdfgi = env && env->sdfgi_enabled;
@@ -1142,7 +1142,7 @@ void RasterizerSceneRD::sdfgi_update_probes(RID p_render_buffers, RID p_environm
if (rb->sdfgi == nullptr) { if (rb->sdfgi == nullptr) {
return; return;
} }
Environent *env = environment_owner.getornull(p_environment); Environment *env = environment_owner.getornull(p_environment);
RENDER_TIMESTAMP(">SDFGI Update Probes"); RENDER_TIMESTAMP(">SDFGI Update Probes");
@@ -1380,7 +1380,7 @@ void RasterizerSceneRD::_process_gi(RID p_render_buffers, RID p_normal_roughness
RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers); RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers);
ERR_FAIL_COND(rb == nullptr); ERR_FAIL_COND(rb == nullptr);
Environent *env = environment_owner.getornull(p_environment); Environment *env = environment_owner.getornull(p_environment);
GI::PushConstant push_constant; GI::PushConstant push_constant;
@@ -2695,53 +2695,53 @@ RasterizerStorageRD::MaterialData *RasterizerSceneRD::_create_sky_material_func(
} }
RID RasterizerSceneRD::environment_create() { RID RasterizerSceneRD::environment_create() {
return environment_owner.make_rid(Environent()); return environment_owner.make_rid(Environment());
} }
void RasterizerSceneRD::environment_set_background(RID p_env, RS::EnvironmentBG p_bg) { void RasterizerSceneRD::environment_set_background(RID p_env, RS::EnvironmentBG p_bg) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->background = p_bg; env->background = p_bg;
} }
void RasterizerSceneRD::environment_set_sky(RID p_env, RID p_sky) { void RasterizerSceneRD::environment_set_sky(RID p_env, RID p_sky) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->sky = p_sky; env->sky = p_sky;
} }
void RasterizerSceneRD::environment_set_sky_custom_fov(RID p_env, float p_scale) { void RasterizerSceneRD::environment_set_sky_custom_fov(RID p_env, float p_scale) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->sky_custom_fov = p_scale; env->sky_custom_fov = p_scale;
} }
void RasterizerSceneRD::environment_set_sky_orientation(RID p_env, const Basis &p_orientation) { void RasterizerSceneRD::environment_set_sky_orientation(RID p_env, const Basis &p_orientation) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->sky_orientation = p_orientation; env->sky_orientation = p_orientation;
} }
void RasterizerSceneRD::environment_set_bg_color(RID p_env, const Color &p_color) { void RasterizerSceneRD::environment_set_bg_color(RID p_env, const Color &p_color) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->bg_color = p_color; env->bg_color = p_color;
} }
void RasterizerSceneRD::environment_set_bg_energy(RID p_env, float p_energy) { void RasterizerSceneRD::environment_set_bg_energy(RID p_env, float p_energy) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->bg_energy = p_energy; env->bg_energy = p_energy;
} }
void RasterizerSceneRD::environment_set_canvas_max_layer(RID p_env, int p_max_layer) { void RasterizerSceneRD::environment_set_canvas_max_layer(RID p_env, int p_max_layer) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->canvas_max_layer = p_max_layer; env->canvas_max_layer = p_max_layer;
} }
void RasterizerSceneRD::environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient, float p_energy, float p_sky_contribution, RS::EnvironmentReflectionSource p_reflection_source, const Color &p_ao_color) { void RasterizerSceneRD::environment_set_ambient_light(RID p_env, const Color &p_color, RS::EnvironmentAmbientSource p_ambient, float p_energy, float p_sky_contribution, RS::EnvironmentReflectionSource p_reflection_source, const Color &p_ao_color) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->ambient_light = p_color; env->ambient_light = p_color;
env->ambient_source = p_ambient; env->ambient_source = p_ambient;
@@ -2752,85 +2752,85 @@ void RasterizerSceneRD::environment_set_ambient_light(RID p_env, const Color &p_
} }
RS::EnvironmentBG RasterizerSceneRD::environment_get_background(RID p_env) const { RS::EnvironmentBG RasterizerSceneRD::environment_get_background(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, RS::ENV_BG_MAX); ERR_FAIL_COND_V(!env, RS::ENV_BG_MAX);
return env->background; return env->background;
} }
RID RasterizerSceneRD::environment_get_sky(RID p_env) const { RID RasterizerSceneRD::environment_get_sky(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, RID()); ERR_FAIL_COND_V(!env, RID());
return env->sky; return env->sky;
} }
float RasterizerSceneRD::environment_get_sky_custom_fov(RID p_env) const { float RasterizerSceneRD::environment_get_sky_custom_fov(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, 0); ERR_FAIL_COND_V(!env, 0);
return env->sky_custom_fov; return env->sky_custom_fov;
} }
Basis RasterizerSceneRD::environment_get_sky_orientation(RID p_env) const { Basis RasterizerSceneRD::environment_get_sky_orientation(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, Basis()); ERR_FAIL_COND_V(!env, Basis());
return env->sky_orientation; return env->sky_orientation;
} }
Color RasterizerSceneRD::environment_get_bg_color(RID p_env) const { Color RasterizerSceneRD::environment_get_bg_color(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, Color()); ERR_FAIL_COND_V(!env, Color());
return env->bg_color; return env->bg_color;
} }
float RasterizerSceneRD::environment_get_bg_energy(RID p_env) const { float RasterizerSceneRD::environment_get_bg_energy(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, 0); ERR_FAIL_COND_V(!env, 0);
return env->bg_energy; return env->bg_energy;
} }
int RasterizerSceneRD::environment_get_canvas_max_layer(RID p_env) const { int RasterizerSceneRD::environment_get_canvas_max_layer(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, 0); ERR_FAIL_COND_V(!env, 0);
return env->canvas_max_layer; return env->canvas_max_layer;
} }
Color RasterizerSceneRD::environment_get_ambient_light_color(RID p_env) const { Color RasterizerSceneRD::environment_get_ambient_light_color(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, Color()); ERR_FAIL_COND_V(!env, Color());
return env->ambient_light; return env->ambient_light;
} }
RS::EnvironmentAmbientSource RasterizerSceneRD::environment_get_ambient_source(RID p_env) const { RS::EnvironmentAmbientSource RasterizerSceneRD::environment_get_ambient_source(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, RS::ENV_AMBIENT_SOURCE_BG); ERR_FAIL_COND_V(!env, RS::ENV_AMBIENT_SOURCE_BG);
return env->ambient_source; return env->ambient_source;
} }
float RasterizerSceneRD::environment_get_ambient_light_energy(RID p_env) const { float RasterizerSceneRD::environment_get_ambient_light_energy(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, 0); ERR_FAIL_COND_V(!env, 0);
return env->ambient_light_energy; return env->ambient_light_energy;
} }
float RasterizerSceneRD::environment_get_ambient_sky_contribution(RID p_env) const { float RasterizerSceneRD::environment_get_ambient_sky_contribution(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, 0); ERR_FAIL_COND_V(!env, 0);
return env->ambient_sky_contribution; return env->ambient_sky_contribution;
} }
RS::EnvironmentReflectionSource RasterizerSceneRD::environment_get_reflection_source(RID p_env) const { RS::EnvironmentReflectionSource RasterizerSceneRD::environment_get_reflection_source(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, RS::ENV_REFLECTION_SOURCE_DISABLED); ERR_FAIL_COND_V(!env, RS::ENV_REFLECTION_SOURCE_DISABLED);
return env->reflection_source; return env->reflection_source;
} }
Color RasterizerSceneRD::environment_get_ao_color(RID p_env) const { Color RasterizerSceneRD::environment_get_ao_color(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, Color()); ERR_FAIL_COND_V(!env, Color());
return env->ao_color; return env->ao_color;
} }
void RasterizerSceneRD::environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white, bool p_auto_exposure, float p_min_luminance, float p_max_luminance, float p_auto_exp_speed, float p_auto_exp_scale) { void RasterizerSceneRD::environment_set_tonemap(RID p_env, RS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white, bool p_auto_exposure, float p_min_luminance, float p_max_luminance, float p_auto_exp_speed, float p_auto_exp_scale) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->exposure = p_exposure; env->exposure = p_exposure;
env->tone_mapper = p_tone_mapper; env->tone_mapper = p_tone_mapper;
@@ -2846,7 +2846,7 @@ void RasterizerSceneRD::environment_set_tonemap(RID p_env, RS::EnvironmentToneMa
} }
void RasterizerSceneRD::environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap) { void RasterizerSceneRD::environment_set_glow(RID p_env, bool p_enable, int p_level_flags, float p_intensity, float p_strength, float p_mix, float p_bloom_threshold, RS::EnvironmentGlowBlendMode p_blend_mode, float p_hdr_bleed_threshold, float p_hdr_bleed_scale, float p_hdr_luminance_cap) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->glow_enabled = p_enable; env->glow_enabled = p_enable;
env->glow_levels = p_level_flags; env->glow_levels = p_level_flags;
@@ -2865,7 +2865,7 @@ void RasterizerSceneRD::environment_glow_set_use_bicubic_upscale(bool p_enable)
} }
void RasterizerSceneRD::environment_set_sdfgi(RID p_env, bool p_enable, RS::EnvironmentSDFGICascades p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, bool p_use_multibounce, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) { void RasterizerSceneRD::environment_set_sdfgi(RID p_env, bool p_enable, RS::EnvironmentSDFGICascades p_cascades, float p_min_cell_size, RS::EnvironmentSDFGIYScale p_y_scale, bool p_use_occlusion, bool p_use_multibounce, bool p_read_sky, float p_energy, float p_normal_bias, float p_probe_bias) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->sdfgi_enabled = p_enable; env->sdfgi_enabled = p_enable;
@@ -2889,7 +2889,7 @@ void RasterizerSceneRD::environment_set_sdfgi_frames_to_converge(RS::Environment
} }
void RasterizerSceneRD::environment_set_ssr(RID p_env, bool p_enable, int p_max_steps, float p_fade_int, float p_fade_out, float p_depth_tolerance) { void RasterizerSceneRD::environment_set_ssr(RID p_env, bool p_enable, int p_max_steps, float p_fade_int, float p_fade_out, float p_depth_tolerance) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->ssr_enabled = p_enable; env->ssr_enabled = p_enable;
@@ -2908,7 +2908,7 @@ RS::EnvironmentSSRRoughnessQuality RasterizerSceneRD::environment_get_ssr_roughn
} }
void RasterizerSceneRD::environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_bias, float p_light_affect, float p_ao_channel_affect, RS::EnvironmentSSAOBlur p_blur, float p_bilateral_sharpness) { void RasterizerSceneRD::environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_bias, float p_light_affect, float p_ao_channel_affect, RS::EnvironmentSSAOBlur p_blur, float p_bilateral_sharpness) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
env->ssao_enabled = p_enable; env->ssao_enabled = p_enable;
@@ -2926,30 +2926,30 @@ void RasterizerSceneRD::environment_set_ssao_quality(RS::EnvironmentSSAOQuality
} }
bool RasterizerSceneRD::environment_is_ssao_enabled(RID p_env) const { bool RasterizerSceneRD::environment_is_ssao_enabled(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, false); ERR_FAIL_COND_V(!env, false);
return env->ssao_enabled; return env->ssao_enabled;
} }
float RasterizerSceneRD::environment_get_ssao_ao_affect(RID p_env) const { float RasterizerSceneRD::environment_get_ssao_ao_affect(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, false); ERR_FAIL_COND_V(!env, false);
return env->ssao_ao_channel_affect; return env->ssao_ao_channel_affect;
} }
float RasterizerSceneRD::environment_get_ssao_light_affect(RID p_env) const { float RasterizerSceneRD::environment_get_ssao_light_affect(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, false); ERR_FAIL_COND_V(!env, false);
return env->ssao_direct_light_affect; return env->ssao_direct_light_affect;
} }
bool RasterizerSceneRD::environment_is_ssr_enabled(RID p_env) const { bool RasterizerSceneRD::environment_is_ssr_enabled(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, false); ERR_FAIL_COND_V(!env, false);
return env->ssr_enabled; return env->ssr_enabled;
} }
bool RasterizerSceneRD::environment_is_sdfgi_enabled(RID p_env) const { bool RasterizerSceneRD::environment_is_sdfgi_enabled(RID p_env) const {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, false); ERR_FAIL_COND_V(!env, false);
return env->sdfgi_enabled; return env->sdfgi_enabled;
} }
@@ -2959,7 +2959,7 @@ bool RasterizerSceneRD::is_environment(RID p_env) const {
} }
Ref<Image> RasterizerSceneRD::environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) { Ref<Image> RasterizerSceneRD::environment_bake_panorama(RID p_env, bool p_bake_irradiance, const Size2i &p_size) {
Environent *env = environment_owner.getornull(p_env); Environment *env = environment_owner.getornull(p_env);
ERR_FAIL_COND_V(!env, Ref<Image>()); ERR_FAIL_COND_V(!env, Ref<Image>());
if (env->background == RS::ENV_BG_CAMERA_FEED || env->background == RS::ENV_BG_CANVAS || env->background == RS::ENV_BG_KEEP) { if (env->background == RS::ENV_BG_CAMERA_FEED || env->background == RS::ENV_BG_CANVAS || env->background == RS::ENV_BG_KEEP) {
@@ -4903,7 +4903,7 @@ void RasterizerSceneRD::_process_ssr(RID p_render_buffers, RID p_dest_framebuffe
return; return;
} }
Environent *env = environment_owner.getornull(p_environment); Environment *env = environment_owner.getornull(p_environment);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
ERR_FAIL_COND(!env->ssr_enabled); ERR_FAIL_COND(!env->ssr_enabled);
@@ -4948,7 +4948,7 @@ void RasterizerSceneRD::_process_ssao(RID p_render_buffers, RID p_environment, R
RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers); RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers);
ERR_FAIL_COND(!rb); ERR_FAIL_COND(!rb);
Environent *env = environment_owner.getornull(p_environment); Environment *env = environment_owner.getornull(p_environment);
ERR_FAIL_COND(!env); ERR_FAIL_COND(!env);
if (rb->ssao.ao[0].is_valid() && rb->ssao.ao_full.is_valid() != ssao_half_size) { if (rb->ssao.ao[0].is_valid() && rb->ssao.ao_full.is_valid() != ssao_half_size) {
@@ -5015,7 +5015,7 @@ void RasterizerSceneRD::_render_buffers_post_process_and_tonemap(RID p_render_bu
RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers); RenderBuffers *rb = render_buffers_owner.getornull(p_render_buffers);
ERR_FAIL_COND(!rb); ERR_FAIL_COND(!rb);
Environent *env = environment_owner.getornull(p_environment); Environment *env = environment_owner.getornull(p_environment);
//glow (if enabled) //glow (if enabled)
CameraEffects *camfx = camera_effects_owner.getornull(p_camera_effects); CameraEffects *camfx = camera_effects_owner.getornull(p_camera_effects);

4
servers/rendering/rasterizer_rd/rasterizer_scene_rd.h
View File

@@ -623,7 +623,7 @@ private:
/* ENVIRONMENT */ /* ENVIRONMENT */
struct Environent { struct Environment {
// BG // BG
RS::EnvironmentBG background = RS::ENV_BG_CLEAR_COLOR; RS::EnvironmentBG background = RS::ENV_BG_CLEAR_COLOR;
RID sky; RID sky;
@@ -703,7 +703,7 @@ private:
static uint64_t auto_exposure_counter; static uint64_t auto_exposure_counter;
mutable RID_Owner<Environent> environment_owner; mutable RID_Owner<Environment> environment_owner;
/* CAMERA EFFECTS */ /* CAMERA EFFECTS */

2
servers/rendering/rendering_device_binds.h
View File

@@ -620,7 +620,7 @@ protected:
RD_BIND(Variant::INT, RDPipelineColorBlendState, logic_op); RD_BIND(Variant::INT, RDPipelineColorBlendState, logic_op);
RD_BIND(Variant::COLOR, RDPipelineColorBlendState, blend_constant); RD_BIND(Variant::COLOR, RDPipelineColorBlendState, blend_constant);
ClassDB::bind_method(D_METHOD("set_attachments", "atachments"), &RDPipelineColorBlendState::set_attachments); ClassDB::bind_method(D_METHOD("set_attachments", "attachments"), &RDPipelineColorBlendState::set_attachments);
ClassDB::bind_method(D_METHOD("get_attachments"), &RDPipelineColorBlendState::get_attachments); ClassDB::bind_method(D_METHOD("get_attachments"), &RDPipelineColorBlendState::get_attachments);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "attachments", PROPERTY_HINT_ARRAY_TYPE, "RDPipelineColorBlendStateAttachment"), "set_attachments", "get_attachments"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "attachments", PROPERTY_HINT_ARRAY_TYPE, "RDPipelineColorBlendStateAttachment"), "set_attachments", "get_attachments");
} }