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

- add a message to limitEval when trying to display face-varying UVs on shapes

Browse Source 
that do not have that type of data

- fix some regression shapes that had "empty" uv values
  (including some minor topo surgery that luckily appears to not break
  regression baselines)
This commit is contained in:
manuelk 2013-06-07 17:53:23 -07:00
parent cf1b2f1334
commit 419b6b9716
14 changed files with 107 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/limitEval/main.cpp
View File

@ -849,7 +849,12 @@ display() {
g_hud.DrawString(10, -60, "GPU Draw : %.3f ms", drawGpuTime);
g_hud.DrawString(10, -40, "CPU Draw : %.3f ms", drawCpuTime);
g_hud.DrawString(10, -20, "FPS : %3.1f", fps);
if (g_drawMode==kFACEVARYING and g_evalCtx->GetFVarData().empty()) {
static char msg[21] = "No Face-Varying Data";
g_hud.DrawString(g_width/2-20/2*8, g_height/2, msg);
}
g_hud.Flush();
}

82
regression/shapes/catmark_dart_edgecorner.h
View File

@ -82,31 +82,31 @@ static const std::string catmark_dart_edgecorner =
"v -1.000000 0.000000 0.000000\n"
"v -0.500000 0.500000 0.000000\n"
"v 0.000000 1.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.500000\n"
"vt 0.125000 0.375000\n"
"vt 0.250000 0.500000\n"
"vt 0.125000 0.625000\n"
"vt 0.875000 0.625000\n"
"vt 0.750000 0.500000\n"
"vt 0.875000 0.375000\n"
"vt 1.000000 0.500000\n"
"vt 0.625000 0.125000\n"
"vt 0.500000 0.250000\n"
"vt 0.375000 0.125000\n"
"vt 0.500000 0.000000\n"
"vt 0.750000 0.250000\n"
"vt 0.625000 0.375000\n"
"vt 0.750000 0.750000\n"
"vt 0.625000 0.625000\n"
"vt 0.375000 0.375000\n"
"vt 0.250000 0.250000\n"
"vt 0.500000 0.500000\n"
"vt 0.625000 0.875000\n"
"vt 0.500000 0.750000\n"
"vt 0.375000 0.625000\n"
"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"
@ -133,22 +133,22 @@ static const std::string catmark_dart_edgecorner =
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"s 1\n"
"f 4/1/1 7/7/2 23/23/3 14/14/4\n"
"f 13/13/5 19/19/6 8/8/7 2/3/8\n"
"f 10/10/9 17/17/10 5/5/11 1/4/12\n"
"f 9/9/13 18/18/14 17/17/10 10/10/9\n"
"f 8/8/7 19/19/6 18/18/14 9/9/13\n"
"f 12/12/15 22/22/16 19/19/6 13/13/5\n"
"f 17/17/10 20/20/17 6/6/18 5/5/11\n"
"f 18/18/14 21/21/19 20/20/17 17/17/10\n"
"f 19/19/6 22/22/16 21/21/19 18/18/14\n"
"f 11/11/20 25/25/21 22/22/16 12/12/15\n"
"f 20/20/17 23/23/3 7/7/2 6/6/18\n"
"f 21/21/19 24/24/22 23/23/3 20/20/17\n"
"f 22/22/16 25/25/21 24/24/22 21/21/19\n"
"f 16/16/23 25/25/21 11/11/20 3/2/24\n"
"f 15/15/25 24/24/22 25/25/21 16/16/23\n"
"f 14/14/4 23/23/3 24/24/22 15/15/25\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"
"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"

82
regression/shapes/catmark_dart_edgeonly.h
View File

