AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-08 13:30:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1106 from barfowl/regression_shapes_indexing

Browse Source 
Fixed indexing errors in old regression/shapes
This commit is contained in:
David G Yu 2019-05-15 14:38:36 -07:00 committed by GitHub
commit 7eac369fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 4130 additions and 4218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1936
regression/shapes/catmark_bishop.h
View File

File diff suppressed because it is too large Load Diff

3150
regression/shapes/catmark_car.h
View File

File diff suppressed because it is too large Load Diff

1
regression/shapes/catmark_chaikin0.h
View File

@ -72,6 +72,7 @@ static const std::string catmark_chaikin0 =
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vn -0.577350 -0.577350 0.577350\n"
"vn 0.577350 -0.577350 0.577350\n"
"vn -0.707107 0.000000 0.707107\n"

1
regression/shapes/catmark_chaikin1.h
View File

@ -72,6 +72,7 @@ static const std::string catmark_chaikin1 =
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vn -0.577350 -0.577350 0.577350\n"
"vn 0.577350 -0.577350 0.577350\n"
"vn -0.707107 0.000000 0.707107\n"

57
regression/shapes/catmark_dart_edgecorner.h
View File

@ -75,48 +75,23 @@ static const std::string catmark_dart_edgecorner =
"vt 0.375000 0.875000\n"
"vt 0.500000 1.000000\n"
"vt 0.250000 0.750000\n"
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn -0.187366 0.000000 0.982290\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.325058 0.325058 0.888074\n"
"vn 0.325058 0.325058 0.888074\n"
"vn 1.000000 0.000000 0.000000\n"
"vn -0.325058 -0.325058 0.888074\n"
"vn -0.325058 -0.325058 0.888074\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.161559 0.359427 0.919082\n"
"vn -0.359427 -0.161559 0.919082\n"
"vn 0.000000 0.000000 1.000000\n"
"vn -0.256506 0.256506 0.931885\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.187366 0.982290\n"
"vn -0.198757 0.198757 0.959683\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"s 1\n"
"f 4/1/1 7/2/2 23/3/3 14/4/4\n"
"f 13/5/5 19/6/6 8/7/7 2/8/8\n"
"f 10/9/9 17/10/10 5/11/11 1/12/12\n"
"f 9/13/13 18/14/14 17/10/15 10/9/16\n"
"f 8/7/17 19/6/18 18/14/19 9/13/20\n"
"f 12/15/21 22/16/22 19/6/23 13/5/24\n"
"f 17/10/25 20/17/26 6/18/27 5/11/28\n"
"f 18/14/29 21/19/30 20/17/31 17/10/32\n"
"f 19/6/33 22/16/34 21/19/35 18/14/36\n"
"f 11/20/37 25/21/38 22/16/39 12/15/40\n"
"f 20/17/41 23/3/42 7/2/43 6/18/44\n"
"f 21/19/45 24/22/46 23/3/47 20/17/48\n"
"f 22/16/49 25/21/50 24/22/51 21/19/52\n"
"f 16/23/53 25/21/54 11/20/55 3/24/56\n"
"f 15/25/57 24/22/58 25/21/59 16/23/60\n"
"f 14/4/61 23/3/62 24/22/63 15/25/64\n"
"f 4/1 7/2 23/3 14/4\n"
"f 13/5 19/6 8/7 2/8\n"
"f 10/9 17/10 5/11 1/12\n"
"f 9/13 18/14 17/10 10/9\n"
"f 8/7 19/6 18/14 9/13\n"
"f 12/15 22/16 19/6 13/5\n"
"f 17/10 20/17 6/18 5/11\n"
"f 18/14 21/19 20/17 17/10\n"
"f 19/6 22/16 21/19 18/14\n"
"f 11/20 25/21 22/16 12/15\n"
"f 20/17 23/3 7/2 6/18\n"
"f 21/19 24/22 23/3 20/17\n"
"f 22/16 25/21 24/22 21/19\n"
"f 16/23 25/21 11/20 3/24\n"
"f 15/25 24/22 25/21 16/23\n"
"f 14/4 23/3 24/22 15/25\n"
"t crease 2/1/0 8 17 2.0\n"
"t crease 2/1/0 17 20 2.0\n"
"t interpolateboundary 1/0/0 1\n"

57
regression/shapes/catmark_dart_edgeonly.h
View File

