Replace Array return types with TypedArray 2
This commit is contained in:
kobewi
parent
d5606503b4
commit
1abdffe7a0
75 changed files with 301 additions and 263 deletions
|
|
@ -263,11 +263,11 @@ NavigationServer2D::~NavigationServer2D() {
|
|||
singleton = nullptr;
|
||||
}
|
||||
|
||||
Array FORWARD_0_C(get_maps);
|
||||
TypedArray<RID> FORWARD_0_C(get_maps);
|
||||
|
||||
Array FORWARD_1_C(map_get_regions, RID, p_map, rid_to_rid);
|
||||
TypedArray<RID> FORWARD_1_C(map_get_regions, RID, p_map, rid_to_rid);
|
||||
|
||||
Array FORWARD_1_C(map_get_agents, RID, p_map, rid_to_rid);
|
||||
TypedArray<RID> FORWARD_1_C(map_get_agents, RID, p_map, rid_to_rid);
|
||||
|
||||
RID FORWARD_1_C(region_get_map, RID, p_region, rid_to_rid);
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public:
|
|||
/// MUST be used in single thread!
|
||||
static NavigationServer2D *get_singleton_mut() { return singleton; }
|
||||
|
||||
virtual Array get_maps() const;
|
||||
virtual TypedArray<RID> get_maps() const;
|
||||
|
||||
/// Create a new map.
|
||||
virtual RID map_create() const;
|
||||
|
|
@ -82,8 +82,8 @@ public:
|
|||
virtual Vector2 map_get_closest_point(RID p_map, const Vector2 &p_point) const;
|
||||
virtual RID map_get_closest_point_owner(RID p_map, const Vector2 &p_point) const;
|
||||
|
||||
virtual Array map_get_regions(RID p_map) const;
|
||||
virtual Array map_get_agents(RID p_map) const;
|
||||
virtual TypedArray<RID> map_get_regions(RID p_map) const;
|
||||
virtual TypedArray<RID> map_get_agents(RID p_map) const;
|
||||
|
||||
virtual void map_force_update(RID p_map);
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public:
|
|||
/// MUST be used in single thread!
|
||||
static NavigationServer3D *get_singleton_mut();
|
||||
|
||||
virtual Array get_maps() const = 0;
|
||||
virtual TypedArray<RID> get_maps() const = 0;
|
||||
|
||||
/// Create a new map.
|
||||
virtual RID map_create() const = 0;
|
||||
|
|
@ -93,8 +93,8 @@ public:
|
|||
virtual Vector3 map_get_closest_point_normal(RID p_map, const Vector3 &p_point) const = 0;
|
||||
virtual RID map_get_closest_point_owner(RID p_map, const Vector3 &p_point) const = 0;
|
||||
|
||||
virtual Array map_get_regions(RID p_map) const = 0;
|
||||
virtual Array map_get_agents(RID p_map) const = 0;
|
||||
virtual TypedArray<RID> map_get_regions(RID p_map) const = 0;
|
||||
virtual TypedArray<RID> map_get_agents(RID p_map) const = 0;
|
||||
|
||||
virtual void map_force_update(RID p_map) = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/string/print_string.h"
|
||||
#include "core/variant/typed_array.h"
|
||||
|
||||
PhysicsServer2D *PhysicsServer2D::singleton = nullptr;
|
||||
|
||||
|
|
@ -347,7 +348,7 @@ Dictionary PhysicsDirectSpaceState2D::_intersect_ray(const Ref<PhysicsRayQueryPa
|
|||
return d;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState2D::_intersect_point(const Ref<PhysicsPointQueryParameters2D> &p_point_query, int p_max_results) {
|
||||
TypedArray<Dictionary> PhysicsDirectSpaceState2D::_intersect_point(const Ref<PhysicsPointQueryParameters2D> &p_point_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(p_point_query.is_null(), Array());
|
||||
|
||||
Vector<ShapeResult> ret;
|
||||
|
|
@ -356,10 +357,10 @@ Array PhysicsDirectSpaceState2D::_intersect_point(const Ref<PhysicsPointQueryPar
|
|||
int rc = intersect_point(p_point_query->get_parameters(), ret.ptrw(), ret.size());
|
||||
|
||||
if (rc == 0) {
|
||||
return Array();
|
||||
return TypedArray<Dictionary>();
|
||||
}
|
||||
|
||||
Array r;
|
||||
TypedArray<Dictionary> r;
|
||||
r.resize(rc);
|
||||
for (int i = 0; i < rc; i++) {
|
||||
Dictionary d;
|
||||
|
|
@ -372,13 +373,13 @@ Array PhysicsDirectSpaceState2D::_intersect_point(const Ref<PhysicsPointQueryPar
|
|||
return r;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState2D::_intersect_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array());
|
||||
TypedArray<Dictionary> PhysicsDirectSpaceState2D::_intersect_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), TypedArray<Dictionary>());
|
||||
|
||||
Vector<ShapeResult> sr;
|
||||
sr.resize(p_max_results);
|
||||
int rc = intersect_shape(p_shape_query->get_parameters(), sr.ptrw(), sr.size());
|
||||
Array ret;
|
||||
TypedArray<Dictionary> ret;
|
||||
ret.resize(rc);
|
||||
for (int i = 0; i < rc; i++) {
|
||||
Dictionary d;
|
||||
|
|
@ -392,22 +393,22 @@ Array PhysicsDirectSpaceState2D::_intersect_shape(const Ref<PhysicsShapeQueryPar
|
|||
return ret;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState2D::_cast_motion(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array());
|
||||
Vector<real_t> PhysicsDirectSpaceState2D::_cast_motion(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Vector<real_t>());
|
||||
|
||||
real_t closest_safe, closest_unsafe;
|
||||
bool res = cast_motion(p_shape_query->get_parameters(), closest_safe, closest_unsafe);
|
||||
if (!res) {
|
||||
return Array();
|
||||
return Vector<real_t>();
|
||||
}
|
||||
Array ret;
|
||||
Vector<real_t> ret;
|
||||
ret.resize(2);
|
||||
ret[0] = closest_safe;
|
||||
ret[1] = closest_unsafe;
|
||||
ret.write[0] = closest_safe;
|
||||
ret.write[1] = closest_unsafe;
|
||||
return ret;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState2D::_collide_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results) {
|
||||
TypedArray<PackedVector2Array> PhysicsDirectSpaceState2D::_collide_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array());
|
||||
|
||||
Vector<Vector2> ret;
|
||||
|
|
@ -415,9 +416,9 @@ Array PhysicsDirectSpaceState2D::_collide_shape(const Ref<PhysicsShapeQueryParam
|
|||
int rc = 0;
|
||||
bool res = collide_shape(p_shape_query->get_parameters(), ret.ptrw(), p_max_results, rc);
|
||||
if (!res) {
|
||||
return Array();
|
||||
return TypedArray<PackedVector2Array>();
|
||||
}
|
||||
Array r;
|
||||
TypedArray<PackedVector2Array> r;
|
||||
r.resize(rc * 2);
|
||||
for (int i = 0; i < rc * 2; i++) {
|
||||
r[i] = ret[i];
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
#include "core/object/ref_counted.h"
|
||||
|
||||
class PhysicsDirectSpaceState2D;
|
||||
template <typename T>
|
||||
class TypedArray;
|
||||
|
||||
class PhysicsDirectBodyState2D : public Object {
|
||||
GDCLASS(PhysicsDirectBodyState2D, Object);
|
||||
|
|
@ -114,10 +116,10 @@ class PhysicsDirectSpaceState2D : public Object {
|
|||
GDCLASS(PhysicsDirectSpaceState2D, Object);
|
||||
|
||||
Dictionary _intersect_ray(const Ref<PhysicsRayQueryParameters2D> &p_ray_query);
|
||||
Array _intersect_point(const Ref<PhysicsPointQueryParameters2D> &p_point_query, int p_max_results = 32);
|
||||
Array _intersect_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results = 32);
|
||||
Array _cast_motion(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query);
|
||||
Array _collide_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results = 32);
|
||||
TypedArray<Dictionary> _intersect_point(const Ref<PhysicsPointQueryParameters2D> &p_point_query, int p_max_results = 32);
|
||||
TypedArray<Dictionary> _intersect_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results = 32);
|
||||
Vector<real_t> _cast_motion(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query);
|
||||
TypedArray<PackedVector2Array> _collide_shape(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query, int p_max_results = 32);
|
||||
Dictionary _get_rest_info(const Ref<PhysicsShapeQueryParameters2D> &p_shape_query);
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/string/print_string.h"
|
||||
#include "core/variant/typed_array.h"
|
||||
|
||||
void PhysicsServer3DRenderingServerHandler::set_vertex(int p_vertex_id, const void *p_vector3) {
|
||||
GDVIRTUAL_REQUIRED_CALL(_set_vertex, p_vertex_id, p_vector3);
|
||||
|
|
@ -366,8 +367,8 @@ Dictionary PhysicsDirectSpaceState3D::_intersect_ray(const Ref<PhysicsRayQueryPa
|
|||
return d;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState3D::_intersect_point(const Ref<PhysicsPointQueryParameters3D> &p_point_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(p_point_query.is_null(), Array());
|
||||
TypedArray<Dictionary> PhysicsDirectSpaceState3D::_intersect_point(const Ref<PhysicsPointQueryParameters3D> &p_point_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(p_point_query.is_null(), TypedArray<Dictionary>());
|
||||
|
||||
Vector<ShapeResult> ret;
|
||||
ret.resize(p_max_results);
|
||||
|
|
@ -375,10 +376,10 @@ Array PhysicsDirectSpaceState3D::_intersect_point(const Ref<PhysicsPointQueryPar
|
|||
int rc = intersect_point(p_point_query->get_parameters(), ret.ptrw(), ret.size());
|
||||
|
||||
if (rc == 0) {
|
||||
return Array();
|
||||
return TypedArray<Dictionary>();
|
||||
}
|
||||
|
||||
Array r;
|
||||
TypedArray<Dictionary> r;
|
||||
r.resize(rc);
|
||||
for (int i = 0; i < rc; i++) {
|
||||
Dictionary d;
|
||||
|
|
@ -391,13 +392,13 @@ Array PhysicsDirectSpaceState3D::_intersect_point(const Ref<PhysicsPointQueryPar
|
|||
return r;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState3D::_intersect_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array());
|
||||
TypedArray<Dictionary> PhysicsDirectSpaceState3D::_intersect_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), TypedArray<Dictionary>());
|
||||
|
||||
Vector<ShapeResult> sr;
|
||||
sr.resize(p_max_results);
|
||||
int rc = intersect_shape(p_shape_query->get_parameters(), sr.ptrw(), sr.size());
|
||||
Array ret;
|
||||
TypedArray<Dictionary> ret;
|
||||
ret.resize(rc);
|
||||
for (int i = 0; i < rc; i++) {
|
||||
Dictionary d;
|
||||
|
|
@ -411,22 +412,22 @@ Array PhysicsDirectSpaceState3D::_intersect_shape(const Ref<PhysicsShapeQueryPar
|
|||
return ret;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState3D::_cast_motion(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array());
|
||||
Vector<real_t> PhysicsDirectSpaceState3D::_cast_motion(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Vector<real_t>());
|
||||
|
||||
real_t closest_safe = 1.0f, closest_unsafe = 1.0f;
|
||||
bool res = cast_motion(p_shape_query->get_parameters(), closest_safe, closest_unsafe);
|
||||
if (!res) {
|
||||
return Array();
|
||||
return Vector<real_t>();
|
||||
}
|
||||
Array ret;
|
||||
Vector<real_t> ret;
|
||||
ret.resize(2);
|
||||
ret[0] = closest_safe;
|
||||
ret[1] = closest_unsafe;
|
||||
ret.write[0] = closest_safe;
|
||||
ret.write[1] = closest_unsafe;
|
||||
return ret;
|
||||
}
|
||||
|
||||
Array PhysicsDirectSpaceState3D::_collide_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results) {
|
||||
TypedArray<PackedVector2Array> PhysicsDirectSpaceState3D::_collide_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results) {
|
||||
ERR_FAIL_COND_V(!p_shape_query.is_valid(), Array());
|
||||
|
||||
Vector<Vector3> ret;
|
||||
|
|
@ -434,9 +435,9 @@ Array PhysicsDirectSpaceState3D::_collide_shape(const Ref<PhysicsShapeQueryParam
|
|||
int rc = 0;
|
||||
bool res = collide_shape(p_shape_query->get_parameters(), ret.ptrw(), p_max_results, rc);
|
||||
if (!res) {
|
||||
return Array();
|
||||
return TypedArray<PackedVector2Array>();
|
||||
}
|
||||
Array r;
|
||||
TypedArray<PackedVector2Array> r;
|
||||
r.resize(rc * 2);
|
||||
for (int i = 0; i < rc * 2; i++) {
|
||||
r[i] = ret[i];
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@
|
|||
#include "core/variant/native_ptr.h"
|
||||
|
||||
class PhysicsDirectSpaceState3D;
|
||||
template <typename T>
|
||||
class TypedArray;
|
||||
|
||||
class PhysicsDirectBodyState3D : public Object {
|
||||
GDCLASS(PhysicsDirectBodyState3D, Object);
|
||||
|
|
@ -120,10 +122,10 @@ class PhysicsDirectSpaceState3D : public Object {
|
|||
|
||||
private:
|
||||
Dictionary _intersect_ray(const Ref<PhysicsRayQueryParameters3D> &p_ray_query);
|
||||
Array _intersect_point(const Ref<PhysicsPointQueryParameters3D> &p_point_query, int p_max_results = 32);
|
||||
Array _intersect_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results = 32);
|
||||
Array _cast_motion(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query);
|
||||
Array _collide_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results = 32);
|
||||
TypedArray<Dictionary> _intersect_point(const Ref<PhysicsPointQueryParameters3D> &p_point_query, int p_max_results = 32);
|
||||
TypedArray<Dictionary> _intersect_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results = 32);
|
||||
Vector<real_t> _cast_motion(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query);
|
||||
TypedArray<PackedVector2Array> _collide_shape(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query, int p_max_results = 32);
|
||||
Dictionary _get_rest_info(const Ref<PhysicsShapeQueryParameters3D> &p_shape_query);
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -443,8 +443,8 @@ public:
|
|||
|
||||
void add_id(const RID &p_id) { base.append_id(p_id); }
|
||||
void clear_ids() { base.clear_ids(); }
|
||||
Array get_ids() const {
|
||||
Array ids;
|
||||
TypedArray<RID> get_ids() const {
|
||||
TypedArray<RID> ids;
|
||||
for (uint32_t i = 0; i < base.get_id_count(); i++) {
|
||||
ids.push_back(base.get_id(i));
|
||||
}
|
||||
|
|
@ -452,7 +452,7 @@ public:
|
|||
}
|
||||
|
||||
protected:
|
||||
void _set_ids(const Array &p_ids) {
|
||||
void _set_ids(const TypedArray<RID> &p_ids) {
|
||||
base.clear_ids();
|
||||
for (int i = 0; i < p_ids.size(); i++) {
|
||||
RID id = p_ids[i];
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "rendering_server.h"
|
||||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/variant/typed_array.h"
|
||||
#include "servers/rendering/rendering_server_globals.h"
|
||||
#include "servers/rendering/shader_language.h"
|
||||
|
||||
|
|
@ -1337,7 +1338,7 @@ Dictionary RenderingServer::mesh_surface_get_lods(RID p_mesh, int p_surface) con
|
|||
return ret;
|
||||
}
|
||||
|
||||
Array RenderingServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surface) const {
|
||||
TypedArray<Array> RenderingServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surface) const {
|
||||
SurfaceData sd = mesh_get_surface(p_mesh, p_surface);
|
||||
ERR_FAIL_COND_V(sd.vertex_count == 0, Array());
|
||||
|
||||
|
|
@ -1359,7 +1360,7 @@ Array RenderingServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_sur
|
|||
|
||||
ERR_FAIL_COND_V(blend_shape_count != (uint32_t)mesh_get_blend_shape_count(p_mesh), Array());
|
||||
|
||||
Array blend_shape_array;
|
||||
TypedArray<Array> blend_shape_array;
|
||||
blend_shape_array.resize(mesh_get_blend_shape_count(p_mesh));
|
||||
for (uint32_t i = 0; i < blend_shape_count; i++) {
|
||||
Vector<uint8_t> bs_data = blend_shape_data.slice(i * divisor, (i + 1) * divisor);
|
||||
|
|
@ -1369,7 +1370,7 @@ Array RenderingServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_sur
|
|||
|
||||
return blend_shape_array;
|
||||
} else {
|
||||
return Array();
|
||||
return TypedArray<Array>();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,9 @@
|
|||
#include "servers/display_server.h"
|
||||
#include "servers/rendering/rendering_device.h"
|
||||
|
||||
template <typename T>
|
||||
class TypedArray;
|
||||
|
||||
class RenderingServer : public Object {
|
||||
GDCLASS(RenderingServer, Object);
|
||||
|
||||
|
|
@ -325,7 +328,7 @@ public:
|
|||
virtual Error mesh_create_surface_data_from_arrays(SurfaceData *r_surface_data, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), uint32_t p_compress_format = 0);
|
||||
Array mesh_create_arrays_from_surface_data(const SurfaceData &p_data) const;
|
||||
Array mesh_surface_get_arrays(RID p_mesh, int p_surface) const;
|
||||
Array mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surface) const;
|
||||
TypedArray<Array> mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surface) const;
|
||||
Dictionary mesh_surface_get_lods(RID p_mesh, int p_surface) const;
|
||||
|
||||
virtual void mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), const Dictionary &p_lods = Dictionary(), uint32_t p_compress_format = 0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue