X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=moebius2.git;a=blobdiff_plain;f=project.c;h=266237f90b222be270b723c5845007ff85330e36;hp=521af66786895c6b7f5a51603a689cfe4db46b6a;hb=456ce271eea85ff5acfe6a4416fa6c085d998c64;hpb=a990bb85e8f41a0a60272546ecf04b45b2a2709c diff --git a/project.c b/project.c index 521af66..266237f 100644 --- a/project.c +++ b/project.c @@ -15,11 +15,8 @@ static Triangle trisbuffer[MAXTRIS], *displaylist[MAXTRIS]; static int ntris; static Vertices conformation; -#define STATIC_MATRIX(x) \ - static double x[D3][D3]; \ - static gsl_matrix x##_gsl= { D3,D3,D3,&x[0][0] }; - -STATIC_MATRIX(transform); +static double transform[D3][D3]= {{1,0,0}, {0,1,0}, {0,0,1}}; +static GSL_MATRIX(transform); const char *input_filename; @@ -34,9 +31,17 @@ static void read_input(void) { } static void transform_coordinates(void) { - int v; + double result[D3]; + GSL_VECTOR(result); + gsl_vector input_gsl= { D3,1 }; + int v, k; + FOR_VERTEX(v) { + input_gsl.data= &conformation[v][0]; + GA( gsl_blas_dgemv(CblasNoTrans, 1.0,&transform_gsl, &input_gsl, + 0.0, &result_gsl) ); + K conformation[v][k]= result[k]; } } @@ -71,10 +76,14 @@ static void generate_display_list(void) { } 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; - double za= ta->vertex[0][2]; - double zb= tb->vertex[0][2]; + double za=0, zb=0; + for (i=0; i<3; i++) { + za += ta->vertex[i][2]; + zb += tb->vertex[i][2]; + } return za > zb ? -1 : za < zb ? +1 : 0; } @@ -87,23 +96,22 @@ static void sort_display_list(void) { #define WSZ 400 +typedef struct { GC fillgc, linegc; } DrawingMode; + static Display *display; static Pixmap pixmap, doublebuffers[2]; static Window window; -static GC linegc, fillgc; + +static DrawingMode dmred, dmblue, dmwhite; +static const DrawingMode *dmcurrent; static int wwidth=WSZ, wheight=WSZ, wmindim=WSZ, wmaxdim=WSZ; static int ncut, currentbuffer, x11depth, x11screen; +XVisualInfo visinfo; -static double scale= 0.3; -static double eye_z= -10, eye_x= 0; +static double sizeadj_scale= 0.3, eyes_apart, scale_wmindim; +static double eye_z= -10, eye_x=0; static double cut_z= -9; -static void xdie(int l, const char *str) { - fprintf(stderr,"X library call failed, line %d: %s\n", l, str); -} - -#define XA(w) ((w) ? (void)0 : xdie(__LINE__, #w)) - static void drawtriangle(const Triangle *t) { XPoint points[4]; int i; @@ -117,13 +125,15 @@ static void drawtriangle(const Triangle *t) { if (z < cut_z) { ncut++; return; } double zezezp= eye_z / (eye_z - z); - points[i].x= scale * wmindim * (zezezp * (x - eye_x) + eye_x) + wwidth/2; - points[i].y= scale * wmindim * (zezezp * y ) + wheight/2; + points[i].x= scale_wmindim * (zezezp * (x - eye_x) + eye_x) + wwidth/2; + points[i].y= scale_wmindim * (zezezp * y ) + wheight/2; } points[3]= points[0]; - XA( XFillPolygon(display,pixmap,fillgc, points,3,Convex,CoordModeOrigin) ); - XA( XDrawLines(display,pixmap,linegc,points, 4,CoordModeOrigin) ); + XA( XFillPolygon(display,pixmap, dmcurrent->fillgc, + points,3,Convex,CoordModeOrigin) ); + XA( XDrawLines(display,pixmap, dmcurrent->linegc, + points, 4,CoordModeOrigin) ); } static const unsigned long core_event_mask= @@ -137,21 +147,35 @@ static void mkpixmaps(void) { currentbuffer= 0; } -static void display_prepare(void) { +static void mkgcs(DrawingMode *dm, unsigned long planes) { XGCValues gcv; + + gcv.function= GXcopy; + gcv.foreground= WhitePixel(display,x11screen); + gcv.plane_mask= planes; + dm->linegc= XCreateGC(display,pixmap, + GCFunction|GCForeground|GCPlaneMask, + &gcv); + + gcv.function= GXclear; + dm->fillgc= XCreateGC(display,pixmap, + GCFunction|GCPlaneMask, + &gcv); +} + +static void display_prepare(void) { XSetWindowAttributes wa; - XVisualInfo vinfo; XSizeHints hints; XA( display= XOpenDisplay(0) ); x11screen= DefaultScreen(display); x11depth= DefaultDepth(display,x11screen); - XA( XMatchVisualInfo(display,x11screen,x11depth, TrueColor,&vinfo) ); + XA( XMatchVisualInfo(display,x11screen,x11depth, TrueColor,&visinfo) ); wa.event_mask= core_event_mask; XA( window= XCreateWindow(display, DefaultRootWindow(display), 0,0, wwidth,wheight, 0,x11depth, - InputOutput, vinfo.visual, + InputOutput, visinfo.visual, CWEventMask, &wa) ); hints.flags= USPosition; @@ -161,25 +185,39 @@ static void display_prepare(void) { mkpixmaps(); - gcv.function= GXcopy; - gcv.plane_mask= ~0UL; - gcv.foreground= WhitePixel(display,x11screen); - linegc= XCreateGC(display,pixmap, GCFunction|GCPlaneMask|GCForeground, &gcv); - - gcv.function= GXclear; - gcv.plane_mask= ~0UL; - fillgc= XCreateGC(display,pixmap, GCFunction|GCPlaneMask, &gcv); + mkgcs(&dmwhite, AllPlanes); + mkgcs(&dmblue, visinfo.blue_mask); + mkgcs(&dmred, visinfo.red_mask); } -static void display_conformation(void) { +static void drawtriangles(const DrawingMode *dm) { Triangle *const *t; int i; - - pixmap= doublebuffers[currentbuffer]; - XA( XFillRectangle(display,pixmap,fillgc,0,0,wwidth,wheight) ); + + dmcurrent= dm; for (i=0, t=displaylist, ncut=0; i 0) { + const double preferred=0.05, beyond=0.07; + + eye_x= eyes_apart < preferred ? eyes_apart : + eyes_apart < beyond ? preferred : + eyes_apart - (beyond - preferred); + eye_x /= sizeadj_scale; + drawtriangles(&dmblue); + eye_x= -eye_x; + drawtriangles(&dmred); + } else { + drawtriangles(&dmwhite); + printf("shown, %d/%d triangles cut\n", ncut, ntris); + } XA( XSetWindowBackgroundPixmap(display,window,pixmap) ); XA( XClearWindow(display,window) ); @@ -187,6 +225,7 @@ static void display_conformation(void) { } static void show(void) { + scale_wmindim= sizeadj_scale * wmindim; read_input(); transform_coordinates(); generate_display_list(); @@ -226,41 +265,146 @@ static void drag_none_conclude(void) { } static void drag_none_abandon(void) { } DRAG(none); +static void pvectorcore(const char *n, double v[D3]) { + int k; + printf("%10s [ ",n); + K printf("%# 10.10f ",v[k]); + printf("]\n"); +} +static void pvector(const char *n, double v[D3]) { + pvectorcore(n,v); + putchar('\n'); +} +static void pmatrix(const char *n, double m[D3][D3]) { + int j; + for (j=0; jbutton) { case Button1: drag= &drag_rotate; break; - case Button2: drag= &drag_scale; break; + case Button2: drag= &drag_sizeadj; break; + case Button3: drag= &drag_3d; break; default: printf("unknown drag start %d\n", e->button); } printf("drag=%s press button=%lu start %d,%d\n", @@ -325,6 +470,7 @@ static void event_config(XConfigureEvent *e) { int main(int argc, const char *const *argv) { XEvent event; + int k; int motion_deferred=0, motion_x=-1, motion_y=-1; if (argc != 2 || argv[1][0]=='-') { @@ -333,6 +479,7 @@ int main(int argc, const char *const *argv) { input_filename= argv[1]; read_input(); + K transform[k][k]= 1.0; display_prepare(); show();