X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=view.c;h=a395c8c513eef6da2e4a861fd03fc95f492aeb5e;hb=c479461fade5f228384e6c7eebad7e66a2386b7e;hp=72ea2372f81c90d66e372e583d9fb83925e9ae78;hpb=d9aa142b98fffa94e33f47056090d42f8d6afae3;p=moebius2.git diff --git a/view.c b/view.c index 72ea237..a395c8c 100644 --- a/view.c +++ b/view.c @@ -5,8 +5,6 @@ #include #include -#include -#include #include #include "mgraph.h" @@ -25,6 +23,7 @@ static GSL_MATRIX(transform); static FILE *input_f; static struct stat input_stab; static const char *input_filename; +static int pause_updates; static void read_input(void) { int r; @@ -46,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) ); @@ -54,6 +53,8 @@ static void transform_coordinates(void) { } } +static int vertex_in_triangles[N], vertex_in_triangles_checked; + static void addtriangle(int va, int vb, int vc) { Triangle *t= &trisbuffer[ntris]; int k; @@ -64,30 +65,51 @@ static void addtriangle(int va, int vb, int vc) { t->vertex[1][k]= conformation[vb][k]; t->vertex[2][k]= conformation[vc][k]; } + if (!vertex_in_triangles_checked) { + vertex_in_triangles[va]++; + vertex_in_triangles[vb]++; + vertex_in_triangles[vc]++; + } displaylist[ntris++]= t; } static void generate_display_list(void) { - int vb, ve[3], e; + int vb, ve[V6], e; ntris= 0; - FOR_VERTEX(vb) { - /* We use the two triangles in the parallelogram vb, vb+e0, vb+e1, vb+e2. + 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). + * orientable so it shouldn't matter). Picking the parallelogram + * to our right avoids getting it wrong at the join. */ - for (e=0; e<3; e++) ve[e]= EDGE_END2(vb,e); - if (ve[1]>=0) { - if (ve[0]>=0) addtriangle(vb,ve[0],ve[1]); - if (ve[2]>=0) addtriangle(vb,ve[1],ve[2]); +//if ((vb & YMASK) > Y1) continue; +//if ((vb & XMASK) > 2) continue; + for (e=0; e=0); + if (ve[5]>=0) addtriangle(vb,ve[0],ve[5]); +//continue; + if (ve[1]>=0) addtriangle(vb,ve[1],ve[0]); + } + + if (!vertex_in_triangles_checked) { + int v, expd; + 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", + v, vertex_in_triangles[v], expd); +// abort(); + } } + vertex_in_triangles_checked= 1; } } static int dl_compare(const void *tav, const void *tbv) { int i; const Triangle *const *tap= tav, *ta= *tap; - const Triangle *const *tbp= tbp, *tb= *tbp; + const Triangle *const *tbp= tbv, *tb= *tbp; double za=0, zb=0; for (i=0; i<3; i++) { za += ta->vertex[i][2]; @@ -128,7 +150,7 @@ static void drawtriangle(const Triangle *t) { int i; for (i=0; i<3; i++) { - double *v= t->vertex[i]; + const double *v= t->vertex[i]; double x= v[0]; double y= v[1]; double z= v[2]; @@ -150,7 +172,7 @@ static void drawtriangle(const Triangle *t) { static const unsigned long core_event_mask= ButtonPressMask|ButtonReleaseMask|StructureNotifyMask|ButtonMotionMask| - KeyPressMask; + KeyPressMask|SubstructureNotifyMask; static void mkpixmaps(void) { for (currentbuffer=0; currentbuffer<2; currentbuffer++) { @@ -315,7 +337,7 @@ static void make_z_rotation(double rotz[D3][D3], double cz, double sz) { rotz[0][0]= cz; rotz[0][1]= sz; rotz[0][2]= 0; rotz[1][0]= -sz; rotz[1][1]= cz; rotz[1][2]= 0; rotz[2][0]= 0; rotz[2][1]= 0; rotz[2][2]= 1; -} +} static void drag_rotate_delta(double dx, double dy) { /* We multiple our transformation matrix by a matrix: @@ -518,10 +540,38 @@ static void event_motion(int x, int y) { drag_position(x,y); } +static void transform_preset_record(const char *fn, const char *fn_new) { + FILE *f; + f= fopen(fn_new,"wb"); + if (!f) diee("open new transform"); + if (fwrite(transform,sizeof(transform),1,f) != 1) diee("write transform"); + if (fclose(f)) diee("fclose new transform"); + if (rename(fn_new,fn)) diee("install transform"); +} + +static void transform_preset_playback(const char *fn) { + FILE *f; + f= fopen(fn,"rb"); + if (!f && errno==ENOENT) { + fprintf(stderr,"no preset %s\n",fn); + XBell(display,100); + return; + } + errno= 0; + if (fread(transform,sizeof(transform),1,f) != 1) { + perror("read preset!"); + XBell(display,100); + return; + } + fclose(f); + show(); +} + static void event_key(XKeyEvent *e) { KeySym ks; - char buf[10]; - int r; + XKeyEvent e_nomod; + char buf[10], buf_nomod[10]; + int r, r_nomod; r= XLookupString(e,buf,sizeof(buf)-1,&ks,0); if (!r) { @@ -530,17 +580,43 @@ static void event_key(XKeyEvent *e) { return; } - if (!strcmp(buf,"q")) exit(0); - if (!strcmp(buf,"w")) { + if (!strcmp(buf,"q")) + exit(0); + else if (!strcmp(buf,"p")) + pause_updates= !pause_updates; + else if (!strcmp(buf,"w")) { wireframe= !wireframe; show(); return; - } - if (!strcmp(buf,"d")) { + } else if (!strcmp(buf,"d")) { eyes_apart= eyes_apart>0 ? eyes_apart_min : eyes_apart_preferred; show(); return; } + + e_nomod= *e; + e_nomod.state= 0; + buf_nomod[0]= 0; + r_nomod= XLookupString(&e_nomod,buf_nomod,sizeof(buf_nomod)-1,&ks,0); + if (r_nomod && !buf_nomod[1] && buf_nomod[0]>='0' && buf_nomod[0]<='9') { + char filename[20], filename_new[25]; + snprintf(filename,sizeof(filename)-1,".view-preset-%s",buf_nomod); + snprintf(filename_new,sizeof(filename_new)-1,"%s.new",filename); + printf("transform preset %d %s\n", e->state, filename); + if (e->state) transform_preset_record(filename,filename_new); + else transform_preset_playback(filename); + return; + } + + printf("unknown key keycode=%d state=0x%x char=%c 0x%02x " + "[rnm=%d bnm[0,1]=0x%02x,%02x]\n", + e->keycode, e->state, buf[0]>' ' && buf[0]<127 ? buf[0] : '?', + buf[0], r_nomod, buf_nomod[0], buf_nomod[1]); + printf("%d %d %d %d\n", + r_nomod, + !buf_nomod[1], + buf_nomod[0]>='0', + buf_nomod[0]<='9'); } static void event_config(XConfigureEvent *e) { @@ -578,6 +654,23 @@ static void check_input(void) { show(); } +static void topocheck(void) { + int v1,e,v2,eprime,v1prime, count; + FOR_EDGE(v1,e,v2, INNER) { + count= 0; + FOR_VEDGE(v2,eprime,v1prime) + if (v1prime==v1) count++; + if (count!=1) { + fprintf(stderr,"%02x -%d-> %02x reverse edge count = %d!\n", + v1,e,v2, count); + FOR_VEDGE(v2,eprime,v1prime) + fprintf(stderr,"%02x -%d-> %02x -> %d -> %02x\n", + v1,e,v2,eprime,v1prime); + exit(-1); + } + } +} + int main(int argc, const char *const *argv) { static const int wantedevents= POLLIN|POLLPRI|POLLERR|POLLHUP; @@ -585,6 +678,10 @@ int main(int argc, const char *const *argv) { int k, i, r, *xfds, nxfds, polls_alloc=0; 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); } if (argc != 2 || argv[1][0]=='-') { fputs("need filename\n",stderr); exit(8); @@ -615,8 +712,11 @@ int main(int argc, const char *const *argv) { polls[i].fd= ConnectionNumber(display); polls[i].events= wantedevents; - r= poll(polls, nxfds+1, motion_deferred ? 0 : 200); - if (r<0) diee("poll"); + r= poll(polls, nxfds+1, motion_deferred ? 0 : pause_updates ? -1 : 200); + if (r<0) { + if (errno==EINTR) continue; + diee("poll"); + } for (i=0; i