OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dcel to avoid merge conflict

Browse Source
This commit is contained in:
James E McClure
2018-09-17 13:14:17 -04:00
parent 3271c0d37f f955162e20
commit a49915ccbc
15 changed files with 1364 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
analysis/dcel.cpp
View File

@@ -76,10 +76,6 @@ int Halfedge::size(){
DECL::DECL(){
cellvertices=DTMutableList<Point>(16);
FaceData.resize(16);
Triangles.resize(3,16);
halfedge.data.resize(6,48);
}
DECL::~DECL(){
@@ -99,7 +95,17 @@ void DECL::LocalIsosurface(const DoubleArray A, double value, const int i, const
int CubeIndex;
int nTris = 0;
int nVert = 0;
int nVert =0;
Point VertexList[12];
Point NewVertexList[12];
int LocalRemap[12];
DTMutableList<Point> cellvertices = DTMutableList<Point>(20);
IntArray Triangles = IntArray(3,20);
// Values from array 'A' at the cube corners
double CubeValues[8];
// Points corresponding to cube corners
C0.x = 0.0; C0.y = 0.0; C0.z = 0.0;
@@ -231,8 +237,10 @@ void DECL::LocalIsosurface(const DoubleArray A, double value, const int i, const
// Now add the local values to the DECL data structure
if (nTris>0){
//FaceData.resize(TriangleCount);
//halfedge.data.resize(6,nTris*3);
FaceData.resize(TriangleCount);
//printf("Construct halfedge structure... \n");
//printf(" Construct %i triangles \n",nTris);
halfedge.data.resize(6,nTris*3);
int idx_edge=0;
for (int idx=0; idx<TriangleCount; idx++){
int V1 = Triangles(0,idx);