X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=view.c;h=a395c8c513eef6da2e4a861fd03fc95f492aeb5e;hb=85df9315363ee8ec73509ffc5a69dd2b44c83983;hp=32ae7d7df8a8a39ecd9ad0785f0d2870bed54c89;hpb=c01a4fe080a448234b39afb7ea7f7a3c9c229fb7;p=moebius2.git diff --git a/view.c b/view.c index 32ae7d7..a395c8c 100644 --- a/view.c +++ b/view.c @@ -45,7 +45,7 @@ static void transform_coordinates(void) { int v, k; - FOR_VERTEX(v) { + FOR_VERTEX(v,INNER) { input_gsl.data= &conformation[v][0]; GA( gsl_blas_dgemv(CblasNoTrans, 1.0,&transform_gsl, &input_gsl, 0.0, &result_gsl) ); @@ -77,7 +77,7 @@ static void generate_display_list(void) { int vb, ve[V6], e; ntris= 0; - FOR_VERTEX(vb) { + FOR_VERTEX(vb,INNER) { /* We use the two triangles in the parallelogram vb, vb+e5, vb+e0, vb+e1. * We go round each triangle clockwise (although our surface is non- * orientable so it shouldn't matter). Picking the parallelogram @@ -94,7 +94,7 @@ static void generate_display_list(void) { if (!vertex_in_triangles_checked) { int v, expd; - FOR_VERTEX(v) { + FOR_VERTEX(v,INNER) { expd= RIM_VERTEX_P(v) ? 3 : 6; if (vertex_in_triangles[v] != expd) { fprintf(stderr,"vertex %02x used for %d triangles, expected %d\n", @@ -656,7 +656,7 @@ static void check_input(void) { static void topocheck(void) { int v1,e,v2,eprime,v1prime, count; - FOR_EDGE(v1,e,v2) { + FOR_EDGE(v1,e,v2, INNER) { count= 0; FOR_VEDGE(v2,eprime,v1prime) if (v1prime==v1) count++; @@ -679,6 +679,7 @@ int main(int argc, const char *const *argv) { struct pollfd *polls=0; int motion_deferred=0, motion_x=-1, motion_y=-1; + mgraph_prepare(); topocheck(); if (argc==1) { printf("topology self-consistent, ok\n"); exit(0); }