godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed time duplicate from ForwardClustered. Just use the variable from its superclass

Browse Source
This commit is contained in:
Bastiaan Olij 2021-03-11 18:08:10 +11:00
parent 73b5eb2673
commit f7cbeb0d1b
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.cpp
View File

@ -2805,11 +2805,6 @@ RID RendererSceneRenderForwardClustered::_render_buffers_get_normal_texture(RID
RendererSceneRenderForwardClustered *RendererSceneRenderForwardClustered::singleton = nullptr;
void RendererSceneRenderForwardClustered::set_time(double p_time, double p_step) {
time = p_time;
RendererSceneRenderRD::set_time(p_time, p_step);
}
void RendererSceneRenderForwardClustered::_geometry_instance_mark_dirty(GeometryInstance *p_geometry_instance) {
GeometryInstanceForwardClustered *ginstance = static_cast<GeometryInstanceForwardClustered *>(p_geometry_instance);
if (ginstance->dirty_list_element.in_list()) {

3
servers/rendering/renderer_rd/renderer_scene_render_forward_clustered.h
View File

@ -490,7 +490,6 @@ class RendererSceneRenderForwardClustered : public RendererSceneRenderRD {
static RendererSceneRenderForwardClustered *singleton;
double time;
RID default_shader;
RID default_material;
RID overdraw_material_shader;
@ -759,8 +758,6 @@ public:
virtual void geometry_instance_pair_decal_instances(GeometryInstance *p_geometry_instance, const RID *p_decal_instances, uint32_t p_decal_instance_count);
virtual void geometry_instance_pair_gi_probe_instances(GeometryInstance *p_geometry_instance, const RID *p_gi_probe_instances, uint32_t p_gi_probe_instance_count);
virtual void set_time(double p_time, double p_step);
virtual bool free(RID p_rid);
RendererSceneRenderForwardClustered(RendererStorageRD *p_storage);

2
servers/rendering/renderer_rd/renderer_scene_render_rd.h
View File

@ -1182,7 +1182,7 @@ public:
return debug_draw;
}
virtual void set_time(double p_time, double p_step);
void set_time(double p_time, double p_step);
RID get_reflection_probe_buffer();
RID get_omni_light_buffer();