From ebde46bc82bebf478db67abef5b7dc88c014706b Mon Sep 17 00:00:00 2001 From: epoch Date: Tue, 3 Jan 2017 00:30:28 -0600 Subject: lots and lots of shit. opengl shit is barely worked on. new pl script to obj2hackvr using more than just triangles.http://hackaday.com/blog/http://hackaday.com/blog/ --- src/graphics.c | 560 ++++++++++----------------------------------------------- 1 file changed, 95 insertions(+), 465 deletions(-) (limited to 'src/graphics.c') diff --git a/src/graphics.c b/src/graphics.c index 31f0274..a8a8e69 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -8,10 +8,6 @@ #include #include //#include //code to use select instead of non-blocking is commented out. might decide to use it later. -#include -#include -#include -#include //for size hints #include #define __USE_GNU //for longer math constants #include @@ -19,6 +15,10 @@ #include "config.h" #include "common.h" +//choose which graphic's end you want here I guess? +#include "graphics_x11.h" +#include "graphics.h" + //typedef float real; //think this conflicts? //TODO: will have to make some pixmaps get resized when the window does. @@ -28,10 +28,8 @@ #define SKYW (WIDTH*5) #define SKYH (HEIGHT/2) -Pixmap skypixmap; -char sky[SKYH][SKYW]; - -extern struct mainwin global; +extern struct global global; +struct gra_global gra_global; #ifdef GRAPHICAL @@ -43,11 +41,11 @@ extern struct mainwin global; #define RIGHT 320.0 #define LEFT -320.0 -int c2sX(long double x) { return (global.width/(global.split_screen / (global.red_and_blue ? global.split_screen: 1))) * ((x + RIGHT) / (RIGHT *2)) + global.xoff; } -int s2cX(long double x) { return (x/(global.width/(global.split_screen / (global.red_and_blue?global.split_screen :1))))*(RIGHT*2)-RIGHT; } +int c2sX(real x) { return (gra_global.width/(gra_global.split_screen / (gra_global.red_and_blue ? gra_global.split_screen: 1))) * ((x + RIGHT) / (RIGHT *2)) + gra_global.xoff; } +int s2cX(real x) { return (x/(gra_global.width/(gra_global.split_screen / (gra_global.red_and_blue?gra_global.split_screen :1))))*(RIGHT*2)-RIGHT; } -int c2sY(long double y) { return global.height * ((TOP-y) / (TOP*2)); } -int s2cY(long double y) { return -((y/global.height) * (TOP*2) - TOP); } +int c2sY(real y) { return gra_global.height * ((TOP-y) / (TOP*2)); } +int s2cY(real y) { return -((y/gra_global.height) * (TOP*2) - TOP); } cs_t c2_to_cs(c2_t p) { return (cs_t){c2sX(p.x),c2sY(p.y)}; @@ -56,22 +54,22 @@ c2_t cs_to_c2(cs_t p) { return (c2_t){s2cX(p.x),s2cY(p.y)}; } -long double distance2(c2_t p1,c2_t p2) { +real distance2(c2_t p1,c2_t p2) { return sqrtl(( (p1.x-p2.x)*(p1.x-p2.x) )+( (p1.y-p2.y)*(p1.y-p2.y) )); } -long double distance3(c3_t p1,c3_t p2) { +real distance3(c3_t p1,c3_t p2) { return sqrtl(( (p1.x-p2.x)*(p1.x-p2.x) )+( (p1.y-p2.y)*(p1.y-p2.y) )+( (p1.z-p2.z)*(p1.z-p2.z) )); } -long double points_to_angle(c2_t p1,c2_t p2) { - long double a=atan2l(p2.y-p1.y,p2.x-p1.x); +real points_to_angle(c2_t p1,c2_t p2) { + real a=atan2l(p2.y-p1.y,p2.x-p1.x); return a>=0?a:M_PIl+M_PIl+a; } -long double d2r(int d) { +real d2r(int d) { while(d<0) d+=360; - return (long double)(d%360) / (long double)180 * M_PIl; + return (real)(d%360) / (real)180 * M_PIl; } int r2d(real r) { return r / M_PIl * 180; @@ -154,14 +152,21 @@ int get_2D_intersection_Y(x,y,d,x,z,d) { } */ -void draw_cs_line(cs_t p1,cs_t p2) { - XDrawLine(global.dpy,global.backbuffer,global.backgc,p1.x,p1.y,p2.x,p2.y); -} - void draw_c2_line(c2_t p1,c2_t p2) { draw_cs_line(c2_to_cs(p1),c2_to_cs(p2)); } +void draw_c3_shape(c3_s_t s) {//outlined. needs to be filled? + int i; + cs_s_t ss; + ss.id=s.id;//it shouldn't disappear and we shouldn't need to make a copy. + ss.len=s.len; + for(i=0;id) > (b->d)); } @@ -406,80 +333,80 @@ int compar(zsort_t *a,zsort_t *b) { /* void draw_c3_point_text(c3_t p,char *text) { - char coords[256]; + char tmp[256]; int direction,ascent,descent; cs_t p2; p2=c3_to_cs(p); - snprintf(coords,sizeof(coords)-1,"(%Lf,%Lf,%Lf)",p.x,p.y,p.z); + snprintf(tmp,sizeof(tmp)-1,"(%Lf,%Lf,%Lf)",p.x,p.y,p.z); XTextExtents(font,text,strlen(text),&direction,&ascent,&descent,&overall); - XDrawString(global.dpy,global.backbuffer,global.backgc,p2.x,p2.y+(descent+ascent),coords,strlen(coords)); + XDrawString(global.dpy,global.backbuffer,global.backgc,p2.x,p2.y+(descent+ascent),tmp,strlen(tmp)); }*/ -void draw_screen(Display *dpy,Window w,GC gc) { +//push a string back into stdin so it can be read by the file loader. :P +int selfcommand(char *s) { + char t; + if(!strlen(s)) return 0; + ungetc(s[strlen(s)-1],stdin); + t=s[strlen(s)-1]; + s[strlen(s)-1]=0; + selfcommand(s); + putchar(t); + return 0; +} +#endif + +void draw_screen() { int i; int colori=100; int cn=0;//camera number. - XFontStruct *font=XLoadQueryFont(global.dpy,"fixed"); - XCharStruct overall; - int direction,ascent,descent; - char coords[256]; - XGCValues gcval; + char tmp[256]; zsort_t zs[SHAPES]; - XCopyArea(global.dpy,global.cleanbackbuffer,global.backbuffer,gc,0,0,global.width,global.height,0,0);//clear the backbuffer. -// XCopyPlane(global.dpy,global.cleanbackbuffer,global.backbuffer,gc,0,0,global.width,global.height,0,0,1);//clear the backbuffer. - XRectangle cliprect; - cliprect.x=0; - cliprect.y=0; - cliprect.width=global.width/global.split_screen; - cliprect.height=global.height; + clear_backbuffer(); real oldx=camera.p.x; real oldz=camera.p.z; - if(global.split_screen > 1) { - camera.p.z-=(global.split_flip)*((global.split/global.split_screen)*cosl(d2r(camera.yr+180))); - camera.p.x-=(global.split_flip)*((global.split/global.split_screen)*sinl(d2r(camera.yr+180))); + if(gra_global.split_screen > 1) { + camera.p.z-=(gra_global.split_flip)*((gra_global.split/gra_global.split_screen)*cosl(d2r(camera.yr+180))); + camera.p.x-=(gra_global.split_flip)*((gra_global.split/gra_global.split_screen)*sinl(d2r(camera.yr+180))); } - for(cn=0;cnid)) { //XSetForeground(global.dpy,global.backgc,global.green.pixel); } else { - if(global.greyscale) { + if(gra_global.greyscale) { if(zs[i].d > 0) { if(zs[i].d < 100) { colori=zs[i].d; } } colori=(int)(zs[i].d)%100; - XSetForeground(global.dpy,global.backgc,global.colors[(int)(100.0-(colori))].pixel);//picking the color here only works if... +// XSetForeground(global.dpy,global.backgc,global.colors[(int)(100.0-(colori))].pixel);//picking the color here only works if... } } } + set_color(); draw_c3_shape(*(zs[i].s)); } - XSetForeground(global.dpy, global.backgc, global.green.pixel); +// XSetForeground(global.dpy, global.backgc, global.green.pixel); if(global.debug) { - snprintf(coords,sizeof(coords)-1,"selected object: %s",global.selected_object); - XTextExtents(font,coords,strlen(coords),&direction,&ascent,&descent,&overall); - XDrawString(global.dpy,global.backbuffer,global.backgc,global.xoff,global.height/2+(descent+0+ascent)*5,coords,strlen(coords)); + snprintf(tmp,sizeof(tmp)-1,"selected object: %s",global.selected_object); + draw_cs_text((cs_t){gra_global.xoff,(gra_global.height/2)+50},tmp); } - camera.p.z+=(global.split_flip)*(global.split*cosl(d2r(camera.yr+180))); - camera.p.x+=(global.split_flip)*(global.split*sinl(d2r(camera.yr+180))); - - + camera.p.z+=(gra_global.split_flip)*(gra_global.split*cosl(d2r(camera.yr+180))); + camera.p.x+=(gra_global.split_flip)*(gra_global.split*sinl(d2r(camera.yr+180))); } //TODO: figure out what all this shit is and either update or remove. @@ -592,12 +517,12 @@ void draw_screen(Display *dpy,Window w,GC gc) { y1=global.mousey; real a=points_to_angle((c2_t){0,0},cs_to_c2((cs_t){x1,y1})); - snprintf(coords,sizeof(coords)-1,"%llf",a); - XTextExtents(font,coords,strlen(coords),&direction,&ascent,&descent,&overall); - XDrawString(global.dpy,w,gc,global.xoff,(descent+0+ascent)*6,coords,strlen(coords)); - snprintf(coords,sizeof(coords)-1,"%llf",points_to_angle(cs_to_c2((cs_t){global.mousex,global.mousey}),(c2_t){0,0})+(M_PIl/2)); - XTextExtents(font,coords,strlen(coords),&direction,&ascent,&descent,&overall); - XDrawString(global.dpy,w,gc,global.xoff,(descent+0+ascent)*7,coords,strlen(coords)); + snprintf(tmp,sizeof(tmp)-1,"%llf",a); + XTextExtents(font,tmp,strlen(tmp),&direction,&ascent,&descent,&overall); + XDrawString(global.dpy,w,gc,global.xoff,(descent+0+ascent)*6,tmp,strlen(tmp)); + snprintf(tmp,sizeof(tmp)-1,"%llf",points_to_angle(cs_to_c2((cs_t){global.mousex,global.mousey}),(c2_t){0,0})+(M_PIl/2)); + XTextExtents(font,tmp,strlen(tmp),&direction,&ascent,&descent,&overall); + XDrawString(global.dpy,w,gc,global.xoff,(descent+0+ascent)*7,tmp,strlen(tmp)); XDrawLine(global.dpy,w,gc,global.mousex,global.mousey,global.width/2,global.height/2); real c=cosl(d2r(camera.yr) - a) * distance((c2_t){x1,y1},(c2_t){WIDTH/2,HEIGHT/2}); @@ -607,300 +532,5 @@ void draw_screen(Display *dpy,Window w,GC gc) { */ camera.p.x = oldx; camera.p.z = oldz; //-= cn*CAMERA_SEPARATION; -// XClearWindow(global.dpy, w); - XCopyArea(global.dpy,global.backbuffer,w,gc,0,0,global.width,global.height,0,0);//move backbuffer to window -// XCopyPlane(global.dpy,global.backbuffer,w,gc,0,0,global.width,global.height,0,0,0x000100);//move backbuffer to window -} - -void set_aspect_ratio() { - XSizeHints *hints=XAllocSizeHints(); - hints->min_aspect.x=4*(global.split_screen / (global.red_and_blue ? global.split_screen : 1)); - hints->min_aspect.y=3; - hints->max_aspect.x=4*(global.split_screen / (global.red_and_blue ? global.split_screen : 1)); - hints->max_aspect.y=3; - hints->flags=PAspect; - XSetWMNormalHints(global.dpy,global.w,hints); -} -#endif - -#ifdef GRAPHICAL -//push a string back into stdin so it can be read by the file loader. :P -int selfcommand(char *s) { - char t; - if(!strlen(s)) return 0; - ungetc(s[strlen(s)-1],stdin); - t=s[strlen(s)-1]; - s[strlen(s)-1]=0; - selfcommand(s); - putchar(t); - return 0; -} - -int keypress_handler(int sym) { - char line[1024]; - real tmpx; -// real tmpy; //unused atm - real tmpz; - switch(sym) { - case XK_Return: - snprintf(line,sizeof(line)-1,"%s action %s\n",global.user,global.selected_object); - selfcommand(line); - break; - case XK_Up: - tmpx=WALK_SPEED*sinl(d2r(camera.yr+90)); - tmpz=WALK_SPEED*cosl(d2r(camera.yr+90)); - camera.p.x+=tmpx; - camera.p.z+=tmpz; - snprintf(line,sizeof(line)-1,"%s move %Lf 0 %Lf 0 0 0 0 0 0\n",global.user,tmpx,tmpz); - selfcommand(line); - break; - case XK_Down: - tmpx=WALK_SPEED*sinl(d2r(camera.yr+270)); - tmpz=WALK_SPEED*cosl(d2r(camera.yr+270)); - camera.p.x+=tmpx; - camera.p.z+=tmpz; - snprintf(line,sizeof(line)-1,"%s move %Lf 0 %Lf 0 0 0 0 0 0\n",global.user,tmpx,tmpz); - selfcommand(line); - break; - case XK_Left: - tmpx=WALK_SPEED*sinl(d2r(camera.yr)); - tmpz=WALK_SPEED*cosl(d2r(camera.yr)); - camera.p.x+=tmpx; - camera.p.z+=tmpz; - snprintf(line,sizeof(line)-1,"%s move %Lf 0 %Lf 0 0 0 0 0 0\n",global.user,tmpx,tmpz); - selfcommand(line); - break; - case XK_Right: - tmpx=WALK_SPEED*sinl(d2r(camera.yr+180)); - tmpz=WALK_SPEED*cosl(d2r(camera.yr+180)); - camera.p.x+=tmpx; - camera.p.z+=tmpz; - snprintf(line,sizeof(line)-1,"%s move %Lf 0 %Lf 0 0 0 0 0 0\n",global.user,tmpx,tmpz); - selfcommand(line); - break; - case XK_w: - camera.p.y+=1; - snprintf(line,sizeof(line)-1,"%s move 0 1 0 0 0 0 0 0 0\n",global.user); - selfcommand(line); - break; - case XK_s: - camera.p.y-=1; - snprintf(line,sizeof(line)-1,"%s move 0 -1 0 0 0 0 0 0 0\n",global.user); - selfcommand(line); - break; - case XK_r: - camera.xr+=5; - while(camera.xr > 360) camera.xr-=360; - break; - case XK_y: - camera.xr-=5; - while(camera.xr < 0) camera.xr+=360; - break; - case XK_q: - camera.yr+=5; - while(camera.yr > 360) camera.yr-=360; - break; - case XK_e: - camera.yr-=5; - while(camera.yr < 0) camera.yr+=360; - break; - case XK_u: - camera.zr+=5; - while(camera.zr > 360) camera.zr-=360; - break; - case XK_o: - camera.zr-=5; - while(camera.zr < 0) camera.zr+=360; - break; - case XK_z: camera.zoom+=1; break; - case XK_x: camera.zoom-=1; break; - case XK_c: global.mmz*=1.1; break; - case XK_v: global.mmz/=1.1; break; - case XK_h: global.split+=1; break; - case XK_j: global.split-=1; break; - case XK_d: - global.debug ^= 1; - break; - case XK_f: - global.derp ^= 1; - break; - case XK_m: - global.drawminimap += 1; - global.drawminimap %= 4; - break; - case XK_a: - global.drawsky ^= 1; - break; - case XK_3: - global.draw3d += 1; - global.draw3d %= 4; - break; - case XK_Escape: - return -1; - default: - return 0; - break; - } - return 1; -} -#endif - -int x11_init() { - int i,j; - char tmp[64]; - Cursor cursor; - XSetWindowAttributes attributes; -// Window root,child;//why do I have this? -// XColor toss; - printf("# Opening X Display... (%s)\n",getenv("DISPLAY")); - if((global.dpy = XOpenDisplay(0)) == NULL) return printf("# failure.\n"),2; - else printf("# done.\n"); - global.color_map=DefaultColormap(global.dpy, DefaultScreen(global.dpy)); - printf("# generating grays...\n"); - for(i=0;i<=100;i++) { - snprintf(tmp,sizeof(tmp),"gray%d",i); - XAllocNamedColor(global.dpy,global.color_map,tmp,&global.colors[i],&global.colors[i]); - } - printf("# done.\n"); - assert(global.dpy); - global.split_screen=SPLIT_SCREEN; - global.split_flip=-1; - global.split=5; - global.root_window=0; - global.red_and_blue=RED_AND_BLUE; - //global.colors[0]=BlackPixel(global.dpy,DefaultScreen(global.dpy)); -// int whiteColor = //WhitePixel(global.dpy, DefaultScreen(global.dpy)); - attributes.background_pixel=global.colors[0].pixel; - if(global.root_window) { - global.w = DefaultRootWindow(global.dpy); //this is still buggy. - } else { - global.w = XCreateWindow(global.dpy,DefaultRootWindow(global.dpy),0,0,WIDTH*(global.split_screen / (global.red_and_blue ? global.split_screen : 1)),HEIGHT,1,DefaultDepth(global.dpy,DefaultScreen(global.dpy)),InputOutput,DefaultVisual(global.dpy,DefaultScreen(global.dpy))\ - ,CWBackPixel, &attributes); - set_aspect_ratio(); - XSelectInput(global.dpy, global.w, PointerMotionMask|StructureNotifyMask|ButtonPressMask|ButtonReleaseMask|KeyPressMask|ExposureMask); - } - XMapWindow(global.dpy, global.w); - XStoreName(global.dpy,global.w,"hackvr"); - global.greyscale=1; - global.zsort=1; - global.shape[0]=0;//we'll allocate as we need more. - global.gc=XCreateGC(global.dpy, global.w, 0, 0); - - if(global.red_and_blue) { - global.width=WIDTH; - } else { - global.width=WIDTH*global.split_screen; - } - global.height=HEIGHT; - - global.backbuffer=XCreatePixmap(global.dpy,global.w,global.width,global.height,DefaultDepth(global.dpy,DefaultScreen(global.dpy))); - global.cleanbackbuffer=XCreatePixmap(global.dpy,global.w,global.width,global.height,DefaultDepth(global.dpy,DefaultScreen(global.dpy))); - -//backbuffer is uninitialized - global.backgc=XCreateGC(global.dpy,global.backbuffer,0,0); - - cursor=XCreateFontCursor(global.dpy,XC_crosshair); - XDefineCursor(global.dpy, global.w, cursor); - - XAllocNamedColor(global.dpy, global.color_map, "green", &global.green, &global.green); - XAllocNamedColor(global.dpy, global.color_map, "red", &global.red, &global.red); - XAllocNamedColor(global.dpy, global.color_map, "blue", &global.blue, &global.blue); - XAllocNamedColor(global.dpy, global.color_map, "red", &global.redblue[0], &global.redblue[0]); - XAllocNamedColor(global.dpy, global.color_map, "blue", &global.redblue[1], &global.redblue[1]); - XSetForeground(global.dpy, global.gc, global.green.pixel); - XSetForeground(global.dpy, global.backgc, global.colors[0].pixel);//black. we're about to draw the blank background using this. - XSetBackground(global.dpy, global.gc, global.colors[160].pixel); - XSetBackground(global.dpy, global.backgc, global.colors[140].pixel); - - XFillRectangle(global.dpy,global.cleanbackbuffer,global.backgc,0,0,global.width,global.height); - XSetForeground(global.dpy, global.backgc, global.green.pixel); - -// XSetForeground(global.dpy, gc, whiteColor); -// this was taking a "long" time. - printf("# generating sky... "); - skypixmap=XCreatePixmap(global.dpy,global.w,SKYW,SKYH,DefaultDepth(global.dpy,DefaultScreen(global.dpy))); - for(i=0;i> ((!!sky[i-1][(j+(SKYW)-1)%(SKYW)]<<2) | (!!sky[i-1][j]<<1) | (!!sky[i-1][j+1%(SKYW)])) & 1); - if(sky[i][j]) { - XDrawPoint(global.dpy,skypixmap,global.backgc,j,i); - } - } - } - } - printf("done.\n"); - - global.mapxoff=global.width/2; - global.mapyoff=global.height/2; - global.drawminimap=0; - global.draw3d=1; - global.force_redraw=1;//use this for checking proper fps I guess. - camera.zoom=30.0l; - camera.xr=270; - camera.yr=270; - camera.zr=0; - global.mmz=1; - camera.p.x=0; - camera.p.z=6; - camera.p.y=5; - return 0; -} - -int x11_event_handler() { - int redraw=0; - XEvent e; - Window child,root; - //what sets mask? - unsigned int mask; - while(XPending(global.dpy)) {//these are taking too long? - XNextEvent(global.dpy, &e); -// printf("# handling event with type: %d\n",e.type); - switch(e.type) { -// case Expose: -// if(e.xexpose.count == 0) redraw=1; -// break; - case MotionNotify: - XQueryPointer(global.dpy,global.w,&root,&child,&global.rmousex,&global.rmousey,&global.mousex,&global.mousey,&mask); - redraw=1; - break; - case ButtonPress: - redraw=1; - global.buttonpressed=e.xbutton.button; - break; - case ButtonRelease: - redraw=1; - global.buttonpressed=0; - break; - case ConfigureNotify: - redraw=1; - XGetGeometry(global.dpy,global.w,&root,&global.x,&global.y,&global.width,&global.height,&global.border_width,&global.depth); - if(global.width / (global.split_screen / (global.red_and_blue ? global.split_screen : 1 )) / 4 * 3 != global.height) { - if(global.height * 3 / 4 == global.height) { - printf("math doesn't work.\n"); - } - printf("# DERPY WM CANT TAKE A HINT %d / %d / 4 * 3 = %d != %d\n",global.width,global.split_screen,global.width /global.split_screen /4 * 3,global.height); - if(global.width / (global.split_screen / (global.red_and_blue ? global.split_screen : 1)) / 4 * 3 < global.height) { - global.height=global.width / (global.split_screen / (global.red_and_blue ? global.split_screen : 1)) / 4 * 3; - } else { - global.width=global.height * 3 / 4 * (global.split_screen / (global.red_and_blue ? global.split_screen : 1)); - } - } - global.mapxoff=global.width/(global.split_screen / (global.red_and_blue ? global.split_screen : 1))/2; - global.mapyoff=global.height/2; - break; - case KeyPress: - redraw=1; - if(keypress_handler(XLookupKeysym(&e.xkey,0)) == -1) { - printf("# exiting\n"); - return -1; - } - break; - default: - //printf("# received event with type: %d\n",e.type); - break; - } - } - return redraw; + flipscreen(); } -- cgit v1.2.3