summaryrefslogtreecommitdiff
path: root/scene/resources/multimesh.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-05-06 09:57:48 +0200
committerGitHub <noreply@github.com>2019-05-06 09:57:48 +0200
commit9123db748ed80f6ea2a6decf3f5f0bf52cb74a16 (patch)
tree0b85b97114c167d9f7a3ab4941c9d1a1a6cd84cc /scene/resources/multimesh.h
parent255ea11502dd91a91d98e6d1bd054ceaf3aee619 (diff)
parentb652fcd241ea4ad8e0bb57cd0f371dd91fdee455 (diff)
Merge pull request #28330 from BastiaanOlij/improve_multimesh
Added set_as_bulk_array, fixed transform2D saving and documentation
Diffstat (limited to 'scene/resources/multimesh.h')
-rw-r--r--scene/resources/multimesh.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h
index 24b4beaa89..6b17e9278d 100644
--- a/scene/resources/multimesh.h
+++ b/scene/resources/multimesh.h
@@ -72,6 +72,9 @@ protected:
void _set_transform_array(const PoolVector<Vector3> &p_array);
PoolVector<Vector3> _get_transform_array() const;
+ void _set_transform_2d_array(const PoolVector<Vector2> &p_array);
+ PoolVector<Vector2> _get_transform_2d_array() const;
+
void _set_color_array(const PoolVector<Color> &p_array);
PoolVector<Color> _get_color_array() const;
@@ -108,6 +111,8 @@ public:
void set_instance_custom_data(int p_instance, const Color &p_custom_data);
Color get_instance_custom_data(int p_instance) const;
+ void set_as_bulk_array(const PoolVector<float> &p_array);
+
virtual AABB get_aabb() const;
virtual RID get_rid() const;