diff options
| author | Juan Linietsky | 2017-01-07 18:25:37 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-07 18:26:38 -0300 |
| commit | 2ab83e1abbf5ee6d00e16056a9e9394114026f28 (patch) | |
| tree | 7efbb375cc4d00d8e8589fcf1b6a1303bec5df2d /core/math/bsp_tree.cpp | |
| parent | 2a38a5eaa844043b846e03d6655f84caf8a31e74 (diff) | |
| download | godot-2ab83e1abbf5ee6d00e16056a9e9394114026f28.tar.gz godot-2ab83e1abbf5ee6d00e16056a9e9394114026f28.tar.zst godot-2ab83e1abbf5ee6d00e16056a9e9394114026f28.zip | |
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
Diffstat (limited to 'core/math/bsp_tree.cpp')
| -rw-r--r-- | core/math/bsp_tree.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp index 5242abfa3..b7194d7ff 100644 --- a/core/math/bsp_tree.cpp +++ b/core/math/bsp_tree.cpp @@ -484,7 +484,7 @@ BSP_Tree::operator Variant() const { d["planes"]=plane_values; - DVector<int> dst_nodes; + PoolVector<int> dst_nodes; dst_nodes.resize(nodes.size()*3); for(int i=0;i<nodes.size();i++) { @@ -514,19 +514,19 @@ BSP_Tree::BSP_Tree(const Variant& p_variant) { ERR_FAIL_COND(!d.has("aabb")); ERR_FAIL_COND(!d.has("error_radius")); - DVector<int> src_nodes = d["nodes"]; + PoolVector<int> src_nodes = d["nodes"]; ERR_FAIL_COND(src_nodes.size()%3); if (d["planes"].get_type()==Variant::REAL_ARRAY) { - DVector<float> src_planes=d["planes"]; + PoolVector<float> src_planes=d["planes"]; int plane_count=src_planes.size(); ERR_FAIL_COND(plane_count%4); planes.resize(plane_count/4); if (plane_count) { - DVector<float>::Read r = src_planes.read(); + PoolVector<float>::Read r = src_planes.read(); for(int i=0;i<plane_count/4;i++) { planes[i].normal.x=r[i*4+0]; @@ -549,7 +549,7 @@ BSP_Tree::BSP_Tree(const Variant& p_variant) { // int node_count = src_nodes.size(); nodes.resize(src_nodes.size()/3); - DVector<int>::Read r = src_nodes.read(); + PoolVector<int>::Read r = src_nodes.read(); for(int i=0;i<nodes.size();i++) { @@ -560,12 +560,12 @@ BSP_Tree::BSP_Tree(const Variant& p_variant) { } -BSP_Tree::BSP_Tree(const DVector<Face3>& p_faces,float p_error_radius) { +BSP_Tree::BSP_Tree(const PoolVector<Face3>& p_faces,float p_error_radius) { // compute aabb int face_count=p_faces.size(); - DVector<Face3>::Read faces_r=p_faces.read(); + PoolVector<Face3>::Read faces_r=p_faces.read(); const Face3 *facesptr = faces_r.ptr(); |