diff options
| author | David House <Bonkahe@gmail.com> | 2024-11-02 23:22:16 -0500 |
|---|---|---|
| committer | David House <Bonkahe@gmail.com> | 2024-11-14 15:52:08 -0600 |
| commit | 6e9d31f602c2c31e047db9173e728fe17706185c (patch) | |
| tree | e2e05aed02e260db875b151e75eaf82fbaede87a /drivers | |
| parent | 673f396677654220d7e1d5b6fb5ed3b50126b4e6 (diff) | |
| download | redot-engine-6e9d31f602c2c31e047db9173e728fe17706185c.tar.gz | |
Implemented multimesh_get_buffer_rd_rid function into RenderingServer.
Fixed style error.
Updated dummy mesh_storage to move from cpp to h the return of a blank Rid on _multimesh_get_buffer_rd_rid.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles3/storage/mesh_storage.cpp | 4 | ||||
| -rw-r--r-- | drivers/gles3/storage/mesh_storage.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp index 73d95d75ba..630bfdf1b7 100644 --- a/drivers/gles3/storage/mesh_storage.cpp +++ b/drivers/gles3/storage/mesh_storage.cpp @@ -1974,6 +1974,10 @@ void MeshStorage::_multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_ } } +RID MeshStorage::_multimesh_get_buffer_rd_rid(RID p_multimesh) const { + ERR_FAIL_V_MSG(RID(), "GLES3 does not contain a Rid for the multimesh buffer."); +} + Vector<float> MeshStorage::_multimesh_get_buffer(RID p_multimesh) const { MultiMesh *multimesh = multimesh_owner.get_or_null(p_multimesh); ERR_FAIL_NULL_V(multimesh, Vector<float>()); diff --git a/drivers/gles3/storage/mesh_storage.h b/drivers/gles3/storage/mesh_storage.h index 0bb20bd369..5e3a56366e 100644 --- a/drivers/gles3/storage/mesh_storage.h +++ b/drivers/gles3/storage/mesh_storage.h @@ -517,6 +517,7 @@ public: virtual Color _multimesh_instance_get_color(RID p_multimesh, int p_index) const override; virtual Color _multimesh_instance_get_custom_data(RID p_multimesh, int p_index) const override; virtual void _multimesh_set_buffer(RID p_multimesh, const Vector<float> &p_buffer) override; + virtual RID _multimesh_get_buffer_rd_rid(RID p_multimesh) const override; virtual Vector<float> _multimesh_get_buffer(RID p_multimesh) const override; virtual void _multimesh_set_visible_instances(RID p_multimesh, int p_visible) override; |