diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-17 18:36:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 18:36:06 +0200 |
| commit | 17304f1aaed434b0547606ff22721d65292d8cf1 (patch) | |
| tree | 8b52f567244fe41a2776a49099ee8c7f300bfe40 /servers/rendering/rendering_server_scene.h | |
| parent | cfda0e377004a9399255105132ccb1a906e9f12e (diff) | |
| parent | 0e1c66d9fced8f9d3a8fbd87ddfd2c29a9ed2679 (diff) | |
Merge pull request #37949 from reduz/implement-global-shader-uniforms
Implement global and per instance shader uniforms.
Diffstat (limited to 'servers/rendering/rendering_server_scene.h')
| -rw-r--r-- | servers/rendering/rendering_server_scene.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/servers/rendering/rendering_server_scene.h b/servers/rendering/rendering_server_scene.h index f5f7c50ea0..db2fbd6707 100644 --- a/servers/rendering/rendering_server_scene.h +++ b/servers/rendering/rendering_server_scene.h @@ -435,6 +435,13 @@ public: virtual void instance_geometry_set_draw_range(RID p_instance, float p_min, float p_max, float p_min_margin, float p_max_margin); virtual void instance_geometry_set_as_instance_lod(RID p_instance, RID p_as_lod_of_instance); + void _update_instance_shader_parameters_from_material(Map<StringName, RasterizerScene::InstanceBase::InstanceShaderParameter> &isparams, const Map<StringName, RasterizerScene::InstanceBase::InstanceShaderParameter> &existing_isparams, RID p_material); + + virtual void instance_geometry_set_shader_parameter(RID p_instance, const StringName &p_parameter, const Variant &p_value); + virtual void instance_geometry_get_shader_parameter_list(RID p_instance, List<PropertyInfo> *p_parameters) const; + virtual Variant instance_geometry_get_shader_parameter(RID p_instance, const StringName &p_parameter) const; + virtual Variant instance_geometry_get_shader_parameter_default_value(RID p_instance, const StringName &p_parameter) const; + _FORCE_INLINE_ void _update_instance(Instance *p_instance); _FORCE_INLINE_ void _update_instance_aabb(Instance *p_instance); _FORCE_INLINE_ void _update_dirty_instance(Instance *p_instance); |