--- ray/src/util/glrad.c 1998/06/10 17:52:18 3.4 +++ ray/src/util/glrad.c 2003/05/19 16:32:19 3.14 @@ -1,22 +1,20 @@ -/* Copyright (c) 1998 Silicon Graphics, Inc. */ - #ifndef lint -static char SCCSid[] = "$SunId$ SGI"; +static const char RCSid[] = "$Id: glrad.c,v 3.14 2003/05/19 16:32:19 greg Exp $"; #endif - /* * Program to display Radiance scene using OpenGL. */ -#include "radogl.h" -#include "view.h" -#include "paths.h" #include #include #ifndef NOSTEREO #include #endif #include +#include +#include "radogl.h" +#include "view.h" +#include "paths.h" #include "glradicon.h" #ifndef MAXVIEW @@ -33,9 +31,6 @@ static char SCCSid[] = "$SunId$ SGI"; #define MOVDEG (-5) /* degrees to orbit CW/down /frame */ #define MOVORB(s) ((s)&ShiftMask ? 1 : (s)&ControlMask ? -1 : 0) -#define MINWIDTH 480 /* minimum graphics window width */ -#define MINHEIGHT 400 /* minimum graphics window height */ - #define BORWIDTH 5 /* border width */ #define ourscreen DefaultScreen(ourdisplay) @@ -93,15 +88,10 @@ int stereo = 0; /* do stereo? */ int displist; /* our scene display list */ -int in_dev_view = 0; /* currently in dev_view() */ +int no_render = 0; /* don't rerender */ -#ifdef BSD -#define strchr index -#endif - -extern char *strchr(), *fgets(), *fgetline(), *atos(), *scan4var(); +extern char *fgetline(), *atos(), *scan4var(); extern int nowarn; /* turn warnings off? */ -extern time_t time(); main(argc, argv) @@ -164,10 +154,10 @@ char *argv[]; dev_open(radfile = argv[i]); /* load octree or scene files */ if (octree != NULL) { - displist = rgl_octlist(octree, NULL, NULL); + displist = rgl_octlist(octree, NULL, NULL, NULL); startrtrace(octree); } else - displist = rgl_filelist(nscenef, scene); + displist = rgl_filelist(nscenef, scene, NULL); /* set initial view */ dev_view(currentview < 0 ? &thisview : vwl[currentview].v); /* input/render loop */ @@ -176,12 +166,14 @@ char *argv[]; /* all done */ quit(0); userr: - fprintf(stderr, "Usage: %s [-w][-b][-v view] rfile [VAR=value]..\n", + fprintf(stderr, + "Usage: %s [-w][-s][-b][-S][-v view] rfile [VAR=value]..\n", argv[0]); quit(1); } +void quit(code) /* exit gracefully */ int code; { @@ -300,7 +292,7 @@ char **av; atof(sskip2(buf+4,1)), atof(sskip2(buf+4,2))); else if (backvis && !strncmp(buf, "-bv", 3) && - (!buf[3] || strchr(" 0-FfNn", buf[3]) != NULL)) + (!buf[3] || strchr("0-FfNn \n",buf[3])!=NULL)) backvis = 0; fclose(fp); unlink(optfile); /* delete options file */ @@ -374,7 +366,6 @@ char *id; GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE,15, None}; XSetWindowAttributes ourwinattr; XWMHints ourxwmhints; - XSizeHints oursizhints; /* open display server */ ourdisplay = XOpenDisplay(NULL); if (ourdisplay == NULL) @@ -421,25 +412,20 @@ char *id; ourxwmhints.icon_pixmap = XCreateBitmapFromData(ourdisplay, gwind, glradicon_bits, glradicon_width, glradicon_height); XSetWMHints(ourdisplay, gwind, &ourxwmhints); - oursizhints.min_width = MINWIDTH; - oursizhints.min_height = stereo ? MINHEIGHT/2 : MINHEIGHT; - oursizhints.flags = PMinSize; - XSetNormalHints(ourdisplay, gwind, &oursizhints); /* set GLX context */ glXMakeCurrent(ourdisplay, gwind, gctx); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LESS); glShadeModel(GL_SMOOTH); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - glLightModelf(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE); + glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE); glEnable(GL_LIGHTING); + glFrontFace(GL_CCW); + glCullFace(GL_BACK); if (backvis) glDisable(GL_CULL_FACE); - else { - glFrontFace(GL_CCW); - glCullFace(GL_BACK); + else glEnable(GL_CULL_FACE); - } glDrawBuffer(GL_BACK); /* figure out sensible view */ pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) / @@ -452,9 +438,11 @@ char *id; } /* map the window */ XMapWindow(ourdisplay, gwind); + no_render++; do dev_input(0); /* get resize event */ while (hres == 0 & vres == 0); + no_render--; rgl_checkerr("initializing GLX"); } @@ -505,12 +493,12 @@ register VIEW *nv; } } if (newhres != hres | newvres != vres) { - in_dev_view++; + no_render++; XResizeWindow(ourdisplay, gwind, newhres, newvres); do dev_input(0); /* get resize event */ while (newhres != hres | newvres != vres); - in_dev_view--; + no_render--; } } copystruct(&thisview, nv); @@ -564,7 +552,7 @@ render() /* render our display list and swap buffers { double d; - if (!mapped) + if (!mapped | no_render) return; glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); glCallList(displist); @@ -632,6 +620,16 @@ int dx, dy, mov, orb; } +static +waitabit() /* pause a moment */ +{ + struct timespec ts; + ts.tv_sec = 0; + ts.tv_nsec = 5000000; + nanosleep(&ts, NULL); +} + + getmove(ebut) /* get view change */ XButtonPressedEvent *ebut; { @@ -648,6 +646,8 @@ XButtonPressedEvent *ebut; while (!XCheckMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent))) { + /* pause so as not to move too fast */ + waitabit(); if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw, &rootx, &rooty, &wx, &wy, &statemask)) @@ -683,8 +683,8 @@ double md; if (md <= FTINY) md = FHUGE; fbuf[3] = dir[0]*md; fbuf[4] = dir[1]*md; fbuf[5] = dir[2]*md; /* trace that ray */ - if (process(rtpd, fbuf, fbuf, 4*sizeof(float), 6*sizeof(float)) != - 4*sizeof(float)) + if (process(rtpd, (char *)fbuf, (char *)fbuf, + 4*sizeof(float), 6*sizeof(float)) != 4*sizeof(float)) error(INTERNAL, "error getting data back from rtrace process"); if (fbuf[3] >= .99*FHUGE) return(0); /* missed local objects */ @@ -815,8 +815,6 @@ int vwnum; ; else if (vwnum >= MAXVIEW || vwl[vwnum].v == NULL) vwnum = 0; - if (vwnum == currentview) - return; copylastv("standard view"); dev_view(vwl[currentview=vwnum].v); } @@ -890,7 +888,7 @@ register XConfigureEvent *ersz; glViewport(0, 0, hres=ersz->width, vres=ersz->height); if (hres > maxhres) maxhres = hres; if (vres > maxvres) maxvres = vres; - if (in_dev_view) + if (no_render) return; wa = (vres*pheight)/(hres*pwidth); va = viewaspect(&thisview);