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/3d/cpu_particles.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'scene/3d/cpu_particles.h') diff --git a/scene/3d/cpu_particles.h b/scene/3d/cpu_particles.h index d5a549b976..1a5537e4f2 100644 --- a/scene/3d/cpu_particles.h +++ b/scene/3d/cpu_particles.h @@ -106,9 +106,9 @@ private: RID multimesh; - PoolVector particles; - PoolVector particle_data; - PoolVector particle_order; + Vector particles; + Vector particle_data; + Vector particle_order; struct SortLifetime { const Particle *particles; @@ -167,9 +167,9 @@ private: EmissionShape emission_shape; float emission_sphere_radius; Vector3 emission_box_extents; - PoolVector emission_points; - PoolVector emission_normals; - PoolVector emission_colors; + Vector emission_points; + Vector emission_normals; + Vector emission_colors; int emission_point_count; Vector3 gravity; @@ -191,7 +191,7 @@ protected: public: AABB get_aabb() const; - PoolVector get_faces(uint32_t p_usage_flags) const; + Vector get_faces(uint32_t p_usage_flags) const; void set_emitting(bool p_emitting); void set_amount(int p_amount); @@ -264,17 +264,17 @@ public: void set_emission_shape(EmissionShape p_shape); void set_emission_sphere_radius(float p_radius); void set_emission_box_extents(Vector3 p_extents); - void set_emission_points(const PoolVector &p_points); - void set_emission_normals(const PoolVector &p_normals); - void set_emission_colors(const PoolVector &p_colors); + void set_emission_points(const Vector &p_points); + void set_emission_normals(const Vector &p_normals); + void set_emission_colors(const Vector &p_colors); void set_emission_point_count(int p_count); EmissionShape get_emission_shape() const; float get_emission_sphere_radius() const; Vector3 get_emission_box_extents() const; - PoolVector get_emission_points() const; - PoolVector get_emission_normals() const; - PoolVector get_emission_colors() const; + Vector get_emission_points() const; + Vector get_emission_normals() const; + Vector get_emission_colors() const; int get_emission_point_count() const; void set_gravity(const Vector3 &p_gravity); -- cgit v1.2.3