From 2ab83e1abbf5ee6d00e16056a9e9394114026f28 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 7 Jan 2017 18:25:37 -0300 Subject: Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector --- scene/3d/baked_light_instance.cpp | 34 +++++++++++++++++----------------- scene/3d/baked_light_instance.h | 8 ++++---- scene/3d/body_shape.cpp | 10 +++++----- scene/3d/collision_polygon.cpp | 10 +++++----- scene/3d/gi_probe.cpp | 30 +++++++++++++++--------------- scene/3d/gi_probe.h | 6 +++--- scene/3d/immediate_geometry.cpp | 4 ++-- scene/3d/immediate_geometry.h | 2 +- scene/3d/light.cpp | 4 ++-- scene/3d/light.h | 2 +- scene/3d/mesh_instance.cpp | 6 +++--- scene/3d/mesh_instance.h | 2 +- scene/3d/multimesh_instance.cpp | 4 ++-- scene/3d/multimesh_instance.h | 2 +- scene/3d/navigation.cpp | 4 ++-- scene/3d/navigation_mesh.cpp | 24 ++++++++++++------------ scene/3d/navigation_mesh.h | 6 +++--- scene/3d/particles.cpp | 10 +++++----- scene/3d/particles.h | 6 +++--- scene/3d/portal.cpp | 12 ++++++------ scene/3d/portal.h | 2 +- scene/3d/quad.cpp | 28 ++++++++++++++-------------- scene/3d/quad.h | 2 +- scene/3d/reflection_probe.cpp | 4 ++-- scene/3d/reflection_probe.h | 2 +- scene/3d/room_instance.cpp | 12 ++++++------ scene/3d/room_instance.h | 4 ++-- scene/3d/sprite_3d.cpp | 4 ++-- scene/3d/sprite_3d.h | 2 +- scene/3d/test_cube.cpp | 4 ++-- scene/3d/test_cube.h | 2 +- scene/3d/visual_instance.h | 2 +- 32 files changed, 127 insertions(+), 127 deletions(-) (limited to 'scene/3d') diff --git a/scene/3d/baked_light_instance.cpp b/scene/3d/baked_light_instance.cpp index b5cc451835..f85dfea80e 100644 --- a/scene/3d/baked_light_instance.cpp +++ b/scene/3d/baked_light_instance.cpp @@ -204,7 +204,7 @@ Vector BakedLight::_get_bake_texture(Image &p_image,const Color& p_color) p_image.resize(bake_texture_size,bake_texture_size,Image::INTERPOLATE_CUBIC); - DVector::Read r = p_image.get_data().read(); + PoolVector::Read r = p_image.get_data().read(); ret.resize(bake_texture_size*bake_texture_size); for(int i=0;i::Write(); + bake_cells_write=PoolVector::Write(); bake_cells.resize(1<& p_mesh) { Array a = p_mesh->surface_get_arrays(i); - DVector vertices = a[Mesh::ARRAY_VERTEX]; - DVector::Read vr=vertices.read(); - DVector uv = a[Mesh::ARRAY_TEX_UV]; - DVector::Read uvr; - DVector index = a[Mesh::ARRAY_INDEX]; + PoolVector vertices = a[Mesh::ARRAY_VERTEX]; + PoolVector::Read vr=vertices.read(); + PoolVector uv = a[Mesh::ARRAY_TEX_UV]; + PoolVector::Read uvr; + PoolVector index = a[Mesh::ARRAY_INDEX]; bool read_uv=false; @@ -687,7 +687,7 @@ void BakedLight::_bake_add_mesh(const Transform& p_xform,Ref& p_mesh) { if (index.size()) { int facecount = index.size()/3; - DVector::Read ir=index.read(); + PoolVector::Read ir=index.read(); for(int j=0;j& p_mesh,bo continue; //only triangles Array a = p_mesh->surface_get_arrays(i); - DVector vertices = a[Mesh::ARRAY_VERTEX]; + PoolVector vertices = a[Mesh::ARRAY_VERTEX]; int vc = vertices.size(); - DVector::Read vr=vertices.read(); + PoolVector::Read vr=vertices.read(); if (first) { bounds.pos=p_xform.xform(vr[0]); @@ -827,7 +827,7 @@ void BakedLight::bake() { _fixup_plot(0, 0,0,0,0); - bake_cells_write=DVector::Write(); + bake_cells_write=PoolVector::Write(); bake_cells.resize(bake_cells_used); @@ -1005,7 +1005,7 @@ void BakedLight::bake_lights() { _upscale_light(0,0); - bake_cells_write=DVector::Write(); + bake_cells_write=PoolVector::Write(); } @@ -1371,7 +1371,7 @@ void BakedLight::bake_radiance() { _bake_radiance(0,0,0,0,0); - bake_cells_write=DVector::Write(); + bake_cells_write=PoolVector::Write(); } int BakedLight::_find_cell(int x,int y, int z) { @@ -1538,9 +1538,9 @@ AABB BakedLight::get_aabb() const { return AABB(Vector3(0,0,0),Vector3(1,1,1)); } -DVector BakedLight::get_faces(uint32_t p_usage_flags) const { +PoolVector BakedLight::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } @@ -1621,8 +1621,8 @@ void BakedLight::create_debug_mesh(DebugMode p_mode) { Array arr; arr.resize(Mesh::ARRAY_MAX); - DVector vertices; - DVector colors; + PoolVector vertices; + PoolVector colors; int vtx_idx=0; #define ADD_VTX(m_idx);\ diff --git a/scene/3d/baked_light_instance.h b/scene/3d/baked_light_instance.h index d097a9af60..461b3adeff 100644 --- a/scene/3d/baked_light_instance.h +++ b/scene/3d/baked_light_instance.h @@ -107,8 +107,8 @@ private: int bake_cells_used; int zero_alphas; Vector bake_cells_level_used; - DVector bake_cells; - DVector::Write bake_cells_write; + PoolVector bake_cells; + PoolVector::Write bake_cells_write; @@ -157,7 +157,7 @@ public: void create_debug_mesh(DebugMode p_mode); virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; String get_configuration_warning() const; @@ -192,7 +192,7 @@ protected: public: virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; void set_param(Param p_param,float p_value); float get_param(Param p_param) const; diff --git a/scene/3d/body_shape.cpp b/scene/3d/body_shape.cpp index 0f71933388..ff8b0f15bf 100644 --- a/scene/3d/body_shape.cpp +++ b/scene/3d/body_shape.cpp @@ -83,8 +83,8 @@ void CollisionShape::_update_indicator() { if (shape.is_null()) return; - DVector points; - DVector normals; + PoolVector points; + PoolVector normals; VS::PrimitiveType pt = VS::PRIMITIVE_TRIANGLES; @@ -235,7 +235,7 @@ void CollisionShape::_update_indicator() { CapsuleShape *shapeptr=shape->cast_to(); - DVector planes = Geometry::build_capsule_planes(shapeptr->get_radius(), shapeptr->get_height()/2.0, 12, Vector3::AXIS_Z); + PoolVector planes = Geometry::build_capsule_planes(shapeptr->get_radius(), shapeptr->get_height()/2.0, 12, Vector3::AXIS_Z); Geometry::MeshData md = Geometry::build_convex_mesh(planes); for(int i=0;ipoly_clear(p_indicator); Color col(0.4,1.0,1.0,0.5); - DVector planes = Geometry::build_cylinder_planes(radius, height, 12, Vector3::AXIS_Z); + PoolVector planes = Geometry::build_cylinder_planes(radius, height, 12, Vector3::AXIS_Z); Geometry::MeshData md = Geometry::build_convex_mesh(planes); for(int i=0;ipoly_clear(p_indicator); Color col(0.4,1.0,1.0,0.5); - DVector planes = Geometry::build_capsule_planes(radius, height, 12, 3, Vector3::AXIS_Z); + PoolVector planes = Geometry::build_capsule_planes(radius, height, 12, 3, Vector3::AXIS_Z); Geometry::MeshData md = Geometry::build_convex_mesh(planes); for(int i=0;iget_shape_count(); for(int i=0;i convex = memnew( ConvexPolygonShape ); - DVector cp; + PoolVector cp; int cs = decomp[i].size(); cp.resize(cs*2); { - DVector::Write w = cp.write(); + PoolVector::Write w = cp.write(); int idx=0; for(int j=0;j concave = memnew( ConcavePolygonShape ); - DVector segments; + PoolVector segments; segments.resize(polygon.size()*2); - DVector::Write w=segments.write(); + PoolVector::Write w=segments.write(); for(int i=0;i::Write(); + w=PoolVector::Write(); concave->set_segments(segments); co->add_shape(concave,get_transform()); diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp index 19c67faa39..5b51273d0e 100644 --- a/scene/3d/gi_probe.cpp +++ b/scene/3d/gi_probe.cpp @@ -37,12 +37,12 @@ Transform GIProbeData::get_to_cell_xform() const { } -void GIProbeData::set_dynamic_data(const DVector& p_data){ +void GIProbeData::set_dynamic_data(const PoolVector& p_data){ VS::get_singleton()->gi_probe_set_dynamic_data(probe,p_data); } -DVector GIProbeData::get_dynamic_data() const{ +PoolVector GIProbeData::get_dynamic_data() const{ return VS::get_singleton()->gi_probe_get_dynamic_data(probe); } @@ -832,7 +832,7 @@ Vector GIProbe::_get_bake_texture(Image &p_image,const Color& p_color) { p_image.resize(bake_texture_size,bake_texture_size,Image::INTERPOLATE_CUBIC); - DVector::Read r = p_image.get_data().read(); + PoolVector::Read r = p_image.get_data().read(); ret.resize(bake_texture_size*bake_texture_size); for(int i=0;i& p_mesh, Baker *p_b Array a = p_mesh->surface_get_arrays(i); - DVector vertices = a[Mesh::ARRAY_VERTEX]; - DVector::Read vr=vertices.read(); - DVector uv = a[Mesh::ARRAY_TEX_UV]; - DVector::Read uvr; - DVector index = a[Mesh::ARRAY_INDEX]; + PoolVector vertices = a[Mesh::ARRAY_VERTEX]; + PoolVector::Read vr=vertices.read(); + PoolVector uv = a[Mesh::ARRAY_TEX_UV]; + PoolVector::Read uvr; + PoolVector index = a[Mesh::ARRAY_INDEX]; bool read_uv=false; @@ -936,7 +936,7 @@ void GIProbe::_plot_mesh(const Transform& p_xform, Ref& p_mesh, Baker *p_b if (index.size()) { int facecount = index.size()/3; - DVector::Read ir=index.read(); + PoolVector::Read ir=index.read(); for(int j=0;j data; + PoolVector data; data.resize( 16+(8+1+1+1+1)*baker.bake_cells.size() ); //4 for header, rest for rest. { - DVector::Write w = data.write(); + PoolVector::Write w = data.write(); uint32_t * w32 = (uint32_t*)w.ptr(); @@ -1247,8 +1247,8 @@ void GIProbe::_create_debug_mesh(Baker *p_baker) { Array arr; arr.resize(Mesh::ARRAY_MAX); - DVector vertices; - DVector colors; + PoolVector vertices; + PoolVector colors; int vtx_idx=0; #define ADD_VTX(m_idx);\ @@ -1333,9 +1333,9 @@ AABB GIProbe::get_aabb() const { return AABB(-extents,extents*2); } -DVector GIProbe::get_faces(uint32_t p_usage_flags) const { +PoolVector GIProbe::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } void GIProbe::_bind_methods() { diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index 4b06c13268..55cde2960a 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -26,8 +26,8 @@ public: void set_to_cell_xform(const Transform& p_xform); Transform get_to_cell_xform() const; - void set_dynamic_data(const DVector& p_data); - DVector get_dynamic_data() const; + void set_dynamic_data(const PoolVector& p_data); + PoolVector get_dynamic_data() const; void set_dynamic_range(int p_range); int get_dynamic_range() const; @@ -179,7 +179,7 @@ public: void bake(Node *p_from_node=NULL,bool p_create_visual_debug=false); virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; GIProbe(); ~GIProbe(); diff --git a/scene/3d/immediate_geometry.cpp b/scene/3d/immediate_geometry.cpp index 4ee2e646e6..ee200cb3ea 100644 --- a/scene/3d/immediate_geometry.cpp +++ b/scene/3d/immediate_geometry.cpp @@ -96,9 +96,9 @@ AABB ImmediateGeometry::get_aabb() const { return aabb; } -DVector ImmediateGeometry::get_faces(uint32_t p_usage_flags) const { +PoolVector ImmediateGeometry::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h index 3c8a76fbc7..bf624e67fd 100644 --- a/scene/3d/immediate_geometry.h +++ b/scene/3d/immediate_geometry.h @@ -67,7 +67,7 @@ public: virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; ImmediateGeometry(); ~ImmediateGeometry(); diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 84a6fecf5e..ba3c63c403 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -135,9 +135,9 @@ AABB Light::get_aabb() const { return AABB(); } -DVector Light::get_faces(uint32_t p_usage_flags) const { +PoolVector Light::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } diff --git a/scene/3d/light.h b/scene/3d/light.h index d3585b5cf2..3481d0229c 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -118,7 +118,7 @@ public: virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; Light(); ~Light(); diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index ef633ac301..5b12f80d5c 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -177,13 +177,13 @@ AABB MeshInstance::get_aabb() const { return AABB(); } -DVector MeshInstance::get_faces(uint32_t p_usage_flags) const { +PoolVector MeshInstance::get_faces(uint32_t p_usage_flags) const { if (!(p_usage_flags&(FACES_SOLID|FACES_ENCLOSING))) - return DVector(); + return PoolVector(); if (mesh.is_null()) - return DVector(); + return PoolVector(); return mesh->get_faces(); } diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h index 92f181c24e..1291d6b12f 100644 --- a/scene/3d/mesh_instance.h +++ b/scene/3d/mesh_instance.h @@ -81,7 +81,7 @@ public: void create_convex_collision(); virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; MeshInstance(); ~MeshInstance(); diff --git a/scene/3d/multimesh_instance.cpp b/scene/3d/multimesh_instance.cpp index 44cd7485ca..a9d1de1cfa 100644 --- a/scene/3d/multimesh_instance.cpp +++ b/scene/3d/multimesh_instance.cpp @@ -58,9 +58,9 @@ Ref MultiMeshInstance::get_multimesh() const { -DVector MultiMeshInstance::get_faces(uint32_t p_usage_flags) const { +PoolVector MultiMeshInstance::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } AABB MultiMeshInstance::get_aabb() const { diff --git a/scene/3d/multimesh_instance.h b/scene/3d/multimesh_instance.h index 503f5e75fc..ef2403a44a 100644 --- a/scene/3d/multimesh_instance.h +++ b/scene/3d/multimesh_instance.h @@ -49,7 +49,7 @@ protected: public: - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; void set_multimesh(const Ref& p_multimesh); Ref get_multimesh() const; diff --git a/scene/3d/navigation.cpp b/scene/3d/navigation.cpp index 598a935e4b..40666a60dc 100644 --- a/scene/3d/navigation.cpp +++ b/scene/3d/navigation.cpp @@ -36,12 +36,12 @@ void Navigation::_navmesh_link(int p_id) { print_line("LINK"); - DVector vertices=nm.navmesh->get_vertices(); + PoolVector vertices=nm.navmesh->get_vertices(); int len = vertices.size(); if (len==0) return; - DVector::Read r=vertices.read(); + PoolVector::Read r=vertices.read(); for(int i=0;iget_polygon_count();i++) { diff --git a/scene/3d/navigation_mesh.cpp b/scene/3d/navigation_mesh.cpp index 9ed3b4147a..7ec9085e30 100644 --- a/scene/3d/navigation_mesh.cpp +++ b/scene/3d/navigation_mesh.cpp @@ -33,7 +33,7 @@ void NavigationMesh::create_from_mesh(const Ref& p_mesh) { - vertices=DVector(); + vertices=PoolVector(); clear_polygons(); for(int i=0;iget_surface_count();i++) { @@ -41,15 +41,15 @@ void NavigationMesh::create_from_mesh(const Ref& p_mesh) { if (p_mesh->surface_get_primitive_type(i)!=Mesh::PRIMITIVE_TRIANGLES) continue; Array arr = p_mesh->surface_get_arrays(i); - DVector varr = arr[Mesh::ARRAY_VERTEX]; - DVector iarr = arr[Mesh::ARRAY_INDEX]; + PoolVector varr = arr[Mesh::ARRAY_VERTEX]; + PoolVector iarr = arr[Mesh::ARRAY_INDEX]; if (varr.size()==0 || iarr.size()==0) continue; int from = vertices.size(); vertices.append_array(varr); int rlen = iarr.size(); - DVector::Read r = iarr.read(); + PoolVector::Read r = iarr.read(); for(int j=0;j vi; @@ -63,12 +63,12 @@ void NavigationMesh::create_from_mesh(const Ref& p_mesh) { } } -void NavigationMesh::set_vertices(const DVector& p_vertices) { +void NavigationMesh::set_vertices(const PoolVector& p_vertices) { vertices=p_vertices; } -DVector NavigationMesh::get_vertices() const{ +PoolVector NavigationMesh::get_vertices() const{ return vertices; } @@ -122,8 +122,8 @@ Ref NavigationMesh::get_debug_mesh() { - DVector vertices = get_vertices(); - DVector::Read vr=vertices.read(); + PoolVector vertices = get_vertices(); + PoolVector::Read vr=vertices.read(); List faces; for(int i=0;i p = get_polygon(i); @@ -140,11 +140,11 @@ Ref NavigationMesh::get_debug_mesh() { Map<_EdgeKey,bool> edge_map; - DVector tmeshfaces; + PoolVector tmeshfaces; tmeshfaces.resize(faces.size()*3); { - DVector::Write tw=tmeshfaces.write(); + PoolVector::Write tw=tmeshfaces.write(); int tidx=0; @@ -185,10 +185,10 @@ Ref NavigationMesh::get_debug_mesh() { } } - DVector varr; + PoolVector varr; varr.resize(lines.size()); { - DVector::Write w = varr.write(); + PoolVector::Write w = varr.write(); int idx=0; for(List::Element *E=lines.front();E;E=E->next()) { w[idx++]=E->get(); diff --git a/scene/3d/navigation_mesh.h b/scene/3d/navigation_mesh.h index a0bdc5a516..e025b7ce8b 100644 --- a/scene/3d/navigation_mesh.h +++ b/scene/3d/navigation_mesh.h @@ -38,7 +38,7 @@ class NavigationMesh : public Resource { GDCLASS( NavigationMesh, Resource ); - DVector vertices; + PoolVector vertices; struct Polygon { Vector indices; }; @@ -65,8 +65,8 @@ public: void create_from_mesh(const Ref& p_mesh); - void set_vertices(const DVector& p_vertices); - DVector get_vertices() const; + void set_vertices(const PoolVector& p_vertices); + PoolVector get_vertices() const; void add_polygon(const Vector& p_polygon); int get_polygon_count() const; diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index 09be49d7d6..9e37658cd9 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -88,9 +88,9 @@ AABB Particles::get_aabb() const { return AABB( Vector3(-1,-1,-1), Vector3(2, 2, 2 ) ); } -DVector Particles::get_faces(uint32_t p_usage_flags) const { +PoolVector Particles::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } @@ -130,16 +130,16 @@ AABB Particles::get_visibility_aabb() const { } -void Particles::set_emission_points(const DVector& p_points) { +void Particles::set_emission_points(const PoolVector& p_points) { using_points = p_points.size(); VisualServer::get_singleton()->particles_set_emission_points(particles,p_points); } -DVector Particles::get_emission_points() const { +PoolVector Particles::get_emission_points() const { if (!using_points) - return DVector(); + return PoolVector(); return VisualServer::get_singleton()->particles_get_emission_points(particles); diff --git a/scene/3d/particles.h b/scene/3d/particles.h index 95cf44a033..b96bd4e69e 100644 --- a/scene/3d/particles.h +++ b/scene/3d/particles.h @@ -103,7 +103,7 @@ public: AABB get_aabb() const; - DVector get_faces(uint32_t p_usage_flags) const; + PoolVector get_faces(uint32_t p_usage_flags) const; void set_amount(int p_amount); int get_amount() const; @@ -120,8 +120,8 @@ public: void set_emission_base_velocity(const Vector3& p_base_velocity); Vector3 get_emission_base_velocity() const; - void set_emission_points(const DVector& p_points); - DVector get_emission_points() const; + void set_emission_points(const PoolVector& p_points); + PoolVector get_emission_points() const; void set_gravity_normal(const Vector3& p_normal); Vector3 get_gravity_normal() const; diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 1de9188e82..e4c03a78ee 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -34,7 +34,7 @@ bool Portal::_set(const StringName& p_name, const Variant& p_value) { if (p_name=="shape") { - DVector src_coords=p_value; + PoolVector src_coords=p_value; Vector points; int src_coords_size = src_coords.size(); ERR_FAIL_COND_V(src_coords_size%2,false); @@ -63,7 +63,7 @@ bool Portal::_get(const StringName& p_name,Variant &r_ret) const { if (p_name=="shape") { Vector points=get_shape(); - DVector dst_coords; + PoolVector dst_coords; dst_coords.resize(points.size()*2); for (int i=0;i Portal::get_faces(uint32_t p_usage_flags) const { +PoolVector Portal::get_faces(uint32_t p_usage_flags) const { if (!(p_usage_flags&FACES_ENCLOSING)) - return DVector(); + return PoolVector(); Vector shape = get_shape(); if (shape.size()==0) - return DVector(); + return PoolVector(); Vector2 center; for (int i=0;i Portal::get_faces(uint32_t p_usage_flags) const { } - DVector ret; + PoolVector ret; center/=shape.size(); for (int i=0;i get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; void set_enabled(bool p_enabled); bool is_enabled() const; diff --git a/scene/3d/quad.cpp b/scene/3d/quad.cpp index 4ba828f927..f1c59860af 100644 --- a/scene/3d/quad.cpp +++ b/scene/3d/quad.cpp @@ -44,9 +44,9 @@ void Quad::_update() { - DVector points; + PoolVector points; points.resize(4); - DVector::Write pointsw = points.write(); + PoolVector::Write pointsw = points.write(); Vector2 s2 = size*0.5; Vector2 o = offset; @@ -70,34 +70,34 @@ void Quad::_update() { for(int i=1;i<4;i++) aabb.expand_to(pointsw[i]); - pointsw = DVector::Write(); + pointsw = PoolVector::Write(); - DVector normals; + PoolVector normals; normals.resize(4); - DVector::Write normalsw = normals.write(); + PoolVector::Write normalsw = normals.write(); for(int i=0;i<4;i++) normalsw[i]=normal; - normalsw=DVector::Write(); + normalsw=PoolVector::Write(); - DVector uvs; + PoolVector uvs; uvs.resize(4); - DVector::Write uvsw = uvs.write(); + PoolVector::Write uvsw = uvs.write(); uvsw[0]=Vector2(0,0); uvsw[1]=Vector2(1,0); uvsw[2]=Vector2(1,1); uvsw[3]=Vector2(0,1); - uvsw = DVector::Write(); + uvsw = PoolVector::Write(); - DVector indices; + PoolVector indices; indices.resize(6); - DVector::Write indicesw = indices.write(); + PoolVector::Write indicesw = indices.write(); indicesw[0]=0; indicesw[1]=1; indicesw[2]=2; @@ -105,7 +105,7 @@ void Quad::_update() { indicesw[4]=3; indicesw[5]=0; - indicesw=DVector::Write(); + indicesw=PoolVector::Write(); Array arr; arr.resize(VS::ARRAY_MAX); @@ -187,9 +187,9 @@ void Quad::_notification(int p_what) { } } -DVector Quad::get_faces(uint32_t p_usage_flags) const { +PoolVector Quad::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } AABB Quad::get_aabb() const { diff --git a/scene/3d/quad.h b/scene/3d/quad.h index bdb2cb3088..94b438c548 100644 --- a/scene/3d/quad.h +++ b/scene/3d/quad.h @@ -67,7 +67,7 @@ public: void set_centered(bool p_enabled); bool is_centered() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; virtual AABB get_aabb() const; Quad(); diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index 63855b7e98..0235a063ea 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -169,9 +169,9 @@ AABB ReflectionProbe::get_aabb() const { aabb.size=origin_offset+extents; return aabb; } -DVector ReflectionProbe::get_faces(uint32_t p_usage_flags) const { +PoolVector ReflectionProbe::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } void ReflectionProbe::_validate_property(PropertyInfo& property) const { diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index 2de02ebbfa..789e5837b0 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -78,7 +78,7 @@ public: UpdateMode get_update_mode() const; virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; diff --git a/scene/3d/room_instance.cpp b/scene/3d/room_instance.cpp index 1423f56786..137a16490d 100644 --- a/scene/3d/room_instance.cpp +++ b/scene/3d/room_instance.cpp @@ -86,9 +86,9 @@ AABB Room::get_aabb() const { return AABB(); } -DVector Room::get_faces(uint32_t p_usage_flags) const { +PoolVector Room::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } @@ -119,21 +119,21 @@ Ref Room::get_room() const { return room; } -void Room::_parse_node_faces(DVector &all_faces,const Node *p_node) const { +void Room::_parse_node_faces(PoolVector &all_faces,const Node *p_node) const { const VisualInstance *vi=p_node->cast_to(); if (vi) { - DVector faces=vi->get_faces(FACES_ENCLOSING); + PoolVector faces=vi->get_faces(FACES_ENCLOSING); if (faces.size()) { int old_len=all_faces.size(); all_faces.resize( all_faces.size() + faces.size() ); int new_len=all_faces.size(); - DVector::Write all_facesw=all_faces.write(); + PoolVector::Write all_facesw=all_faces.write(); Face3 * all_facesptr=all_facesw.ptr(); - DVector::Read facesr=faces.read(); + PoolVector::Read facesr=faces.read(); const Face3 * facesptr=facesr.ptr(); Transform tr=vi->get_relative_transform(this); diff --git a/scene/3d/room_instance.h b/scene/3d/room_instance.h index 8c2bb76a38..8cdc908ceb 100644 --- a/scene/3d/room_instance.h +++ b/scene/3d/room_instance.h @@ -63,7 +63,7 @@ private: bool sound_enabled; int level; - void _parse_node_faces(DVector &all_faces,const Node *p_node) const; + void _parse_node_faces(PoolVector &all_faces,const Node *p_node) const; void _bounds_changed(); @@ -83,7 +83,7 @@ public: }; virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; void set_room( const Ref& p_room ); Ref get_room() const; diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 576f085120..5d686e8715 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -211,9 +211,9 @@ AABB SpriteBase3D::get_aabb() const { return aabb; } -DVector SpriteBase3D::get_faces(uint32_t p_usage_flags) const { +PoolVector SpriteBase3D::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 58d70fa2f7..f82a391038 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -135,7 +135,7 @@ public: virtual Rect2 get_item_rect() const=0; virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; SpriteBase3D(); ~SpriteBase3D(); diff --git a/scene/3d/test_cube.cpp b/scene/3d/test_cube.cpp index bd99de417e..c2ebe63e21 100644 --- a/scene/3d/test_cube.cpp +++ b/scene/3d/test_cube.cpp @@ -35,9 +35,9 @@ AABB TestCube::get_aabb() const { return AABB( Vector3(-1,-1,-1), Vector3(2, 2, 2 ) ); } -DVector TestCube::get_faces(uint32_t p_usage_flags) const { +PoolVector TestCube::get_faces(uint32_t p_usage_flags) const { - return DVector(); + return PoolVector(); } diff --git a/scene/3d/test_cube.h b/scene/3d/test_cube.h index cbd9918b13..c62999c34b 100644 --- a/scene/3d/test_cube.h +++ b/scene/3d/test_cube.h @@ -47,7 +47,7 @@ class TestCube : public GeometryInstance { public: virtual AABB get_aabb() const; - virtual DVector get_faces(uint32_t p_usage_flags) const; + virtual PoolVector get_faces(uint32_t p_usage_flags) const; TestCube(); ~TestCube(); diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h index 7b76cd299e..f59ec3a7e6 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -66,7 +66,7 @@ public: RID get_instance() const; virtual AABB get_aabb() const=0; - virtual DVector get_faces(uint32_t p_usage_flags) const=0; + virtual PoolVector get_faces(uint32_t p_usage_flags) const=0; virtual AABB get_transformed_aabb() const; // helper -- cgit v1.2.3