From b852ab0e525addbd11ebcdd7d16b7536171837be Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 6 Oct 2020 23:17:15 +0200 Subject: [PATCH] Fix compile for 4.0. --- mesh_data_resource.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mesh_data_resource.cpp b/mesh_data_resource.cpp index f6041d7..c20eb8e 100644 --- a/mesh_data_resource.cpp +++ b/mesh_data_resource.cpp @@ -24,6 +24,10 @@ SOFTWARE. #include "core/version.h" +#if VERSION_MAJOR >= 4 +#define PoolVector Vector +#endif + const String MeshDataResource::BINDING_STRING_COLLIDER_TYPE = "None,Trimesh Collision Shape,Single Convex Collision Shape,Multiple Convex Collision Shapes,Approximated Box,Approximated Capsule,Approximated Cylinder,Approximated Sphere"; Array MeshDataResource::get_array() { @@ -94,17 +98,20 @@ void MeshDataResource::set_collision_shapes(const Vector &p_arrays) { } void MeshDataResource::recompute_aabb() { - Variant arr = _arrays[Mesh::ARRAY_VERTEX]; PoolVector vertices = arr; int len = vertices.size(); ERR_FAIL_COND(len == 0); + +#if VERSION_MAJOR < 4 PoolVector::Read r = vertices.read(); const Vector3 *vtx = r.ptr(); +#else + const Vector3 *vtx = vertices.ptr(); +#endif AABB aabb; for (int i = 0; i < len; i++) { - if (i == 0) aabb.position = vtx[i]; else