@ -75,48 +75,23 @@ static const std::string catmark_dart_edgeonly =
"vt 0.375000 0.875000\n"
"vt 0.500000 1.000000\n"
"vt 0.250000 0.750000\n"
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn -0.187366 0.000000 0.982290\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.325058 0.325058 0.888074\n"
"vn 0.325058 0.325058 0.888074\n"
"vn 1.000000 0.000000 0.000000\n"
"vn -0.325058 -0.325058 0.888074\n"
"vn -0.325058 -0.325058 0.888074\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.161559 0.359427 0.919082\n"
"vn -0.359427 -0.161559 0.919082\n"
"vn 0.000000 0.000000 1.000000\n"
"vn -0.256506 0.256506 0.931885\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.187366 0.982290\n"
"vn -0.198757 0.198757 0.959683\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"s 1\n"
"f 4/1/1 7/2/2 23/3/3 14/4/4\n"
"f 13/5/5 19/6/6 8/7/7 2/8/8\n"
"f 10/9/9 17/10/10 5/11/11 1/12/12\n"
"f 9/13/13 18/14/14 17/10/15 10/9/16\n"
"f 8/7/17 19/6/18 18/14/19 9/13/20\n"
"f 12/15/21 22/16/22 19/6/23 13/5/24\n"
"f 17/10/25 20/17/26 6/18/27 5/11/28\n"
"f 18/14/29 21/19/30 20/17/31 17/10/32\n"
"f 19/6/33 22/16/34 21/19/35 18/14/36\n"
"f 11/20/37 25/21/38 22/16/39 12/15/40\n"
"f 20/17/41 23/3/42 7/2/43 6/18/44\n"
"f 21/19/45 24/22/46 23/3/47 20/17/48\n"
"f 22/16/49 25/21/50 24/22/51 21/19/52\n"
"f 16/23/53 25/21/54 11/20/55 3/24/56\n"
"f 15/25/57 24/22/58 25/21/59 16/23/60\n"
"f 14/4/61 23/3/62 24/22/63 15/25/64\n"
"f 4/1 7/2 23/3 14/4\n"
"f 13/5 19/6 8/7 2/8\n"
"f 10/9 17/10 5/11 1/12\n"
"f 9/13 18/14 17/10 10/9\n"
"f 8/7 19/6 18/14 9/13\n"
"f 12/15 22/16 19/6 13/5\n"
"f 17/10 20/17 6/18 5/11\n"
"f 18/14 21/19 20/17 17/10\n"
"f 19/6 22/16 21/19 18/14\n"
"f 11/20 25/21 22/16 12/15\n"
"f 20/17 23/3 7/2 6/18\n"
"f 21/19 24/22 23/3 20/17\n"
"f 22/16 25/21 24/22 21/19\n"
"f 16/23 25/21 11/20 3/24\n"
"f 15/25 24/22 25/21 16/23\n"
"f 14/4 23/3 24/22 15/25\n"
"t crease 2/1/0 8 17 2.0\n"
"t crease 2/1/0 17 20 2.0\n"
"t interpolateboundary 1/0/0 2\n"

2
regression/shapes/catmark_flap2.h
View File

@ -45,7 +45,7 @@ static const std::string catmark_flap2 =
"vt 0.750000 0.250000 \n"
"vt 1.000000 0.250000 \n"
"vn 0.000000 0.000000 1.000000 \n"
" vn 0.000000 0.000000 1.000000 \n"
"vn 0.000000 0.000000 1.000000 \n"
"vn 0.000000 0.000000 1.000000 \n"
"vn 0.000000 0.000000 1.000000 \n"
"vn 0.000000 0.000000 1.000000 \n"

6
regression/shapes/catmark_gregory_test0.h
View File

@ -15,7 +15,7 @@ static const std::string catmark_gregory_test0 = std::string(
"vt 0.000000 0.500000\n"
"vt 0.500000 -0.003642\n"
"s 1\n"
"f 1/1/1 2/2/2 4/4/4 3/3/3\n"
"f 3/3/3 4/4/4 6/6/6 5/5/5\n"
"f 2/2/2 7/7/7 6/6/6 4/4/4\n"
"f 1/1 2/2 4/4 3/3\n"
"f 3/3 4/4 6/6 5/5\n"
"f 2/2 7/7 6/6 4/4\n"
);

16
regression/shapes/catmark_gregory_test4.h
View File

@ -40,13 +40,13 @@ static const std::string catmark_gregory_test4 =
"vt 1 0\n"
"vt 1 1\n"
"vt 0 1\n"
"f 2/1/2 3/2/3 6/3/6 5/4/5\n"
"f 4/1/4 5/2/5 8/3/8 7/4/7\n"
"f 7/1/7 8/2/8 11/3/11 10/4/10\n"
"f 8/1/8 9/2/9 12/3/12 11/4/11\n"
"f 10/1/10 11/2/11 2/3/2 1/4/1\n"
"f 11/1/11 12/2/12 3/3/3 2/4/2\n"
"f 3/1/3 12/2/12 9/3/9 6/4/6\n"
"f 10/1/10 1/2/1 4/3/4 7/4/7\n"
"f 2/1 3/2 6/3 5/4\n"
"f 4/1 5/2 8/3 7/4\n"
"f 7/1 8/2 11/3 10/4\n"
"f 8/1 9/2 12/3 11/4\n"
"f 10/1 11/2 2/3 1/4\n"
"f 11/1 12/2 3/3 2/4\n"
"f 3/1 12/2 9/3 6/4\n"
"f 10/1 1/2 4/3 7/4\n"
"t interpolateboundary 1/0/0 1\n"
;

