manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LookUp table static data moved into static class functions

This commit is contained in:
Paolo Cignoni 2005-01-25 16:55:30 +00:00
parent 4c488dd556
commit 0af38855a4
4 changed files with 3375 additions and 3089 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1329
vcg/complex/trimesh/create/emc_lookup_table.h
View File

File diff suppressed because it is too large Load Diff

25
vcg/complex/trimesh/create/extended_marching_cubes.h
View File

@ -175,7 +175,7 @@ namespace vcg
size_t vertices_idx[12]; size_t vertices_idx[12];
memset(vertices_idx, -1, 12*sizeof(size_t)); memset(vertices_idx, -1, 12*sizeof(size_t));
int code = edgeTable[cubetype]; int code = EMCLookUpTable::EdgeTable(cubetype);
VertexPointer vp = NULL; VertexPointer vp = NULL;
if ( 1&code ) { _walker->GetXIntercept(_corners[0], _corners[1], vp); vertices_idx[ 0] = vp - &_mesh->vert[0]; } if ( 1&code ) { _walker->GetXIntercept(_corners[0], _corners[1], vp); vertices_idx[ 0] = vp - &_mesh->vert[0]; }
if ( 2&code ) { _walker->GetYIntercept(_corners[1], _corners[2], vp); vertices_idx[ 1] = vp - &_mesh->vert[0]; } if ( 2&code ) { _walker->GetYIntercept(_corners[1], _corners[2], vp); vertices_idx[ 1] = vp - &_mesh->vert[0]; }
@ -190,15 +190,15 @@ namespace vcg
if (1024&code ) { _walker->GetZIntercept(_corners[2], _corners[6], vp); vertices_idx[10] = vp - &_mesh->vert[0]; } if (1024&code ) { _walker->GetZIntercept(_corners[2], _corners[6], vp); vertices_idx[10] = vp - &_mesh->vert[0]; }
if (2048&code ) { _walker->GetZIntercept(_corners[3], _corners[7], vp); vertices_idx[11] = vp - &_mesh->vert[0]; } if (2048&code ) { _walker->GetZIntercept(_corners[3], _corners[7], vp); vertices_idx[11] = vp - &_mesh->vert[0]; }
unsigned int m, n, vertices_num; int m, n, vertices_num;
unsigned int components = triTable[cubetype][1][0]; int components = EMCLookUpTable::TriTable(cubetype, 1)[0]; //unsigned int components = triTable[cubetype][1][0];
int *indices = &triTable[cubetype][1][components+1]; int *indices = &EMCLookUpTable::TriTable(cubetype, 1)[components+1]; //int *indices = &EMCLookUpTable::TriTable(cubetype, 1, components+1);
std::vector< size_t > vertices_list; std::vector< size_t > vertices_list;
for (m=1; m<=components; m++) for (m=1; m<=components; m++)
{ {
// current sheet contains vertices_num vertices // current sheet contains vertices_num vertices
vertices_num = triTable[cubetype][1][m]; vertices_num = EMCLookUpTable::TriTable(cubetype, 1)[m]; //vertices_num = triTable[cubetype][1][m];
// collect vertices // collect vertices
vertices_list.clear(); vertices_list.clear();
@ -213,7 +213,7 @@ namespace vcg
size_t face_idx = _mesh->face.size(); size_t face_idx = _mesh->face.size();
vertices_list.push_back( vertices_list[0] ); vertices_list.push_back( vertices_list[0] );
AllocatorType::AddFaces(*_mesh, (int) vertices_num); AllocatorType::AddFaces(*_mesh, (int) vertices_num);
for (unsigned int j=0; j<vertices_num; ++j, face_idx++) for (int j=0; j<vertices_num; ++j, face_idx++)
{ {
_mesh->face[face_idx].V(0) = &_mesh->vert[ vertices_list[j ] ]; _mesh->face[face_idx].V(0) = &_mesh->vert[ vertices_list[j ] ];
_mesh->face[face_idx].V(1) = &_mesh->vert[ vertices_list[j+1] ]; _mesh->face[face_idx].V(1) = &_mesh->vert[ vertices_list[j+1] ];
@ -223,13 +223,16 @@ namespace vcg
else else
{ {
// no feature -> old marching cubes triangle table // no feature -> old marching cubes triangle table
for (int j=0; polyTable[vertices_num][j] != -1; j+=3) for (int j=0; EMCLookUpTable::PolyTable(vertices_num, j) != -1; j+=3) //for (int j=0; polyTable[vertices_num][j] != -1; j+=3)
{ {
size_t face_idx = _mesh->face.size(); size_t face_idx = _mesh->face.size();
AllocatorType::AddFaces(*_mesh, 1); AllocatorType::AddFaces(*_mesh, 1);
_mesh->face[ face_idx].V(0) = &_mesh->vert[ vertices_idx[ indices[ polyTable[vertices_num][j ] ] ] ]; //_mesh->face[ face_idx].V(0) = &_mesh->vert[ vertices_idx[ indices[ polyTable[vertices_num][j ] ] ] ];
_mesh->face[ face_idx].V(1) = &_mesh->vert[ vertices_idx[ indices[ polyTable[vertices_num][j+1] ] ] ]; //_mesh->face[ face_idx].V(1) = &_mesh->vert[ vertices_idx[ indices[ polyTable[vertices_num][j+1] ] ] ];
_mesh->face[ face_idx].V(2) = &_mesh->vert[ vertices_idx[ indices[ polyTable[vertices_num][j+2] ] ] ]; //_mesh->face[ face_idx].V(2) = &_mesh->vert[ vertices_idx[ indices[ polyTable[vertices_num][j+2] ] ] ];
_mesh->face[ face_idx].V(0) = &_mesh->vert[ vertices_idx[ indices[ EMCLookUpTable::PolyTable(vertices_num, j ) ] ] ];
_mesh->face[ face_idx].V(1) = &_mesh->vert[ vertices_idx[ indices[ EMCLookUpTable::PolyTable(vertices_num, j+1) ] ] ];
_mesh->face[ face_idx].V(2) = &_mesh->vert[ vertices_idx[ indices[ EMCLookUpTable::PolyTable(vertices_num, j+2) ] ] ];
} }
} }
indices += vertices_num; indices += vertices_num;
@ -425,7 +428,7 @@ namespace vcg
for( ; e_it!=e_end; e_it++) for( ; e_it!=e_end; e_it++)
{ {
f = &_mesh->face[e_it->face]; f = &_mesh->face[e_it->face];
z = e_it->edge; z = (int) e_it->edge;
if (vcg::face::CheckFlipEdge< FaceType >(*f, z)) if (vcg::face::CheckFlipEdge< FaceType >(*f, z))
{ {

243
vcg/complex/trimesh/create/marching_cubes.h
View File

@ -139,8 +139,8 @@ namespace vcg
for (int i=0; i<8; i++) for (int i=0; i<8; i++)
if (_field[i]>0) cubetype += 1<<i; if (_field[i]>0) cubetype += 1<<i;
_case = cases[cubetype][0]; _case = MCLookUpTable::Cases(cubetype, 0); //_case = cases[cubetype][0];
_config = cases[cubetype][1]; _config = MCLookUpTable::Cases(cubetype, 1); //_config = cases[cubetype][1];
_subconfig = 0; _subconfig = 0;
VertexPointer v12 = NULL; VertexPointer v12 = NULL;
@ -148,197 +148,230 @@ namespace vcg
switch( _case ) switch( _case )
{ {
case 0 : { break ; } case 0 : { break ; }
case 1 : { AddTriangles( tiling1[_config], 1 ); break; } case 1 : { AddTriangles( MCLookUpTable::Tiling1(_config), 1 ); break; } //case 1 : { AddTriangles( tiling1[_config], 1 ); break; }
case 2 : { AddTriangles( tiling2[_config], 2 ); break; } case 2 : { AddTriangles( MCLookUpTable::Tiling2(_config), 2 ); break; } //case 2 : { AddTriangles( tiling2[_config], 2 ); break; }
case 3 : case 3 :
{ {
if( TestFace( test3[_config]) ) AddTriangles( tiling3_2[_config], 4 ) ; // 3.2 //if( TestFace( test3[_config]) ) AddTriangles( tiling3_2[_config], 4 ) ; // 3.2
else AddTriangles( tiling3_1[_config], 2 ) ; // 3.1 if( TestFace( MCLookUpTable::Test3(_config)) )
AddTriangles( MCLookUpTable::Tiling3_2(_config), 4 ) ; // 3.2
else
AddTriangles( MCLookUpTable::Tiling3_1(_config), 2 ) ; // 3.1
break ; break ;
} }
case 4 : case 4 :
{ {
if( TestInterior( test4[_config]) ) AddTriangles( tiling4_1[_config], 2 ) ; // 4.1.1 //if( TestInterior( test4[_config]) ) AddTriangles( tiling4_1[_config], 2 ) ; // 4.1.1
else AddTriangles( tiling4_2[_config], 6 ) ; // 4.1.2 if( TestInterior( MCLookUpTable::Test4(_config) ) )
AddTriangles( MCLookUpTable::Tiling4_1(_config), 2 ) ; // 4.1.1
else
AddTriangles( MCLookUpTable::Tiling4_2(_config), 6 ) ; // 4.1.2
break ; break ;
} }
case 5 : { AddTriangles( tiling5[_config], 3 ); break; } case 5 : { AddTriangles( MCLookUpTable::Tiling5(_config), 3 ); break; }
case 6 : case 6 :
{ {
if( TestFace( test6[_config][0]) ) //if( TestFace( test6[_config][0]) )
AddTriangles( tiling6_2[_config], 5 ) ; // 6.2 if( TestFace( MCLookUpTable::Test6(_config, 0)) )
AddTriangles( MCLookUpTable::Tiling6_2(_config), 5 ) ; // 6.2
else else
{ {
if( TestInterior( test6[_config][1]) ) AddTriangles( tiling6_1_1[_config], 3 ) ; // 6.1.1 if( TestInterior( MCLookUpTable::Test6(_config, 1)) )
else AddTriangles( tiling6_1_2[_config], 7 ) ; // 6.1.2 AddTriangles( MCLookUpTable::Tiling6_1_1(_config), 3 ) ; // 6.1.1
else
AddTriangles( MCLookUpTable::Tiling6_1_2(_config), 7 ) ; // 6.1.2
} }
break ; break ;
} }
case 7 : case 7 :
{ {
if( TestFace( test7[_config][0] ) ) _subconfig += 1 ; //if( TestFace( test7[_config][0] ) ) _subconfig += 1 ;
if( TestFace( test7[_config][1] ) ) _subconfig += 2 ; //if( TestFace( test7[_config][1] ) ) _subconfig += 2 ;
if( TestFace( test7[_config][2] ) ) _subconfig += 4 ; //if( TestFace( test7[_config][2] ) ) _subconfig += 4 ;
if( TestFace( MCLookUpTable::Test7(_config, 0) ) ) _subconfig += 1 ;
if( TestFace( MCLookUpTable::Test7(_config, 1) ) ) _subconfig += 2 ;
if( TestFace( MCLookUpTable::Test7(_config, 2) ) ) _subconfig += 4 ;
switch( _subconfig ) switch( _subconfig )
{ {
case 0 : { AddTriangles( tiling7_1[_config], 3 ) ; break; } case 0 : { AddTriangles( MCLookUpTable::Tiling7_1(_config), 3 ) ; break; }
case 1 : { AddTriangles( tiling7_2[_config][0], 5 ) ; break; } case 1 : { AddTriangles( MCLookUpTable::Tiling7_2(_config,0), 5 ) ; break; }
case 2 : { AddTriangles( tiling7_2[_config][1], 5 ) ; break; } case 2 : { AddTriangles( MCLookUpTable::Tiling7_2(_config,1), 5 ) ; break; }
case 3 : { ComputeCVertex(v12); AddTriangles( tiling7_3[_config][0], 9, v12 ) ; break ; } case 3 : { ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling7_3(_config,0), 9, v12 ) ; break ; }
case 4 : { AddTriangles( tiling7_2[_config][2], 5 ) ; break ;} case 4 : { AddTriangles( MCLookUpTable::Tiling7_2(_config, 2), 5 ) ; break ;}
case 5 : { ComputeCVertex(v12); AddTriangles( tiling7_3[_config][1], 9, v12 ) ; break ; } case 5 : { ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling7_3(_config,1), 9, v12 ) ; break ; }
case 6 : { ComputeCVertex(v12); AddTriangles( tiling7_3[_config][2], 9, v12 ) ; break ; } case 6 : { ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling7_3(_config,2), 9, v12 ) ; break ; }
case 7 : case 7 :
{ {
if( TestInterior( test7[_config][3]) ) AddTriangles( tiling7_4_2[_config], 9 ) ; if( TestInterior( MCLookUpTable::Test7(_config, 3) ) )
else AddTriangles( tiling7_4_1[_config], 5 ) ; AddTriangles( MCLookUpTable::Tiling7_4_2(_config), 9 ) ;
else
AddTriangles( MCLookUpTable::Tiling7_4_1(_config), 5 ) ;
break ; break ;
} }
}; };
break ; break ;
} // end of case 7 } // end of case 7
case 8 : { AddTriangles( tiling8[_config], 2 ) ; break ;} case 8 : { AddTriangles( MCLookUpTable::Tiling8(_config), 2 ) ; break ;}
case 9 : { AddTriangles( tiling9[_config], 4 ) ; break ;} case 9 : { AddTriangles( MCLookUpTable::Tiling9(_config), 4 ) ; break ;}
case 10 : case 10 :
{ {
if( TestFace( test10[_config][0]) ) if( TestFace( MCLookUpTable::Test10(_config, 0)) ) //if( TestFace( test10[_config][0]) )
{ {
if( TestFace( test10[_config][1]) ) if( TestFace( MCLookUpTable::Test10(_config,1) ) )
AddTriangles( tiling10_1_1_[_config], 4 ) ; // 10.1.1 AddTriangles( MCLookUpTable::Tiling10_1_1_(_config), 4 ) ; // 10.1.1
else else
{ {
ComputeCVertex(v12); ComputeCVertex(v12);
AddTriangles( tiling10_2[_config], 8, v12 ) ; // 10.2 AddTriangles( MCLookUpTable::Tiling10_2(_config), 8, v12 ) ; // 10.2
} }
} }
else else
{ {
if( TestFace( test10[_config][1]) ) if( TestFace( MCLookUpTable::Test10(_config, 1) ) )
{ {
ComputeCVertex(v12) ; ComputeCVertex(v12) ;
AddTriangles( tiling10_2_[_config], 8, v12 ) ; // 10.2 AddTriangles( MCLookUpTable::Tiling10_2_(_config), 8, v12 ) ; // 10.2
} }
else else
{ {
if( TestInterior( test10[_config][2]) ) AddTriangles( tiling10_1_1[_config], 4 ) ; // 10.1.1 if( TestInterior( MCLookUpTable::Test10(_config, 2) ) )
else AddTriangles( tiling10_1_2[_config], 8 ) ; // 10.1.2 AddTriangles( MCLookUpTable::Tiling10_1_1(_config), 4 ) ; // 10.1.1
else
AddTriangles( MCLookUpTable::Tiling10_1_2(_config), 8 ) ; // 10.1.2
} }
} }
break ; break ;
} // end of case 10 } // end of case 10
case 11 : { AddTriangles( tiling11[_config], 4 ) ; break ; } case 11 : { AddTriangles( MCLookUpTable::Tiling11(_config), 4 ) ; break ; }
case 12 : case 12 :
{ {
if( TestFace( test12[_config][0]) ) if( TestFace( MCLookUpTable::Test12(_config, 0) ) ) //if( TestFace( test12[_config][0]) )
{ {
if( TestFace( test12[_config][1]) ) AddTriangles( tiling12_1_1_[_config], 4 ) ; // 12.1.1 if( TestFace( MCLookUpTable::Test12(_config, 1) ) )
AddTriangles( MCLookUpTable::Tiling12_1_1_(_config), 4 ) ; // 12.1.1
else else
{ {
ComputeCVertex(v12) ; ComputeCVertex(v12) ;
AddTriangles( tiling12_2[_config], 8, v12 ) ; // 12.2 AddTriangles( MCLookUpTable::Tiling12_2(_config), 8, v12 ) ; // 12.2
} }
} }
else else
{ {
if( TestFace( test12[_config][1]) ) if( TestFace( MCLookUpTable::Test12(_config, 1) ) )
{ {
ComputeCVertex(v12) ; ComputeCVertex(v12) ;
AddTriangles( tiling12_2_[_config], 8, v12 ) ; // 12.2 AddTriangles( MCLookUpTable::Tiling12_2_(_config), 8, v12 ) ; // 12.2
} }
else else
{ {
if( TestInterior( test12[_config][2]) ) AddTriangles( tiling12_1_1[_config], 4 ) ; // 12.1.1 if( TestInterior( MCLookUpTable::Test12(_config, 2) ) )
else AddTriangles( tiling12_1_2[_config], 8 ) ; // 12.1.2 AddTriangles( MCLookUpTable::Tiling12_1_1(_config), 4 ) ; // 12.1.1
else
AddTriangles( MCLookUpTable::Tiling12_1_2(_config), 8 ) ; // 12.1.2
} }
} }
break ; break ;
} // end of case 12 } // end of case 12
case 13 : case 13 :
{ {
if( TestFace( test13[_config][0] ) ) _subconfig += 1 ; //if( TestFace( test13[_config][0] ) ) _subconfig += 1 ;
if( TestFace( test13[_config][1] ) ) _subconfig += 2 ; //if( TestFace( test13[_config][1] ) ) _subconfig += 2 ;
if( TestFace( test13[_config][2] ) ) _subconfig += 4 ; //if( TestFace( test13[_config][2] ) ) _subconfig += 4 ;
if( TestFace( test13[_config][3] ) ) _subconfig += 8 ; //if( TestFace( test13[_config][3] ) ) _subconfig += 8 ;
if( TestFace( test13[_config][4] ) ) _subconfig += 16 ; //if( TestFace( test13[_config][4] ) ) _subconfig += 16 ;
if( TestFace( test13[_config][5] ) ) _subconfig += 32 ; //if( TestFace( test13[_config][5] ) ) _subconfig += 32 ;
switch( subconfig13[_subconfig] ) if( TestFace( MCLookUpTable::Test13(_config, 0) ) ) _subconfig += 1 ;
if( TestFace( MCLookUpTable::Test13(_config, 1) ) ) _subconfig += 2 ;
if( TestFace( MCLookUpTable::Test13(_config, 2) ) ) _subconfig += 4 ;
if( TestFace( MCLookUpTable::Test13(_config, 3) ) ) _subconfig += 8 ;
if( TestFace( MCLookUpTable::Test13(_config, 4) ) ) _subconfig += 16 ;
if( TestFace( MCLookUpTable::Test13(_config, 5) ) ) _subconfig += 32 ;
switch( MCLookUpTable::Subconfig13(_subconfig) ) //switch( subconfig13[_subconfig] )
{ {
case 0 : { /* 13.1 */ AddTriangles( tiling13_1[_config] , 4 ) ; break ; } case 0 : { /* 13.1 */ AddTriangles( MCLookUpTable::Tiling13_1(_config) , 4 ) ; break ; }
case 1 : { /* 13.2 */ AddTriangles( tiling13_2[_config][0], 6 ) ; break ; } case 1 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2(_config, 0), 6 ) ; break ; }
case 2 : { /* 13.2 */ AddTriangles( tiling13_2[_config][1], 6 ) ; break ; } case 2 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2(_config, 1), 6 ) ; break ; }
case 3 : { /* 13.2 */ AddTriangles( tiling13_2[_config][2], 6 ) ; break ; } case 3 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2(_config, 2), 6 ) ; break ; }
case 4 : { /* 13.2 */ AddTriangles( tiling13_2[_config][3], 6 ) ; break ; } case 4 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2(_config, 3), 6 ) ; break ; }
case 5 : { /* 13.2 */ AddTriangles( tiling13_2[_config][4], 6 ) ; break ; } case 5 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2(_config, 4), 6 ) ; break ; }
case 6 : { /* 13.2 */ AddTriangles( tiling13_2[_config][5], 6 ) ; break ; } case 6 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2(_config, 5), 6 ) ; break ; }
case 7 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 0], 10, v12 ) ; break ; } case 7 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 0), 10, v12 ) ; break ; }
case 8 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 1], 10, v12 ) ; break ; } case 8 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 1), 10, v12 ) ; break ; }
case 9 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 2], 10, v12 ) ; break ; } case 9 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 2), 10, v12 ) ; break ; }
case 10 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 3], 10, v12 ) ; break ; } case 10 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 3), 10, v12 ) ; break ; }
case 11 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 4], 10, v12 ) ; break ; } case 11 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 4), 10, v12 ) ; break ; }
case 12 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 5], 10, v12 ) ; break ; } case 12 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 5), 10, v12 ) ; break ; }
case 13 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 6], 10, v12 ) ; break ; } case 13 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 6), 10, v12 ) ; break ; }
case 14 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 7], 10, v12 ) ; break ; } case 14 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 7), 10, v12 ) ; break ; }
case 15 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 8], 10, v12 ) ; break ; } case 15 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 8), 10, v12 ) ; break ; }
case 16 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][ 9], 10, v12 ) ; break ; } case 16 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config, 9), 10, v12 ) ; break ; }
case 17 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][10], 10, v12 ) ; break ; } case 17 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config,10), 10, v12 ) ; break ; }
case 18 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3[_config][11], 10, v12 ) ; break ; } case 18 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3(_config,11), 10, v12 ) ; break ; }
case 19 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( tiling13_4[_config][ 0], 12, v12 ) ; break ; } case 19 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_4(_config, 0), 12, v12 ) ; break ; }
case 20 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( tiling13_4[_config][ 1], 12, v12 ) ; break ; } case 20 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_4(_config, 1), 12, v12 ) ; break ; }
case 21 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( tiling13_4[_config][ 2], 12, v12 ) ; break ; } case 21 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_4(_config, 2), 12, v12 ) ; break ; }
case 22 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( tiling13_4[_config][ 3], 12, v12 ) ; break ; } case 22 : { /* 13.4 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_4(_config, 3), 12, v12 ) ; break ; }
case 23 : case 23 :
{ /* 13.5 */ { /* 13.5 */
_subconfig = 0 ; _subconfig = 0 ;
if( TestInterior( test13[_config][6] ) ) AddTriangles( tiling13_5_1[_config][0], 6 ) ; if( TestInterior( MCLookUpTable::Test13(_config, 6) ) )
else AddTriangles( tiling13_5_2[_config][0], 10 ) ; AddTriangles( MCLookUpTable::Tiling13_5_1(_config, 0), 6 ) ;
else
AddTriangles( MCLookUpTable::Tiling13_5_2(_config, 0), 10 ) ;
break ; break ;
} }
case 24 : case 24 :
{ /* 13.5 */ { /* 13.5 */
_subconfig = 1 ; _subconfig = 1 ;
if( TestInterior( test13[_config][6] ) ) AddTriangles( tiling13_5_1[_config][1], 6 ) ; if( TestInterior( MCLookUpTable::Test13(_config, 6) ) )
else AddTriangles( tiling13_5_2[_config][1], 10 ) ; AddTriangles( MCLookUpTable::Tiling13_5_1(_config, 1), 6 ) ;
else
AddTriangles( MCLookUpTable::Tiling13_5_2(_config, 1), 10 ) ;
break ; break ;
} }
case 25 : case 25 :
{/* 13.5 */ {/* 13.5 */
_subconfig = 2 ; _subconfig = 2 ;
if( TestInterior( test13[_config][6] ) ) AddTriangles( tiling13_5_1[_config][2], 6 ) ; if( TestInterior( MCLookUpTable::Test13(_config, 6) ) )
else AddTriangles( tiling13_5_2[_config][2], 10 ) ; AddTriangles( MCLookUpTable::Tiling13_5_1(_config, 2), 6 ) ;
else
AddTriangles( MCLookUpTable::Tiling13_5_2(_config, 2), 10 ) ;
break ; break ;
} }
case 26 : case 26 :
{/* 13.5 */ {/* 13.5 */
_subconfig = 3 ; _subconfig = 3 ;
if( TestInterior( test13[_config][6] ) ) AddTriangles( tiling13_5_1[_config][3], 6 ) ; if( TestInterior( MCLookUpTable::Test13(_config, 6) ) )
else AddTriangles( tiling13_5_2[_config][3], 10 ) ; AddTriangles( MCLookUpTable::Tiling13_5_1(_config, 3), 6 ) ;
else
AddTriangles( MCLookUpTable::Tiling13_5_2(_config, 3), 10 ) ;
break ; break ;
} }
case 27 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 0], 10, v12 ) ; break ; } case 27 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 0), 10, v12 ) ; break ; }
case 28 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 1], 10, v12 ) ; break ; } case 28 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 1), 10, v12 ) ; break ; }
case 29 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 2], 10, v12 ) ; break ; } case 29 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 2), 10, v12 ) ; break ; }
case 30 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 3], 10, v12 ) ; break ; } case 30 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 3), 10, v12 ) ; break ; }
case 31 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 4], 10, v12 ) ; break ; } case 31 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 4), 10, v12 ) ; break ; }
case 32 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 5], 10, v12 ) ; break ; } case 32 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 5), 10, v12 ) ; break ; }
case 33 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 6], 10, v12 ) ; break ; } case 33 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 6), 10, v12 ) ; break ; }
case 34 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 7], 10, v12 ) ; break ; } case 34 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 7), 10, v12 ) ; break ; }
case 35 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 8], 10, v12 ) ; break ; } case 35 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 8), 10, v12 ) ; break ; }
case 36 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][ 9], 10, v12 ) ; break ; } case 36 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config, 9), 10, v12 ) ; break ; }
case 37 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][10], 10, v12 ) ; break ; } case 37 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config,10), 10, v12 ) ; break ; }
case 38 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( tiling13_3_[_config][11], 10, v12 ) ; break ; } case 38 : { /* 13.3 */ ComputeCVertex(v12); AddTriangles( MCLookUpTable::Tiling13_3_(_config,11), 10, v12 ) ; break ; }
case 39 : { /* 13.2 */ AddTriangles( tiling13_2_[_config][0], 6 ) ; break ; } case 39 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2_(_config,0), 6 ) ; break ; }
case 40 : { /* 13.2 */ AddTriangles( tiling13_2_[_config][1], 6 ) ; break ; } case 40 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2_(_config,1), 6 ) ; break ; }
case 41 : { /* 13.2 */ AddTriangles( tiling13_2_[_config][2], 6 ) ; break ; } case 41 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2_(_config,2), 6 ) ; break ; }
case 42 : { /* 13.2 */ AddTriangles( tiling13_2_[_config][3], 6 ) ; break ; } case 42 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2_(_config,3), 6 ) ; break ; }
case 43 : { /* 13.2 */ AddTriangles( tiling13_2_[_config][4], 6 ) ; break ; } case 43 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2_(_config,4), 6 ) ; break ; }
case 44 : { /* 13.2 */ AddTriangles( tiling13_2_[_config][5], 6 ) ; break ; } case 44 : { /* 13.2 */ AddTriangles( MCLookUpTable::Tiling13_2_(_config,5), 6 ) ; break ; }
case 45 : { /* 13.1 */ AddTriangles( tiling13_1_[_config] , 4 ) ; break ; } case 45 : { /* 13.1 */ AddTriangles( MCLookUpTable::Tiling13_1_(_config) , 4 ) ; break ; }
default : { /*Impossible case 13*/ assert(false); } default : { /*Impossible case 13*/ assert(false); }
} }
break ; break ;
} // end of case 13 } // end of case 13
case 14 : { AddTriangles( tiling14[_config], 4 ) ; } case 14 : { AddTriangles( MCLookUpTable::Tiling14(_config), 4 ) ; }
break ; break ;
} //end of switch (_case) } //end of switch (_case)
@ -433,10 +466,10 @@ namespace vcg
case 13 : case 13 :
switch( _case ) switch( _case )
{ {
case 6 : edge = test6 [_config][2] ; break ; case 6 : edge = MCLookUpTable::Test6 (_config, 2) ; break ;
case 7 : edge = test7 [_config][4] ; break ; case 7 : edge = MCLookUpTable::Test7 (_config, 4) ; break ;
case 12 : edge = test12[_config][3] ; break ; case 12 : edge = MCLookUpTable::Test12(_config, 3) ; break ;
case 13 : edge = tiling13_5_1[_config][_subconfig][0] ; break ; case 13 : edge = MCLookUpTable::Tiling13_5_1(_config, _subconfig)[0] ; break ;
} }
switch( edge ) switch( edge )
{ {

4863
vcg/complex/trimesh/create/mc_lookup_table.h
View File

File diff suppressed because it is too large Load Diff