Type renames:

	Matrix32 -> Transform2D
	Matrix3 -> Basis
	AABB -> Rect3
	RawArray -> PoolByteArray
	IntArray -> PoolIntArray
	FloatArray -> PoolFloatArray
	Vector2Array -> PoolVector2Array
	Vector3Array -> PoolVector3Array
	ColorArray -> PoolColorArray

1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h
index 32581e860d..66593b202f 100644
--- a/drivers/gles3/rasterizer_storage_gles3.h
+++ b/drivers/gles3/rasterizer_storage_gles3.h
@@ -526,7 +526,7 @@ public:
 		GLuint vertex_id;
 		GLuint index_id;
 
-		Vector<AABB> skeleton_bone_aabb;
+		Vector<Rect3> skeleton_bone_aabb;
 		Vector<bool> skeleton_bone_used;
 
 		//bool packed;
@@ -538,7 +538,7 @@ public:
 
 		Vector<MorphTarget> morph_targets;
 
-		AABB aabb;
+		Rect3 aabb;
 
 		int array_len;
 		int index_array_len;
@@ -585,7 +585,7 @@ public:
 		Vector<Surface*> surfaces;
 		int morph_target_count;
 		VS::MorphTargetMode morph_target_mode;
-		AABB custom_aabb;
+		Rect3 custom_aabb;
 		mutable uint64_t last_pass;
 		Mesh() {
 			morph_target_mode=VS::MORPH_MODE_NORMALIZED;
@@ -599,7 +599,7 @@ public:
 
 	virtual RID mesh_create();
 
-	virtual void mesh_add_surface(RID p_mesh,uint32_t p_format,VS::PrimitiveType p_primitive,const PoolVector<uint8_t>& p_array,int p_vertex_count,const PoolVector<uint8_t>& p_index_array,int p_index_count,const AABB& p_aabb,const Vector<PoolVector<uint8_t> >& p_blend_shapes=Vector<PoolVector<uint8_t> >(),const Vector<AABB>& p_bone_aabbs=Vector<AABB>());
+	virtual void mesh_add_surface(RID p_mesh,uint32_t p_format,VS::PrimitiveType p_primitive,const PoolVector<uint8_t>& p_array,int p_vertex_count,const PoolVector<uint8_t>& p_index_array,int p_index_count,const Rect3& p_aabb,const Vector<PoolVector<uint8_t> >& p_blend_shapes=Vector<PoolVector<uint8_t> >(),const Vector<Rect3>& p_bone_aabbs=Vector<Rect3>());
 
 	virtual void mesh_set_morph_target_count(RID p_mesh,int p_amount);
 	virtual int mesh_get_morph_target_count(RID p_mesh) const;
@@ -621,17 +621,17 @@ public:
 	virtual uint32_t mesh_surface_get_format(RID p_mesh, int p_surface) const;
 	virtual VS::PrimitiveType mesh_surface_get_primitive_type(RID p_mesh, int p_surface) const;
 
-	virtual AABB mesh_surface_get_aabb(RID p_mesh, int p_surface) const;
+	virtual Rect3 mesh_surface_get_aabb(RID p_mesh, int p_surface) const;
 	virtual Vector<PoolVector<uint8_t> > mesh_surface_get_blend_shapes(RID p_mesh, int p_surface) const;
-	virtual Vector<AABB> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const;
+	virtual Vector<Rect3> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const;
 
 	virtual void mesh_remove_surface(RID p_mesh, int p_surface);
 	virtual int mesh_get_surface_count(RID p_mesh) const;
 
-	virtual void mesh_set_custom_aabb(RID p_mesh,const AABB& p_aabb);
-	virtual AABB mesh_get_custom_aabb(RID p_mesh) const;
+	virtual void mesh_set_custom_aabb(RID p_mesh,const Rect3& p_aabb);
+	virtual Rect3 mesh_get_custom_aabb(RID p_mesh) const;
 
-	virtual AABB mesh_get_aabb(RID p_mesh, RID p_skeleton) const;
+	virtual Rect3 mesh_get_aabb(RID p_mesh, RID p_skeleton) const;
 	virtual void mesh_clear(RID p_mesh);
 
 	void mesh_render_blend_shapes(Surface *s, float *p_weights);
@@ -644,7 +644,7 @@ public:
 		VS::MultimeshTransformFormat transform_format;
 		VS::MultimeshColorFormat color_format;
 		Vector<float> data;
-		AABB aabb;
+		Rect3 aabb;
 		SelfList<MultiMesh> update_list;
 		GLuint buffer;
 		int visible_instances;
@@ -681,19 +681,19 @@ public:
 
 	virtual void multimesh_set_mesh(RID p_multimesh,RID p_mesh);
 	virtual void multimesh_instance_set_transform(RID p_multimesh,int p_index,const Transform& p_transform);
-	virtual void multimesh_instance_set_transform_2d(RID p_multimesh,int p_index,const Matrix32& p_transform);
+	virtual void multimesh_instance_set_transform_2d(RID p_multimesh,int p_index,const Transform2D& p_transform);
 	virtual void multimesh_instance_set_color(RID p_multimesh,int p_index,const Color& p_color);
 
 	virtual RID multimesh_get_mesh(RID p_multimesh) const;
 
 	virtual Transform multimesh_instance_get_transform(RID p_multimesh,int p_index) const;
-	virtual Matrix32 multimesh_instance_get_transform_2d(RID p_multimesh,int p_index) const;
+	virtual Transform2D multimesh_instance_get_transform_2d(RID p_multimesh,int p_index) const;
 	virtual Color multimesh_instance_get_color(RID p_multimesh,int p_index) const;
 
 	virtual void multimesh_set_visible_instances(RID p_multimesh,int p_visible);
 	virtual int multimesh_get_visible_instances(RID p_multimesh) const;
 
-	virtual AABB multimesh_get_aabb(RID p_multimesh) const;
+	virtual Rect3 multimesh_get_aabb(RID p_multimesh) const;
 
 	/* IMMEDIATE API */
 
@@ -714,7 +714,7 @@ public:
 		List<Chunk> chunks;
 		bool building;
 		int mask;
-		AABB aabb;
+		Rect3 aabb;
 
 		Immediate() { type=GEOMETRY_IMMEDIATE; building=false;}
 
@@ -741,7 +741,7 @@ public:
 	virtual void immediate_clear(RID p_immediate);
 	virtual void immediate_set_material(RID p_immediate,RID p_material);
 	virtual RID immediate_get_material(RID p_immediate) const;
-	virtual AABB immediate_get_aabb(RID p_immediate) const;
+	virtual Rect3 immediate_get_aabb(RID p_immediate) const;
 
 	/* SKELETON API */
 
@@ -771,8 +771,8 @@ public:
 	virtual int skeleton_get_bone_count(RID p_skeleton) const;
 	virtual void skeleton_bone_set_transform(RID p_skeleton,int p_bone, const Transform& p_transform);
 	virtual Transform skeleton_bone_get_transform(RID p_skeleton,int p_bone) const;
-	virtual void skeleton_bone_set_transform_2d(RID p_skeleton,int p_bone, const Matrix32& p_transform);
-	virtual Matrix32 skeleton_bone_get_transform_2d(RID p_skeleton,int p_bone) const;
+	virtual void skeleton_bone_set_transform_2d(RID p_skeleton,int p_bone, const Transform2D& p_transform);
+	virtual Transform2D skeleton_bone_get_transform_2d(RID p_skeleton,int p_bone) const;
 
 	/* Light API */
 
@@ -823,7 +823,7 @@ public:
 	virtual float light_get_param(RID p_light,VS::LightParam p_param);
 	virtual Color light_get_color(RID p_light);
 
-	virtual AABB light_get_aabb(RID p_light) const;
+	virtual Rect3 light_get_aabb(RID p_light) const;
 	virtual uint64_t light_get_version(RID p_light) const;
 
 	/* PROBE API */
@@ -862,7 +862,7 @@ public:
 	virtual void reflection_probe_set_enable_shadows(RID p_probe, bool p_enable);
 	virtual void reflection_probe_set_cull_mask(RID p_probe, uint32_t p_layers);
 
-	virtual AABB reflection_probe_get_aabb(RID p_probe) const;
+	virtual Rect3 reflection_probe_get_aabb(RID p_probe) const;
 	virtual VS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const;
 	virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const;
 
@@ -902,7 +902,7 @@ public:
 	struct GIProbe : public Instantiable {
 
 
-		AABB bounds;
+		Rect3 bounds;
 		Transform to_cell;
 		float cell_size;
 
@@ -922,8 +922,8 @@ public:
 
 	virtual RID gi_probe_create();
 
-	virtual void gi_probe_set_bounds(RID p_probe,const AABB& p_bounds);
-	virtual AABB gi_probe_get_bounds(RID p_probe) const;
+	virtual void gi_probe_set_bounds(RID p_probe,const Rect3& p_bounds);
+	virtual Rect3 gi_probe_get_bounds(RID p_probe) const;
 
 	virtual void gi_probe_set_cell_size(RID p_probe, float p_size);
 	virtual float gi_probe_get_cell_size(RID p_probe) const;
@@ -977,7 +977,7 @@ public:
 		float pre_process_time;
 		float explosiveness;
 		float randomness;
-		AABB custom_aabb;
+		Rect3 custom_aabb;
 		Vector3 gravity;
 		bool use_local_coords;
 		RID process_material;
@@ -996,7 +996,7 @@ public:
 
 		Vector<DrawPass> draw_passes;
 
-		AABB computed_aabb;
+		Rect3 computed_aabb;
 
 		GLuint particle_buffers[2];
 
@@ -1053,7 +1053,7 @@ public:
 	virtual void particles_set_pre_process_time(RID p_particles,float p_time);
 	virtual void particles_set_explosiveness_ratio(RID p_particles,float p_ratio);
 	virtual void particles_set_randomness_ratio(RID p_particles,float p_ratio);
-	virtual void particles_set_custom_aabb(RID p_particles,const AABB& p_aabb);
+	virtual void particles_set_custom_aabb(RID p_particles,const Rect3& p_aabb);
 	virtual void particles_set_gravity(RID p_particles,const Vector3& p_gravity);
 	virtual void particles_set_use_local_coordinates(RID p_particles,bool p_enable);
 	virtual void particles_set_process_material(RID p_particles,RID p_material);
@@ -1070,7 +1070,7 @@ public:
 	virtual void particles_set_draw_pass_material(RID p_particles,int p_pass, RID p_material);
 	virtual void particles_set_draw_pass_mesh(RID p_particles,int p_pass, RID p_mesh);
 
-	virtual AABB particles_get_current_aabb(RID p_particles);
+	virtual Rect3 particles_get_current_aabb(RID p_particles);
 
 	/* INSTANCE */