summaryrefslogtreecommitdiffstats
path: root/scene/3d/room_instance.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-07 18:25:37 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-07 18:26:38 -0300
commit2ab83e1abbf5ee6d00e16056a9e9394114026f28 (patch)
tree7efbb375cc4d00d8e8589fcf1b6a1303bec5df2d /scene/3d/room_instance.cpp
parent2a38a5eaa844043b846e03d6655f84caf8a31e74 (diff)
downloadredot-engine-2ab83e1abbf5ee6d00e16056a9e9394114026f28.tar.gz
Memory pool vectors (DVector) have been enormously simplified in code, and renamed to PoolVector
Diffstat (limited to 'scene/3d/room_instance.cpp')
-rw-r--r--scene/3d/room_instance.cpp12
1 files changed, 6 insertions, 6 deletions
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<Face3> Room::get_faces(uint32_t p_usage_flags) const {
+PoolVector<Face3> Room::get_faces(uint32_t p_usage_flags) const {
- return DVector<Face3>();
+ return PoolVector<Face3>();
}
@@ -119,21 +119,21 @@ Ref<RoomBounds> Room::get_room() const {
return room;
}
-void Room::_parse_node_faces(DVector<Face3> &all_faces,const Node *p_node) const {
+void Room::_parse_node_faces(PoolVector<Face3> &all_faces,const Node *p_node) const {
const VisualInstance *vi=p_node->cast_to<VisualInstance>();
if (vi) {
- DVector<Face3> faces=vi->get_faces(FACES_ENCLOSING);
+ PoolVector<Face3> 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<Face3>::Write all_facesw=all_faces.write();
+ PoolVector<Face3>::Write all_facesw=all_faces.write();
Face3 * all_facesptr=all_facesw.ptr();
- DVector<Face3>::Read facesr=faces.read();
+ PoolVector<Face3>::Read facesr=faces.read();
const Face3 * facesptr=facesr.ptr();
Transform tr=vi->get_relative_transform(this);