46
regression/shapes/catmark_gregory_test6.h
View File

@ -64,38 +64,18 @@ static const std::string catmark_gregory_test6 = std::string(
"vt 1.000000 1.000000\n"
"vt 0.333333 0.333333\n"
"vt 0.333333 0.666666\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"f 1/1/1 5/2/2 14/6/3 8/5/4\n"
"f 2/3/5 7/8/6 13/7/7 5/2/8\n"
"f 3/17/9 6/16/10 16/12/11 10/13/12\n"
"f 4/15/13 9/10/14 15/11/15 6/16/16\n"
"f 5/2/17 13/7/18 11/19/19 14/6/20\n"
"f 6/16/21 15/11/22 12/20/23 16/12/24\n"
"f 7/8/25 10/13/26 16/12/27 13/7/28\n"
"f 9/10/29 8/5/30 14/6/31 15/11/32\n"
"f 11/19/33 13/7/34 16/12/35 12/20/36\n"
"f 12/20/37 15/11/38 14/6/39 11/19/40\n"
"f 2/3/41 17/4/42 18/9/43 7/8/44\n"
"f 3/17/45 10/13/46 19/14/47 20/18/48\n"
"f 7/8/49 18/9/50 19/14/51 10/13/52\n"
"f 1/1 5/2 14/6 8/5\n"
"f 2/3 7/8 13/7 5/2\n"
"f 3/17 6/16 16/12 10/13\n"
"f 4/15 9/10 15/11 6/16\n"
"f 5/2 13/7 11/19 14/6\n"
"f 6/16 15/11 12/20 16/12\n"
"f 7/8 10/13 16/12 13/7\n"
"f 9/10 8/5 14/6 15/11\n"
"f 11/19 13/7 16/12 12/20\n"
"f 12/20 15/11 14/6 11/19\n"
"f 2/3 17/4 18/9 7/8\n"
"f 3/17 10/13 19/14 20/18\n"
"f 7/8 18/9 19/14 10/13\n"
"t interpolateboundary 1/0/0 2\n"
);

46
regression/shapes/catmark_gregory_test7.h
View File