@ -82,31 +82,31 @@ static const std::string catmark_dart_edgeonly =
"v -1.000000 0.000000 0.000000\n"
"v -0.500000 0.500000 0.000000\n"
"v 0.000000 1.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.000000\n"
"vt 0.000000 0.500000\n"
"vt 0.125000 0.375000\n"
"vt 0.250000 0.500000\n"
"vt 0.125000 0.625000\n"
"vt 0.875000 0.625000\n"
"vt 0.750000 0.500000\n"
"vt 0.875000 0.375000\n"
"vt 1.000000 0.500000\n"
"vt 0.625000 0.125000\n"
"vt 0.500000 0.250000\n"
"vt 0.375000 0.125000\n"
"vt 0.500000 0.000000\n"
"vt 0.750000 0.250000\n"
"vt 0.625000 0.375000\n"
"vt 0.750000 0.750000\n"
"vt 0.625000 0.625000\n"
"vt 0.375000 0.375000\n"
"vt 0.250000 0.250000\n"
"vt 0.500000 0.500000\n"
"vt 0.625000 0.875000\n"
"vt 0.500000 0.750000\n"
"vt 0.375000 0.625000\n"
"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"
@ -133,22 +133,22 @@ static const std::string catmark_dart_edgeonly =
"vn 1.000000 0.000000 0.000000\n"
"vn 0.000000 0.000000 1.000000\n"
"s 1\n"
"f 4/1/1 7/7/2 23/23/3 14/14/4\n"
"f 13/13/5 19/19/6 8/8/7 2/3/8\n"
"f 10/10/9 17/17/10 5/5/11 1/4/12\n"
"f 9/9/13 18/18/14 17/17/10 10/10/9\n"
"f 8/8/7 19/19/6 18/18/14 9/9/13\n"
"f 12/12/15 22/22/16 19/19/6 13/13/5\n"
"f 17/17/10 20/20/17 6/6/18 5/5/11\n"
"f 18/18/14 21/21/19 20/20/17 17/17/10\n"
"f 19/19/6 22/22/16 21/21/19 18/18/14\n"
"f 11/11/20 25/25/21 22/22/16 12/12/15\n"
"f 20/20/17 23/23/3 7/7/2 6/6/18\n"
"f 21/21/19 24/24/22 23/23/3 20/20/17\n"
"f 22/22/16 25/25/21 24/24/22 21/21/19\n"
"f 16/16/23 25/25/21 11/11/20 3/2/24\n"
"f 15/15/25 24/24/22 25/25/21 16/16/23\n"
"f 14/14/4 23/23/3 24/24/22 15/15/25\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"
"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"

6
regression/shapes/catmark_edgecorner.h
View File

@ -62,9 +62,9 @@ static const std::string catmark_edgecorner =
"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 0.0\n"
"vt 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"
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.0 0.0\n"

6
regression/shapes/catmark_edgeonly.h
View File

@ -62,9 +62,9 @@ static const std::string catmark_edgeonly =
"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 0.0\n"
"vt 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"
"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,20 +69,6 @@ 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 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \n"
"vt 0 0 \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"

28
regression/shapes/catmark_pyramid.h
View File

@ -62,16 +62,14 @@ static const std::string catmark_pyramid =
"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 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.500000 0.000000\n"
"vt 0.000000 0.500000\n"
"vt 0.500000 1.000000\n"
"vt 1.000000 0.500000\n"
"vt 1.000000 1.000000\n"
"vt 0.000000 1.000000\n"
"vt 0.000000 0.000000\n"
"vt 1.000000 0.000000\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"
@ -89,10 +87,10 @@ static const std::string catmark_pyramid =
"vn 0.0 0.0 0.0\n"
"vn 0.0 0.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/5/1 2/4/2 3/3/3\n"
"f 1/6/1 3/3/3 4/2/4\n"
"f 1/7/1 4/2/4 5/1/5\n"
"f 1/8/1 5/1/5 2/4/2\n"
"f 5/1/5 4/2/4 3/3/3 2/4/2\n"
"\n"
;

26
regression/shapes/catmark_pyramid_creases0.h
View File

@ -62,32 +62,6 @@ 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 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.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"
"vn 0.0 0.0 0.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"
"vn 0.0 0.0 0.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"
"vn 0.0 0.0 0.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"
"vn 0.0 0.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"

26
regression/shapes/catmark_pyramid_creases1.h
View File

@ -62,32 +62,6 @@ 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 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.0\n"
"vt 0.0 0.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"
"vn 0.0 0.0 0.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"
"vn 0.0 0.0 0.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"
"vn 0.0 0.0 0.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"
"vn 0.0 0.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"

2
regression/shapes/catmark_square_hedit0.h
View File

@ -73,8 +73,6 @@ 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 0.0 0.0\n"
"vn 0.0 0.0 0.0\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"

2
regression/shapes/catmark_square_hedit1.h
View File

@ -73,8 +73,6 @@ 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 0.0 0.0\n"
"vn 0.0 0.0 0.0\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"

2
regression/shapes/catmark_square_hedit2.h
View File

@ -73,8 +73,6 @@ 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 0.0 0.0\n"
"vn 0.0 0.0 0.0\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"

2
regression/shapes/catmark_square_hedit3.h
View File

@ -73,8 +73,6 @@ 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 0.0 0.0\n"
"vn 0.0 0.0 0.0\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"

2
regression/shapes/catmark_square_hedit4.h
View File

@ -73,8 +73,6 @@ 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 0.0 0.0\n"
"vn 0.0 0.0 0.0\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"