From 3205a92ad872f918c8322cdcd1434c231a1fd251 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 17 Feb 2020 18:06:54 -0300 Subject: PoolVector is gone, replaced by Vector Typed `PoolTypeArray` types are now renamed `PackedTypeArray` and are sugar for `Vector`. --- scene/resources/multimesh.cpp | 70 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'scene/resources/multimesh.cpp') diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index 9c34ae0504..85eab335de 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -35,17 +35,17 @@ #ifndef DISABLE_DEPRECATED // Kept for compatibility from 3.x to 4.0. -void MultiMesh::_set_transform_array(const PoolVector &p_array) { +void MultiMesh::_set_transform_array(const Vector &p_array) { if (transform_format != TRANSFORM_3D) return; - const PoolVector &xforms = p_array; + const Vector &xforms = p_array; int len = xforms.size(); ERR_FAIL_COND((len / 4) != instance_count); if (len == 0) return; - PoolVector::Read r = xforms.read(); + const Vector3 *r = xforms.ptr(); for (int i = 0; i < len / 4; i++) { @@ -59,18 +59,18 @@ void MultiMesh::_set_transform_array(const PoolVector &p_array) { } } -PoolVector MultiMesh::_get_transform_array() const { +Vector MultiMesh::_get_transform_array() const { if (transform_format != TRANSFORM_3D) - return PoolVector(); + return Vector(); if (instance_count == 0) - return PoolVector(); + return Vector(); - PoolVector xforms; + Vector xforms; xforms.resize(instance_count * 4); - PoolVector::Write w = xforms.write(); + Vector3 *w = xforms.ptrw(); for (int i = 0; i < instance_count; i++) { @@ -84,18 +84,18 @@ PoolVector MultiMesh::_get_transform_array() const { return xforms; } -void MultiMesh::_set_transform_2d_array(const PoolVector &p_array) { +void MultiMesh::_set_transform_2d_array(const Vector &p_array) { if (transform_format != TRANSFORM_2D) return; - const PoolVector &xforms = p_array; + const Vector &xforms = p_array; int len = xforms.size(); ERR_FAIL_COND((len / 3) != instance_count); if (len == 0) return; - PoolVector::Read r = xforms.read(); + const Vector2 *r = xforms.ptr(); for (int i = 0; i < len / 3; i++) { @@ -108,18 +108,18 @@ void MultiMesh::_set_transform_2d_array(const PoolVector &p_array) { } } -PoolVector MultiMesh::_get_transform_2d_array() const { +Vector MultiMesh::_get_transform_2d_array() const { if (transform_format != TRANSFORM_2D) - return PoolVector(); + return Vector(); if (instance_count == 0) - return PoolVector(); + return Vector(); - PoolVector xforms; + Vector xforms; xforms.resize(instance_count * 3); - PoolVector::Write w = xforms.write(); + Vector2 *w = xforms.ptrw(); for (int i = 0; i < instance_count; i++) { @@ -132,15 +132,15 @@ PoolVector MultiMesh::_get_transform_2d_array() const { return xforms; } -void MultiMesh::_set_color_array(const PoolVector &p_array) { +void MultiMesh::_set_color_array(const Vector &p_array) { - const PoolVector &colors = p_array; + const Vector &colors = p_array; int len = colors.size(); if (len == 0) return; ERR_FAIL_COND(len != instance_count); - PoolVector::Read r = colors.read(); + const Color *r = colors.ptr(); for (int i = 0; i < len; i++) { @@ -148,12 +148,12 @@ void MultiMesh::_set_color_array(const PoolVector &p_array) { } } -PoolVector MultiMesh::_get_color_array() const { +Vector MultiMesh::_get_color_array() const { if (instance_count == 0 || !use_colors) - return PoolVector(); + return Vector(); - PoolVector colors; + Vector colors; colors.resize(instance_count); for (int i = 0; i < instance_count; i++) { @@ -164,15 +164,15 @@ PoolVector MultiMesh::_get_color_array() const { return colors; } -void MultiMesh::_set_custom_data_array(const PoolVector &p_array) { +void MultiMesh::_set_custom_data_array(const Vector &p_array) { - const PoolVector &custom_datas = p_array; + const Vector &custom_datas = p_array; int len = custom_datas.size(); if (len == 0) return; ERR_FAIL_COND(len != instance_count); - PoolVector::Read r = custom_datas.read(); + const Color *r = custom_datas.ptr(); for (int i = 0; i < len; i++) { @@ -180,12 +180,12 @@ void MultiMesh::_set_custom_data_array(const PoolVector &p_array) { } } -PoolVector MultiMesh::_get_custom_data_array() const { +Vector MultiMesh::_get_custom_data_array() const { if (instance_count == 0 || !use_custom_data) - return PoolVector(); + return Vector(); - PoolVector custom_datas; + Vector custom_datas; custom_datas.resize(instance_count); for (int i = 0; i < instance_count; i++) { @@ -197,11 +197,11 @@ PoolVector MultiMesh::_get_custom_data_array() const { } #endif // DISABLE_DEPRECATED -void MultiMesh::set_buffer(const PoolVector &p_buffer) { +void MultiMesh::set_buffer(const Vector &p_buffer) { VS::get_singleton()->multimesh_set_buffer(multimesh, p_buffer); } -PoolVector MultiMesh::get_buffer() const { +Vector MultiMesh::get_buffer() const { return VS::get_singleton()->multimesh_get_buffer(multimesh); } @@ -350,7 +350,7 @@ void MultiMesh::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "instance_count", PROPERTY_HINT_RANGE, "0,16384,1,or_greater"), "set_instance_count", "get_instance_count"); ADD_PROPERTY(PropertyInfo(Variant::INT, "visible_instance_count", PROPERTY_HINT_RANGE, "-1,16384,1,or_greater"), "set_visible_instance_count", "get_visible_instance_count"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh"); - ADD_PROPERTY(PropertyInfo(Variant::POOL_REAL_ARRAY, "buffer", PROPERTY_HINT_NONE), "set_buffer", "get_buffer"); + ADD_PROPERTY(PropertyInfo(Variant::PACKED_REAL_ARRAY, "buffer", PROPERTY_HINT_NONE), "set_buffer", "get_buffer"); #ifndef DISABLE_DEPRECATED // Kept for compatibility from 3.x to 4.0. @@ -363,10 +363,10 @@ void MultiMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("_set_custom_data_array"), &MultiMesh::_set_custom_data_array); ClassDB::bind_method(D_METHOD("_get_custom_data_array"), &MultiMesh::_get_custom_data_array); - ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR3_ARRAY, "transform_array", PROPERTY_HINT_NONE, "", 0), "_set_transform_array", "_get_transform_array"); - ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "transform_2d_array", PROPERTY_HINT_NONE, "", 0), "_set_transform_2d_array", "_get_transform_2d_array"); - ADD_PROPERTY(PropertyInfo(Variant::POOL_COLOR_ARRAY, "color_array", PROPERTY_HINT_NONE, "", 0), "_set_color_array", "_get_color_array"); - ADD_PROPERTY(PropertyInfo(Variant::POOL_COLOR_ARRAY, "custom_data_array", PROPERTY_HINT_NONE, "", 0), "_set_custom_data_array", "_get_custom_data_array"); + ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR3_ARRAY, "transform_array", PROPERTY_HINT_NONE, "", 0), "_set_transform_array", "_get_transform_array"); + ADD_PROPERTY(PropertyInfo(Variant::PACKED_VECTOR2_ARRAY, "transform_2d_array", PROPERTY_HINT_NONE, "", 0), "_set_transform_2d_array", "_get_transform_2d_array"); + ADD_PROPERTY(PropertyInfo(Variant::PACKED_COLOR_ARRAY, "color_array", PROPERTY_HINT_NONE, "", 0), "_set_color_array", "_get_color_array"); + ADD_PROPERTY(PropertyInfo(Variant::PACKED_COLOR_ARRAY, "custom_data_array", PROPERTY_HINT_NONE, "", 0), "_set_custom_data_array", "_get_custom_data_array"); #endif BIND_ENUM_CONSTANT(TRANSFORM_2D); -- cgit v1.2.3