AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-26 17:51:10 +00:00
Code Issues Releases Wiki Activity

Add face varying data to regression shapes.

Browse Source
This commit is contained in:
Takahito Tejima 2013-07-02 10:50:27 -07:00
parent c6eff9860a
commit a9f028cdc0
18 changed files with 4219 additions and 4083 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1940
regression/shapes/catmark_bishop.h
View File

File diff suppressed because it is too large Load Diff

3154
regression/shapes/catmark_car.h
View File

File diff suppressed because it is too large Load Diff

2
regression/shapes/catmark_edgecorner.h
View File

@ -63,8 +63,8 @@ static const std::string catmark_edgecorner =
"v -2.0 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 1.0 0.0\n"
"vt 0.0 1.0\n"
"vt 1.0 1.0\n"
"vt 0.0 1.0\n"
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.0 0.0\n"

2
regression/shapes/catmark_edgeonly.h
View File

@ -63,8 +63,8 @@ static const std::string catmark_edgeonly =
"v -2.0 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 1.0 0.0\n"
"vt 0.0 1.0\n"
"vt 1.0 1.0\n"
"vt 0.0 1.0\n"
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.0 0.0\n"

14
regression/shapes/catmark_gregory_test3.h
View File

@ -69,6 +69,20 @@ static const std::string catmark_gregory_test3 =
"v -2.000000 1.000000 -0.000000\n"
"v -2.000000 0.000000 0.000000\n"
"v -2.000000 -1.000000 0.000000\n"
"vt 1.000000 1.000000\n"
"vt 1.000000 0.000000\n"
"vt 1.000000 -1.000000\n"
"vt 0.000000 1.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 -1.000000\n"
"vt -1.000000 2.000000\n"
"vt -1.000000 1.000000\n"
"vt -1.000000 0.000000\n"
"vt -1.000000 -1.000000\n"
"vt -2.000000 2.000000\n"
"vt -2.000000 1.000000\n"
"vt -2.000000 0.000000\n"
"vt -2.000000 -1.000000\n"
"vn 0.518841 0.518841 0.679418\n"
"vn 0.606923 0.000000 0.794761\n"
"vn 0.518841 -0.518841 0.679418\n"

20
regression/shapes/catmark_gregory_test4.h
View File

@ -68,13 +68,17 @@ static const std::string catmark_gregory_test4 =
"v -0.500000 -0.500000 -0.500000\n"
"v 0.000000 -0.500000 -0.500000\n"
"v 0.500000 -0.500000 -0.500000\n"
"f 2/2/2 3/3/3 6/6/6 5/5/5\n"
"f 4/4/4 5/5/5 8/8/8 7/7/7\n"
"f 7/7/7 8/8/8 11/11/11 10/10/10\n"
"f 8/8/8 9/9/9 12/12/12 11/11/11\n"
"f 10/10/10 11/11/11 2/2/2 1/1/1\n"
"f 11/11/11 12/12/12 3/3/3 2/2/2\n"
"f 3/3/3 12/12/12 9/9/9 6/6/6\n"
"f 10/10/10 1/1/1 4/4/4 7/7/7\n"
"vt 0 0\n"
"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"
"t interpolateboundary 1/0/0 1\n"
;

120
regression/shapes/catmark_helmet.h
View File

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

1180
regression/shapes/catmark_pawn.h
View File

File diff suppressed because it is too large Load Diff

5
regression/shapes/catmark_pyramid_creases0.h
View File

@ -62,6 +62,11 @@ static const std::string catmark_pyramid_creases0 =
"v 2.0 0.0 0.0\n"
"v 0.0 2.0 0.0\n"
"v -2.0 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 -2.0\n"
"vt 2.0 0.0\n"
"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"

5
regression/shapes/catmark_pyramid_creases1.h
View File

@ -62,6 +62,11 @@ static const std::string catmark_pyramid_creases1 =
"v 2.0 0.0 0.0\n"
"v 0.0 2.0 0.0\n"
"v -2.0 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 -2.0\n"
"vt 2.0 0.0\n"
"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"

1558
regression/shapes/catmark_rook.h
View File

File diff suppressed because it is too large Load Diff

34
regression/shapes/catmark_square_hedit0.h
View File

@ -73,16 +73,32 @@ static const std::string catmark_square_hedit0 =
"v -0.333333 1 0\n"
"v 0.333333 1 0\n"
"v 1 1 0\n"
"vt -1 -1\n"
"vt -0.333333 -1\n"
"vt 0.333333 -1\n"
"vt 1 -1\n"
"vt -1 -0.333333\n"
"vt -0.333333 -0.333333\n"
"vt 0.333333 -0.333333\n"
"vt 1 -0.333333\n"
"vt -1 0.333333\n"
"vt -0.333333 0.333333\n"
"vt 0.333333 0.333333\n"
"vt 1 0.333333\n"
"vt -1 1\n"
"vt -0.333333 1\n"
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/1/1 6/1/1 5/1/1\n"
"f 2/1/1 3/1/1 7/1/1 6/1/1\n"
"f 3/1/1 4/1/1 8/1/1 7/1/1\n"
"f 5/1/1 6/1/1 10/1/1 9/1/1\n"
"f 6/1/1 7/1/1 11/1/1 10/1/1\n"
"f 7/1/1 8/1/1 12/1/1 11/1/1\n"
"f 9/1/1 10/1/1 14/1/1 13/1/1\n"
"f 10/1/1 11/1/1 15/1/1 14/1/1\n"
"f 11/1/1 12/1/1 16/1/1 15/1/1\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"
"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"

34
regression/shapes/catmark_square_hedit1.h
View File

