Mercurial > mm7
comparison Vis.cpp @ 1205:8c02e6f74b29
arrays to std::arrays phase 2 - mm7_data.h converted
author | Grumpy7 |
---|---|
date | Sun, 09 Jun 2013 00:30:48 +0200 |
parents | ce5ff6d32200 |
children | fac7751b2dc9 |
comparison
equal
deleted
inserted
replaced
1204:832f09144726 | 1205:8c02e6f74b29 |
---|---|
617 IntersectPoint.y < pFace->pBounding.y1 || IntersectPoint.y > pFace->pBounding.y2 || | 617 IntersectPoint.y < pFace->pBounding.y1 || IntersectPoint.y > pFace->pBounding.y2 || |
618 IntersectPoint.z < pFace->pBounding.z1 || IntersectPoint.z > pFace->pBounding.z2 ) | 618 IntersectPoint.z < pFace->pBounding.z1 || IntersectPoint.z > pFace->pBounding.z2 ) |
619 return false; | 619 return false; |
620 | 620 |
621 if (uModelID != -1) | 621 if (uModelID != -1) |
622 ODM_CreateIntersectFacesVertexCoordList(&a, &b, intersect_face_vertex_coords_list_a, intersect_face_vertex_coords_list_b, | 622 ODM_CreateIntersectFacesVertexCoordList(&a, &b, intersect_face_vertex_coords_list_a.data(), intersect_face_vertex_coords_list_b.data(), |
623 &IntersectPoint, pFace, uModelID); | 623 &IntersectPoint, pFace, uModelID); |
624 else | 624 else |
625 BLV_CreateIntersectFacesVertexCoordList(&a, &b, intersect_face_vertex_coords_list_a, intersect_face_vertex_coords_list_b, | 625 BLV_CreateIntersectFacesVertexCoordList(&a, &b, intersect_face_vertex_coords_list_a.data(), intersect_face_vertex_coords_list_b.data(), |
626 &IntersectPoint, pFace); | 626 &IntersectPoint, pFace); |
627 v5 = 2 * pFace->uNumVertices; | 627 v5 = 2 * pFace->uNumVertices; |
628 v16 = 0; | 628 v16 = 0; |
629 intersect_face_vertex_coords_list_a[v5] = intersect_face_vertex_coords_list_a[0]; | 629 intersect_face_vertex_coords_list_a[v5] = intersect_face_vertex_coords_list_a[0]; |
630 intersect_face_vertex_coords_list_b[v5] = intersect_face_vertex_coords_list_b[0]; | 630 intersect_face_vertex_coords_list_b[v5] = intersect_face_vertex_coords_list_b[0]; |