Relintai/mesh_data_resource
1
0
Fork 0
mirror of https://github.com/Relintai/mesh_data_resource.git synced 2025-02-20 17:14:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile for 4.0.

Browse Source
This commit is contained in:
Relintai 2020-10-06 23:17:15 +02:00
parent 6c99ddcaa6
commit b852ab0e52
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mesh_data_resource.cpp
View File

@ -24,6 +24,10 @@ SOFTWARE.
#include "core/version.h" #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"; 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() { Array MeshDataResource::get_array() {
@ -94,17 +98,20 @@ void MeshDataResource::set_collision_shapes(const Vector<Variant> &p_arrays) {
} }
void MeshDataResource::recompute_aabb() { void MeshDataResource::recompute_aabb() {
Variant arr = _arrays[Mesh::ARRAY_VERTEX]; Variant arr = _arrays[Mesh::ARRAY_VERTEX];
PoolVector<Vector3> vertices = arr; PoolVector<Vector3> vertices = arr;
int len = vertices.size(); int len = vertices.size();
ERR_FAIL_COND(len == 0); ERR_FAIL_COND(len == 0);
#if VERSION_MAJOR < 4
PoolVector<Vector3>::Read r = vertices.read(); PoolVector<Vector3>::Read r = vertices.read();
const Vector3 *vtx = r.ptr(); const Vector3 *vtx = r.ptr();
#else
const Vector3 *vtx = vertices.ptr();
#endif
AABB aabb; AABB aabb;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (i == 0) if (i == 0)
aabb.position = vtx[i]; aabb.position = vtx[i];
else else