@ -73,16 +73,32 @@ static const std::string catmark_square_hedit1 =
"v -0.333333 1 0\n"
"v 0.333333 1 0\n"
"v 1 1 0\n"
"vt -1 -1\n"
"vt -0.333333 -1\n"
"vt 0.333333 -1\n"
"vt 1 -1\n"
"vt -1 -0.333333\n"
"vt -0.333333 -0.333333\n"
"vt 0.333333 -0.333333\n"
"vt 1 -0.333333\n"
"vt -1 0.333333\n"
"vt -0.333333 0.333333\n"
"vt 0.333333 0.333333\n"
"vt 1 0.333333\n"
"vt -1 1\n"
"vt -0.333333 1\n"
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/1/1 6/1/1 5/1/1\n"
"f 2/1/1 3/1/1 7/1/1 6/1/1\n"
"f 3/1/1 4/1/1 8/1/1 7/1/1\n"
"f 5/1/1 6/1/1 10/1/1 9/1/1\n"
"f 6/1/1 7/1/1 11/1/1 10/1/1\n"
"f 7/1/1 8/1/1 12/1/1 11/1/1\n"
"f 9/1/1 10/1/1 14/1/1 13/1/1\n"
"f 10/1/1 11/1/1 15/1/1 14/1/1\n"
"f 11/1/1 12/1/1 16/1/1 15/1/1\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"
"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"

34
regression/shapes/catmark_square_hedit2.h
View File

@ -73,16 +73,32 @@ static const std::string catmark_square_hedit2 =
"v -0.333333 1 0\n"
"v 0.333333 1 0\n"
"v 1 1 0\n"
"vt -1 -1\n"
"vt -0.333333 -1\n"
"vt 0.333333 -1\n"
"vt 1 -1\n"
"vt -1 -0.333333\n"
"vt -0.333333 -0.333333\n"
"vt 0.333333 -0.333333\n"
"vt 1 -0.333333\n"
"vt -1 0.333333\n"
"vt -0.333333 0.333333\n"
"vt 0.333333 0.333333\n"
"vt 1 0.333333\n"
"vt -1 1\n"
"vt -0.333333 1\n"
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/1/1 6/1/1 5/1/1\n"
"f 2/1/1 3/1/1 7/1/1 6/1/1\n"
"f 3/1/1 4/1/1 8/1/1 7/1/1\n"
"f 5/1/1 6/1/1 10/1/1 9/1/1\n"
"f 6/1/1 7/1/1 11/1/1 10/1/1\n"
"f 7/1/1 8/1/1 12/1/1 11/1/1\n"
"f 9/1/1 10/1/1 14/1/1 13/1/1\n"
"f 10/1/1 11/1/1 15/1/1 14/1/1\n"
"f 11/1/1 12/1/1 16/1/1 15/1/1\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"
"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"

34
regression/shapes/catmark_square_hedit3.h
View File

@ -73,16 +73,32 @@ static const std::string catmark_square_hedit3 =
"v -0.333333 1 0\n"
"v 0.333333 1 0\n"
"v 1 1 0\n"
"vt -1 -1\n"
"vt -0.333333 -1\n"
"vt 0.333333 -1\n"
"vt 1 -1\n"
"vt -1 -0.333333\n"
"vt -0.333333 -0.333333\n"
"vt 0.333333 -0.333333\n"
"vt 1 -0.333333\n"
"vt -1 0.333333\n"
"vt -0.333333 0.333333\n"
"vt 0.333333 0.333333\n"
"vt 1 0.333333\n"
"vt -1 1\n"
"vt -0.333333 1\n"
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/1/1 6/1/1 5/1/1\n"
"f 2/1/1 3/1/1 7/1/1 6/1/1\n"
"f 3/1/1 4/1/1 8/1/1 7/1/1\n"
"f 5/1/1 6/1/1 10/1/1 9/1/1\n"
"f 6/1/1 7/1/1 11/1/1 10/1/1\n"
"f 7/1/1 8/1/1 12/1/1 11/1/1\n"
"f 9/1/1 10/1/1 14/1/1 13/1/1\n"
"f 10/1/1 11/1/1 15/1/1 14/1/1\n"
"f 11/1/1 12/1/1 16/1/1 15/1/1\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"
"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"

34
regression/shapes/catmark_square_hedit4.h
View File

@ -73,16 +73,32 @@ static const std::string catmark_square_hedit4 =
"v -0.333333 1 0\n"
"v 0.333333 1 0\n"
"v 1 1 0\n"
"vt -1 -1\n"
"vt -0.333333 -1\n"
"vt 0.333333 -1\n"
"vt 1 -1\n"
"vt -1 -0.333333\n"
"vt -0.333333 -0.333333\n"
"vt 0.333333 -0.333333\n"
"vt 1 -0.333333\n"
"vt -1 0.333333\n"
"vt -0.333333 0.333333\n"
"vt 0.333333 0.333333\n"
"vt 1 0.333333\n"
"vt -1 1\n"
"vt -0.333333 1\n"
"vt 0.333333 1\n"
"vt 1 1\n"
"s off\n"
"f 1/1/1 2/1/1 6/1/1 5/1/1\n"
"f 2/1/1 3/1/1 7/1/1 6/1/1\n"
"f 3/1/1 4/1/1 8/1/1 7/1/1\n"
"f 5/1/1 6/1/1 10/1/1 9/1/1\n"
"f 6/1/1 7/1/1 11/1/1 10/1/1\n"
"f 7/1/1 8/1/1 12/1/1 11/1/1\n"
"f 9/1/1 10/1/1 14/1/1 13/1/1\n"
"f 10/1/1 11/1/1 15/1/1 14/1/1\n"
"f 11/1/1 12/1/1 16/1/1 15/1/1\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"
"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"

66
regression/shapes/catmark_torus.h
View File

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

66
regression/shapes/catmark_torus_creases0.h
View File

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