From e0cb6bd23b21f126bde42f74f4b1a798c3e15b0f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 7 Jan 2010 07:03:58 +0100 Subject: Major cleanup Much better now! --- src/View/MapView.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/View/MapView.cpp') diff --git a/src/View/MapView.cpp b/src/View/MapView.cpp index 7aa5482..224cd37 100644 --- a/src/View/MapView.cpp +++ b/src/View/MapView.cpp @@ -169,19 +169,19 @@ void MapView::getBounds(float *minX, float *maxX, float *minY, float *maxY) { const std::list &rooms = mainView->getLevel()->getRooms(); for(std::list::const_iterator room = rooms.begin(); room != rooms.end(); ++room) { - const std::list &triangles = (*room)->getFloorTriangles(); + const std::list &triangles = (*room)->getTriangles(); for(std::list::const_iterator t = triangles.begin(); t != triangles.end(); ++t) { - const Data::Vertex &v1 = (*t)->getVertex(0), &v2 = (*t)->getVertex(1), &v3 = (*t)->getVertex(2); + const vmml::vec3f &v1 = (*t)->getVertex(0), &v2 = (*t)->getVertex(1), &v3 = (*t)->getVertex(2); if(minX) - *minX = std::min(std::min(*minX, v1.getX()), std::min(v2.getX(), v3.getX())); + *minX = std::min(std::min(*minX, v1.x()), std::min(v2.x(), v3.x())); if(maxX) - *maxX = std::max(std::max(*maxX, v1.getX()), std::max(v2.getX(), v3.getX())); + *maxX = std::max(std::max(*maxX, v1.x()), std::max(v2.x(), v3.x())); if(minY) - *minY = std::min(std::min(*minY, v1.getZ()), std::min(v2.getZ(), v3.getZ())); + *minY = std::min(std::min(*minY, v1.z()), std::min(v2.z(), v3.z())); if(maxY) - *maxY = std::max(std::max(*maxY, v1.getZ()), std::max(v2.getZ(), v3.getZ())); + *maxY = std::max(std::max(*maxY, v1.z()), std::max(v2.z(), v3.z())); } } } -- cgit v1.2.3