@ -64,39 +64,19 @@ static const std::string catmark_gregory_test7 = std::string(
"vt 1.000000 1.000000\n"
"vt 0.333333 0.333333\n"
"vt 0.333333 0.666666\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"f 1/1/1 5/2/2 14/6/3 8/5/4\n"
"f 2/3/5 7/8/6 13/7/7 5/2/8\n"
"f 3/17/9 6/16/10 16/12/11 10/13/12\n"
"f 4/15/13 9/10/14 15/11/15 6/16/16\n"
"f 5/2/17 13/7/18 11/19/19 14/6/20\n"
"f 6/16/21 15/11/22 12/20/23 16/12/24\n"
"f 7/8/25 10/13/26 16/12/27 13/7/28\n"
"f 9/10/29 8/5/30 14/6/31 15/11/32\n"
"f 11/19/33 13/7/34 16/12/35 12/20/36\n"
"f 12/20/37 15/11/38 14/6/39 11/19/40\n"
"f 2/3/41 17/4/42 18/9/43 7/8/44\n"
"f 3/17/45 10/13/46 19/14/47 20/18/48\n"
"f 7/8/49 18/9/50 19/14/51 10/13/52\n"
"f 1/1 5/2 14/6 8/5\n"
"f 2/3 7/8 13/7 5/2\n"
"f 3/17 6/16 16/12 10/13\n"
"f 4/15 9/10 15/11 6/16\n"
"f 5/2 13/7 11/19 14/6\n"
"f 6/16 15/11 12/20 16/12\n"
"f 7/8 10/13 16/12 13/7\n"
"f 9/10 8/5 14/6 15/11\n"
"f 11/19 13/7 16/12 12/20\n"
"f 12/20 15/11 14/6 11/19\n"
"f 2/3 17/4 18/9 7/8\n"
"f 3/17 10/13 19/14 20/18\n"
"f 7/8 18/9 19/14 10/13\n"
"t crease 2/1/0 4 12 9.0\n"
"t crease 2/1/0 12 15 9.0\n"
"t crease 2/1/0 15 5 9.0\n"

116
regression/shapes/catmark_helmet.h
View File

@ -101,64 +101,64 @@ static const std::string catmark_helmet =
"vt 1 0\n"
"vt 1 1\n"
"vt 0 1\n"
"f 1/1/1 2/2/2 8/3/8 7/4/7\n"
"f 2/1/2 3/2/3 9/3/9 8/4/8\n"
"f 55/1/55 56/2/56 57/3/57 58/4/58\n"
"f 4/1/4 5/2/5 11/3/11 10/4/10\n"
"f 5/1/5 6/2/6 12/3/12 11/4/11\n"
"f 7/1/7 8/2/8 14/3/14 13/4/13\n"
"f 8/1/8 9/2/9 15/3/15 14/4/14\n"
"f 58/1/58 57/2/57 59/3/59 60/4/60\n"
"f 10/1/10 11/2/11 17/3/17 16/4/16\n"
"f 11/1/11 12/2/12 18/3/18 17/4/17\n"
"f 13/1/13 14/2/14 20/3/20 19/4/19\n"
"f 14/1/14 15/2/15 21/3/21 20/4/20\n"
"f 60/1/60 59/2/59 61/3/61 62/4/62\n"
"f 16/1/16 17/2/17 23/3/23 22/4/22\n"
"f 17/1/17 18/2/18 24/3/24 23/4/23\n"
"f 19/1/19 20/2/20 26/3/26 25/4/25\n"
"f 20/1/20 21/2/21 27/3/27 26/4/26\n"
"f 62/1/62 61/2/61 63/3/63 64/4/64\n"
"f 22/1/22 23/2/23 29/3/29 28/4/28\n"
"f 23/1/23 24/2/24 30/3/30 29/4/29\n"
"f 25/1/25 26/2/26 32/3/32 31/4/31\n"
"f 26/1/26 27/2/27 33/3/33 32/4/32\n"
"f 64/1/64 63/2/63 65/3/65 66/4/66\n"
"f 28/1/28 29/2/29 35/3/35 34/4/34\n"
"f 29/1/29 30/2/30 36/3/36 35/4/35\n"
"f 31/1/31 32/2/32 38/3/38 37/4/37\n"
"f 32/1/32 33/2/33 39/3/39 38/4/38\n"
"f 66/1/66 65/2/65 67/3/67 68/4/68\n"
"f 34/1/34 35/2/35 41/3/41 40/4/40\n"
"f 35/1/35 36/2/36 42/3/42 41/4/41\n"
"f 37/1/37 38/2/38 44/3/44 43/4/43\n"
"f 38/1/38 39/2/39 45/3/45 44/4/44\n"
"f 68/1/68 67/2/67 69/3/69 70/4/70\n"
"f 40/1/40 41/2/41 47/3/47 46/4/46\n"
"f 41/1/41 42/2/42 48/3/48 47/4/47\n"
"f 43/1/43 44/2/44 50/3/50 49/4/49\n"
"f 44/1/44 45/2/45 51/3/51 50/4/50\n"
"f 70/1/70 69/2/69 71/3/71 72/4/72\n"
"f 46/1/46 47/2/47 53/3/53 52/4/52\n"
"f 47/1/47 48/2/48 54/3/54 53/4/53\n"
"f 3/1/3 4/2/4 56/3/56 55/4/55\n"
"f 4/1/4 10/2/10 57/3/57 56/4/56\n"
"f 9/1/9 3/2/3 55/3/55 58/4/58\n"
"f 10/1/10 16/2/16 59/3/59 57/4/57\n"
"f 15/1/15 9/2/9 58/3/58 60/4/60\n"
"f 16/1/16 22/2/22 61/3/61 59/4/59\n"
"f 21/1/21 15/2/15 60/3/60 62/4/62\n"
"f 22/1/22 28/2/28 63/3/63 61/4/61\n"
"f 27/1/27 21/2/21 62/3/62 64/4/64\n"
"f 28/1/28 34/2/34 65/3/65 63/4/63\n"
"f 33/1/33 27/2/27 64/3/64 66/4/66\n"
"f 34/1/34 40/2/40 67/3/67 65/4/65\n"
"f 39/1/39 33/2/33 66/3/66 68/4/68\n"
"f 40/1/40 46/2/46 69/3/69 67/4/67\n"
"f 45/1/45 39/2/39 68/3/68 70/4/70\n"
"f 46/1/46 52/2/52 71/3/71 69/4/69\n"
"f 52/1/52 51/2/51 72/3/72 71/4/71\n"
"f 51/1/51 45/2/45 70/3/70 72/4/72\n"
"f 1/1 2/2 8/3 7/4\n"
"f 2/1 3/2 9/3 8/4\n"
"f 55/1 56/2 57/3 58/4\n"
"f 4/1 5/2 11/3 10/4\n"
"f 5/1 6/2 12/3 11/4\n"
"f 7/1 8/2 14/3 13/4\n"
"f 8/1 9/2 15/3 14/4\n"
"f 58/1 57/2 59/3 60/4\n"
"f 10/1 11/2 17/3 16/4\n"
"f 11/1 12/2 18/3 17/4\n"
"f 13/1 14/2 20/3 19/4\n"
"f 14/1 15/2 21/3 20/4\n"
"f 60/1 59/2 61/3 62/4\n"
"f 16/1 17/2 23/3 22/4\n"
"f 17/1 18/2 24/3 23/4\n"
"f 19/1 20/2 26/3 25/4\n"
"f 20/1 21/2 27/3 26/4\n"
"f 62/1 61/2 63/3 64/4\n"
"f 22/1 23/2 29/3 28/4\n"
"f 23/1 24/2 30/3 29/4\n"
"f 25/1 26/2 32/3 31/4\n"
"f 26/1 27/2 33/3 32/4\n"
"f 64/1 63/2 65/3 66/4\n"
"f 28/1 29/2 35/3 34/4\n"
"f 29/1 30/2 36/3 35/4\n"
"f 31/1 32/2 38/3 37/4\n"
"f 32/1 33/2 39/3 38/4\n"
"f 66/1 65/2 67/3 68/4\n"
"f 34/1 35/2 41/3 40/4\n"
"f 35/1 36/2 42/3 41/4\n"
"f 37/1 38/2 44/3 43/4\n"
"f 38/1 39/2 45/3 44/4\n"
"f 68/1 67/2 69/3 70/4\n"
"f 40/1 41/2 47/3 46/4\n"
"f 41/1 42/2 48/3 47/4\n"
"f 43/1 44/2 50/3 49/4\n"
"f 44/1 45/2 51/3 50/4\n"
"f 70/1 69/2 71/3 72/4\n"
"f 46/1 47/2 53/3 52/4\n"
"f 47/1 48/2 54/3 53/4\n"
"f 3/1 4/2 56/3 55/4\n"
"f 4/1 10/2 57/3 56/4\n"
"f 9/1 3/2 55/3 58/4\n"
"f 10/1 16/2 59/3 57/4\n"
"f 15/1 9/2 58/3 60/4\n"
"f 16/1 22/2 61/3 59/4\n"
"f 21/1 15/2 60/3 62/4\n"
"f 22/1 28/2 63/3 61/4\n"
"f 27/1 21/2 62/3 64/4\n"
"f 28/1 34/2 65/3 63/4\n"
"f 33/1 27/2 64/3 66/4\n"
"f 34/1 40/2 67/3 65/4\n"
"f 39/1 33/2 66/3 68/4\n"
"f 40/1 46/2 69/3 67/4\n"
"f 45/1 39/2 68/3 70/4\n"
"f 46/1 52/2 71/3 69/4\n"
"f 52/1 51/2 72/3 71/4\n"
"f 51/1 45/2 70/3 72/4\n"
"t crease 2/1/0 2 8 7.000000 \n"
"t crease 2/1/0 3 9 7.000000 \n"
"t crease 2/1/0 8 14 7.000000 \n"

1176
regression/shapes/catmark_pawn.h
View File

File diff suppressed because it is too large Load Diff

10
regression/shapes/catmark_pyramid_creases0.h
View File

@ -36,11 +36,11 @@ static const std::string catmark_pyramid_creases0 =
"vt 0.0 2.0\n"
"vt -2.0 0.0\n"
"s off\n"
"f 1/1/1 2/2/2 3/3/3\n"
"f 1/1/1 3/3/3 4/4/4\n"
"f 1/1/1 4/4/4 5/5/5\n"
"f 1/1/1 5/5/5 2/2/2\n"
"f 5/5/5 4/4/4 3/3/3 2/2/2\n"
"f 1/1 2/2 3/3\n"
"f 1/1 3/3 4/4\n"
"f 1/1 4/4 5/5\n"
"f 1/1 5/5 2/2\n"
"f 5/5 4/4 3/3 2/2\n"
"t crease 2/1/0 4 3 3.0\n"
"t crease 2/1/0 3 2 3.0\n"
"t crease 2/1/0 2 1 3.0\n"

10
regression/shapes/catmark_pyramid_creases1.h
View File

@ -36,11 +36,11 @@ static const std::string catmark_pyramid_creases1 =
"vt 0.0 2.0\n"
"vt -2.0 0.0\n"
"s off\n"
"f 1/1/1 2/2/2 3/3/3\n"
"f 1/1/1 3/3/3 4/4/4\n"
"f 1/1/1 4/4/4 5/5/5\n"
"f 1/1/1 5/5/5 2/2/2\n"
"f 5/5/5 4/4/4 3/3/3 2/2/2\n"
"f 1/1 2/2 3/3\n"
"f 1/1 3/3 4/4\n"
"f 1/1 4/4 5/5\n"
"f 1/1 5/5 2/2\n"
"f 5/5 4/4 3/3 2/2\n"
"t crease 2/1/0 1 2 2.5\n"
"t crease 2/1/0 2 3 2.5\n"
"t crease 2/1/0 3 4 2.5\n"

10
regression/shapes/catmark_pyramid_creases2.h
View File

@ -31,11 +31,11 @@ static const std::string catmark_pyramid_creases2 =
"v 1 1 0\n"
"v -1 1 0\n"
"s off\n"
"f 1/1/1 2/2/2 3/3/3\n"
"f 1/1/1 3/3/3 4/4/4\n"
"f 1/1/1 4/4/4 5/5/5\n"
"f 1/1/1 5/5/5 2/2/2\n"
"f 5/5/5 4/4/4 3/3/3 2/2/2\n"
"f 1 2 3\n"
"f 1 3 4\n"
"f 1 4 5\n"
"f 1 5 2\n"
"f 5 4 3 2\n"
"t crease 2/1/0 4 3 4.0\n"
"t crease 2/1/0 3 2 4.0\n"
"t crease 2/1/0 2 1 4.0\n"

1554
regression/shapes/catmark_rook.h
View File

File diff suppressed because it is too large Load Diff

18
regression/shapes/catmark_square_hedit0.h
View File

@ -58,15 +58,15 @@ static const std::string catmark_square_hedit0 =
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/2/2 6/6/6 5/5/5\n"
"f 2/2/2 3/3/3 7/7/7 6/6/6\n"
"f 3/3/3 4/4/4 8/8/8 7/7/7\n"
"f 5/5/5 6/6/6 10/10/10 9/9/9\n"
"f 6/6/6 7/7/7 11/11/11 10/10/10\n"
"f 7/7/7 8/8/8 12/12/12 11/11/11\n"
"f 9/9/9 10/10/10 14/14/14 13/13/13\n"
"f 10/10/10 11/11/11 15/15/15 14/14/14\n"
"f 11/11/11 12/12/12 16/16/16 15/15/15\n"
"f 1/1 2/2 6/6 5/5\n"
"f 2/2 3/3 7/7 6/6\n"
"f 3/3 4/4 8/8 7/7\n"
"f 5/5 6/6 10/10 9/9\n"
"f 6/6 7/7 11/11 10/10\n"
"f 7/7 8/8 12/12 11/11\n"
"f 9/9 10/10 14/14 13/13\n"
"f 10/10 11/11 15/15 14/14\n"
"f 11/11 12/12 16/16 15/15\n"
"t interpolateboundary 1/0/0 2\n"
"t vertexedit 16/24/3 3 0 1 0 3 0 1 1 3 0 1 2 3 0 1 3 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 add P value\n"
"t vertexedit 20/24/3 4 4 1 1 0 4 4 1 1 1 4 4 1 1 2 4 4 1 1 3 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 add P value\n"

18
regression/shapes/catmark_square_hedit1.h
View File

@ -58,15 +58,15 @@ static const std::string catmark_square_hedit1 =
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/2/2 6/6/6 5/5/5\n"
"f 2/2/2 3/3/3 7/7/7 6/6/6\n"
"f 3/3/3 4/4/4 8/8/8 7/7/7\n"
"f 5/5/5 6/6/6 10/10/10 9/9/9\n"
"f 6/6/6 7/7/7 11/11/11 10/10/10\n"
"f 7/7/7 8/8/8 12/12/12 11/11/11\n"
"f 9/9/9 10/10/10 14/14/14 13/13/13\n"
"f 10/10/10 11/11/11 15/15/15 14/14/14\n"
"f 11/11/11 12/12/12 16/16/16 15/15/15\n"
"f 1/1 2/2 6/6 5/5\n"
"f 2/2 3/3 7/7 6/6\n"
"f 3/3 4/4 8/8 7/7\n"
"f 5/5 6/6 10/10 9/9\n"
"f 6/6 7/7 11/11 10/10\n"
"f 7/7 8/8 12/12 11/11\n"
"f 9/9 10/10 14/14 13/13\n"
"f 10/10 11/11 15/15 14/14\n"
"f 11/11 12/12 16/16 15/15\n"
"t interpolateboundary 1/0/0 2\n"
"t vertexedit 16/24/3 3 4 1 0 3 4 1 1 3 4 1 2 3 4 1 3 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 add P value\n"
"t vertexedit 16/4/3 3 4 1 0 3 4 1 1 3 4 1 2 3 4 1 3 10 10 10 10 set P sharpness\n"

18
regression/shapes/catmark_square_hedit2.h
View File

@ -58,15 +58,15 @@ static const std::string catmark_square_hedit2 =
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/2/2 6/6/6 5/5/5\n"
"f 2/2/2 3/3/3 7/7/7 6/6/6\n"
"f 3/3/3 4/4/4 8/8/8 7/7/7\n"
"f 5/5/5 6/6/6 10/10/10 9/9/9\n"
"f 6/6/6 7/7/7 11/11/11 10/10/10\n"
"f 7/7/7 8/8/8 12/12/12 11/11/11\n"
"f 9/9/9 10/10/10 14/14/14 13/13/13\n"
"f 10/10/10 11/11/11 15/15/15 14/14/14\n"
"f 11/11/11 12/12/12 16/16/16 15/15/15\n"
"f 1/1 2/2 6/6 5/5\n"
"f 2/2 3/3 7/7 6/6\n"
"f 3/3 4/4 8/8 7/7\n"
"f 5/5 6/6 10/10 9/9\n"
"f 6/6 7/7 11/11 10/10\n"
"f 7/7 8/8 12/12 11/11\n"
"f 9/9 10/10 14/14 13/13\n"
"f 10/10 11/11 15/15 14/14\n"
"f 11/11 12/12 16/16 15/15\n"
"t interpolateboundary 1/0/0 2\n"
"t vertexedit 16/24/3 3 4 1 0 3 4 1 1 3 4 1 2 3 4 1 3 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 add P value\n"
"t edgeedit 16/4/3 3 4 1 0 3 4 1 1 3 4 1 2 3 4 1 3 10 10 10 10 set P sharpness\n"

18
regression/shapes/catmark_square_hedit3.h
View File

@ -58,15 +58,15 @@ static const std::string catmark_square_hedit3 =
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/2/2 6/6/6 5/5/5\n"
"f 2/2/2 3/3/3 7/7/7 6/6/6\n"
"f 3/3/3 4/4/4 8/8/8 7/7/7\n"
"f 5/5/5 6/6/6 10/10/10 9/9/9\n"
"f 6/6/6 7/7/7 11/11/11 10/10/10\n"
"f 7/7/7 8/8/8 12/12/12 11/11/11\n"
"f 9/9/9 10/10/10 14/14/14 13/13/13\n"
"f 10/10/10 11/11/11 15/15/15 14/14/14\n"
"f 11/11/11 12/12/12 16/16/16 15/15/15\n"
"f 1/1 2/2 6/6 5/5\n"
"f 2/2 3/3 7/7 6/6\n"
"f 3/3 4/4 8/8 7/7\n"
"f 5/5 6/6 10/10 9/9\n"
"f 6/6 7/7 11/11 10/10\n"
"f 7/7 8/8 12/12 11/11\n"
"f 9/9 10/10 14/14 13/13\n"
"f 10/10 11/11 15/15 14/14\n"
"f 11/11 12/12 16/16 15/15\n"
"t interpolateboundary 1/0/0 2\n"
"t vertexedit 16/24/3 3 4 1 0 3 4 1 1 3 4 1 2 3 4 1 3 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 0 0 1 add P value\n"
"t edgeedit 16/4/3 3 4 1 0 3 4 1 1 3 4 1 2 3 4 1 3 10 10 10 10 set P sharpness\n"

18
regression/shapes/catmark_square_hedit4.h
View File

@ -58,15 +58,15 @@ static const std::string catmark_square_hedit4 =
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/2/2 6/6/6 5/5/5\n"
"f 2/2/2 3/3/3 7/7/7 6/6/6\n"
"f 3/3/3 4/4/4 8/8/8 7/7/7\n"
"f 5/5/5 6/6/6 10/10/10 9/9/9\n"
"f 6/6/6 7/7/7 11/11/11 10/10/10\n"
"f 7/7/7 8/8/8 12/12/12 11/11/11\n"
"f 9/9/9 10/10/10 14/14/14 13/13/13\n"
"f 10/10/10 11/11/11 15/15/15 14/14/14\n"
"f 11/11/11 12/12/12 16/16/16 15/15/15\n"
"f 1/1 2/2 6/6 5/5\n"
"f 2/2 3/3 7/7 6/6\n"
"f 3/3 4/4 8/8 7/7\n"
"f 5/5 6/6 10/10 9/9\n"
"f 6/6 7/7 11/11 10/10\n"
"f 7/7 8/8 12/12 11/11\n"
"f 9/9 10/10 14/14 13/13\n"
"f 10/10 11/11 15/15 14/14\n"
"f 11/11 12/12 16/16 15/15\n"
"t interpolateboundary 1/0/0 2\n"
"t vertexedit 20/12/3 4 4 1 1 0 4 4 1 1 1 4 4 1 1 2 4 4 1 1 3 0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0 0.0 0.0 1.0 add P value\n"
"t faceedit 4/0/1 3 4 1 1 hole\n"

64
regression/shapes/catmark_torus_creases0.h
View File

@ -61,38 +61,38 @@ static const std::string catmark_torus_creases0 =
"vt 1 0\n"
"vt 1 1\n"
"vt 0 1\n"
"f 5/1/1 6/2/2 2/3/3 1/4/4\n"
"f 6/1/5 7/2/6 3/3/7 2/4/8\n"
"f 7/1/9 8/2/10 4/3/11 3/4/12\n"
"f 8/1/13 5/2/14 1/3/15 4/4/16\n"
"f 9/1/17 10/2/18 6/3/19 5/4/20\n"
"f 10/1/21 11/2/22 7/3/23 6/4/24\n"
"f 11/1/25 12/2/26 8/3/27 7/4/28\n"
"f 12/1/29 9/2/30 5/3/31 8/4/32\n"
"f 13/1/33 14/2/34 10/3/35 9/4/36\n"
"f 14/1/37 15/2/38 11/3/39 10/4/40\n"
"f 15/1/41 16/2/42 12/3/43 11/4/44\n"
"f 16/1/45 13/2/46 9/3/47 12/4/48\n"
"f 17/1/49 18/2/50 14/3/51 13/4/52\n"
"f 18/1/53 19/2/54 15/3/55 14/4/56\n"
"f 19/1/57 20/2/58 16/3/59 15/4/60\n"
"f 20/1/61 17/2/62 13/3/63 16/4/64\n"
"f 21/1/65 22/2/66 18/3/67 17/4/68\n"
"f 22/1/69 23/2/70 19/3/71 18/4/72\n"
"f 23/1/73 24/2/74 20/3/75 19/4/76\n"
"f 24/1/77 21/2/78 17/3/79 20/4/80\n"
"f 25/1/81 26/2/82 22/3/83 21/4/84\n"
"f 26/1/85 27/2/86 23/3/87 22/4/88\n"
"f 27/1/89 28/2/90 24/3/91 23/4/92\n"
"f 28/1/93 25/2/94 21/3/95 24/4/96\n"
"f 29/1/97 30/2/98 26/3/99 25/4/100\n"
"f 30/1/101 31/2/102 27/3/103 26/4/104\n"
"f 31/1/105 32/2/106 28/3/107 27/4/108\n"
"f 32/1/109 29/2/110 25/3/111 28/4/112\n"
"f 1/1/113 2/2/114 30/3/115 29/4/116\n"
"f 2/1/117 3/2/118 31/3/119 30/4/120\n"
"f 3/1/121 4/2/122 32/3/123 31/4/124\n"
"f 4/1/125 1/2/126 29/3/127 32/4/128\n"
"f 5/1 6/2 2/3 1/4\n"
"f 6/1 7/2 3/3 2/4\n"
"f 7/1 8/2 4/3 3/4\n"
"f 8/1 5/2 1/3 4/4\n"
"f 9/1 10/2 6/3 5/4\n"
"f 10/1 11/2 7/3 6/4\n"
"f 11/1 12/2 8/3 7/4\n"
"f 12/1 9/2 5/3 8/4\n"
"f 13/1 14/2 10/3 9/4\n"
"f 14/1 15/2 11/3 10/4\n"
"f 15/1 16/2 12/3 11/4\n"
"f 16/1 13/2 9/3 12/4\n"
"f 17/1 18/2 14/3 13/4\n"
"f 18/1 19/2 15/3 14/4\n"
"f 19/1 20/2 16/3 15/4\n"
"f 20/1 17/2 13/3 16/4\n"
"f 21/1 22/2 18/3 17/4\n"
"f 22/1 23/2 19/3 18/4\n"
"f 23/1 24/2 20/3 19/4\n"
"f 24/1 21/2 17/3 20/4\n"
"f 25/1 26/2 22/3 21/4\n"
"f 26/1 27/2 23/3 22/4\n"
"f 27/1 28/2 24/3 23/4\n"
"f 28/1 25/2 21/3 24/4\n"
"f 29/1 30/2 26/3 25/4\n"
"f 30/1 31/2 27/3 26/4\n"
"f 31/1 32/2 28/3 27/4\n"
"f 32/1 29/2 25/3 28/4\n"
"f 1/1 2/2 30/3 29/4\n"
"f 2/1 3/2 31/3 30/4\n"
"f 3/1 4/2 32/3 31/4\n"
"f 4/1 1/2 29/3 32/4\n"
"t crease 2/1/0 1 5 4.7\n"
"t crease 2/1/0 5 9 4.7\n"
"t crease 2/1/0 9 13 4.7\n"