ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/sm_ogl.c
(Generate patch)

Comparing ray/src/hd/sm_ogl.c (file contents):
Revision 3.3 by gwlarson, Thu Sep 3 08:14:29 1998 UTC vs.
Revision 3.12 by gwlarson, Tue Jan 5 16:52:38 1999 UTC

# Line 16 | Line 16 | static char SCCSid[] = "$SunId$ SGI";
16   #include <GL/glu.h>
17   #include <glut.h>
18   #endif
19 < #include "object.h"
19 > #include "sm_flag.h"
20   #include "sm_list.h"
21   #include "sm_geom.h"
22 + #include "sm_qtree.h"
23 + #include "sm_stree.h"
24   #include "sm.h"
23 – #include "lookup.h"
25  
26   #ifdef TEST_DRIVER
27   #include "sm_draw.h"
# Line 29 | Line 30 | MAKE STATIC LATER: ui.c using for now;
30   */
31   char smClean_notify = TRUE;
32   #else
33 < static char smClean_notify = TRUE;
33 > static int smClean_notify = TRUE;
34   #endif
35  
35 – extern unsigned long qthash();
36 – extern int qtcmp();
37 – extern int free();
38 –
39 – static LUTAB qtr_tab = {qthash,qtcmp,NULL,(void (*)())free,0,NULL,0};
40 –
36   typedef struct {
42 –        BYTE    rgb[3];         /* average color */
37          float   dist;           /* average distance */
38 +        BYTE    rgb[3];         /* average color */
39   } QTRAVG;               /* average quadtree value */
40  
41 + typedef struct {
42 +        QUADTREE        qt;     /* quadtree node (key & hash value) */
43 +        QTRAVG          av;     /* node average */
44 + } QT_LUENT;             /* lookup table entry */
45  
46 < unsigned long
47 < qthash(qtc)                     /* hash a quadtree node value */
49 < char *qtc;
50 < {
51 <    register unsigned long qt = qtc;
46 > static QT_LUENT *qt_htbl = NULL;        /* quadtree cache */
47 > static int      qt_hsiz = 0;            /* quadtree cache size */
48  
53 –    return(qt>>10 ^ qt<<5);
54 – }
49  
50 < int
51 < qtcmp(qt1, qt2)
52 < char *qt1, *qt2;
50 > /*
51 >  * smClean()           : display has been wiped clean
52 >  *
53 >  * Called after display has been effectively cleared, meaning that all
54 >  * geometry must be resent down the pipeline in the next call to smUpdate().
55 >  */
56 > smClean()
57   {
58 <    return(qt1 - qt2);
58 >    smClean_notify = TRUE;
59   }
60  
63 –
61   int
62 < mark_active_tris(qtptr,arg)
63 < QUADTREE *qtptr;
67 < char *arg;
62 > qtCache_init(nel)               /* initialize for at least nel elements */
63 > int     nel;
64   {
65 <  QUADTREE qt = *qtptr;
66 <  OBJECT os[QT_MAX_SET+1],*optr;
67 <  register int i,t_id;
65 >        static int  hsiztab[] = {
66 >                8191, 16381, 32749, 65521, 131071, 262139, 524287, 1048573, 0
67 >        };
68 >        register int  i;
69  
70 <  if (!QT_IS_LEAF(qt))
71 <    return(TRUE);
72 <  /* For each triangle in the set, set the which flag*/
73 <  qtgetset(os,qt);
74 <
75 <  for (i = QT_SET_CNT(os), optr = QT_SET_PTR(os); i > 0; i--)
76 <  {
77 <    t_id = QT_SET_NEXT_ELEM(optr);
78 <    /* Set the render flag */
79 <    if(SM_IS_NTH_T_BASE(smMesh,t_id))
80 <        continue;
81 <    SM_SET_NTH_T_ACTIVE(smMesh,t_id);
82 <    /* FOR NOW:Also set the LRU clock bit: MAY WANT TO CHANGE: */      
83 <    SM_SET_NTH_T_LRU(smMesh,t_id);
84 <  }
85 <  return(TRUE);
70 >        if (nel <= 0) {                 /* call to free table */
71 >                if (qt_hsiz) {
72 >                        free((char *)qt_htbl);
73 >                        qt_htbl = NULL;
74 >                        qt_hsiz = 0;
75 >                }
76 >                return(0);
77 >        }
78 >        nel += nel>>1;                  /* 66% occupancy */
79 >        for (i = 0; hsiztab[i]; i++)
80 >                if (hsiztab[i] > nel)
81 >                        break;
82 >        if (!(qt_hsiz = hsiztab[i]))
83 >                qt_hsiz = nel*2 + 1;            /* not always prime */
84 >        qt_htbl = (QT_LUENT *)calloc(qt_hsiz, sizeof(QT_LUENT));
85 >        if (qt_htbl == NULL)
86 >                qt_hsiz = 0;
87 >        for (i = qt_hsiz; i--; )
88 >                qt_htbl[i].qt = EMPTY;
89 >        return(qt_hsiz);
90   }
91  
92 < mark_tris_in_frustum(view)
93 < VIEW *view;
92 > QT_LUENT *
93 > qtCache_find(qt)                /* find a quadtree table entry */
94 > QUADTREE qt;
95   {
96 <    FVECT nr[4],far[4];
96 >        int     i, n;
97 >        register int    ndx;
98 >        register QT_LUENT       *le;
99  
100 <    /* Mark triangles in approx. view frustum as being active:set
101 <       LRU counter: for use in discarding samples when out
102 <       of space
103 <       Radiance often has no far clipping plane: but driver will set
104 <       dev_zmin,dev_zmax to satisfy OGL
105 <    */
106 <
107 <    /* First clear all the quadtree node and triangle active flags */
108 <    qtClearAllFlags();
109 <    smClear_flags(smMesh,T_ACTIVE_FLAG);
110 <
111 <    /* calculate the world space coordinates of the view frustum */
112 <    calculate_view_frustum(view->vp,view->hvec,view->vvec,view->horiz,
113 <                           view->vert, dev_zmin,dev_zmax,nr,far);
114 <
115 <    /* Project the view frustum onto the spherical quadtree */
116 <    /* For every cell intersected by the projection of the faces
117 <       of the frustum: mark all triangles in the cell as ACTIVE-
118 <       Also set the triangles LRU clock counter
119 <       */
120 <    /* Near face triangles */
121 <    smLocator_apply_func(smMesh,nr[0],nr[2],nr[3],mark_active_tris,NULL);
122 <    smLocator_apply_func(smMesh,nr[2],nr[0],nr[1],mark_active_tris,NULL);
123 <    /* Right face triangles */
124 <    smLocator_apply_func(smMesh,nr[0],far[3],far[0],mark_active_tris,NULL);
121 <    smLocator_apply_func(smMesh,far[3],nr[0],nr[3],mark_active_tris,NULL);
122 <    /* Left face triangles */
123 <    smLocator_apply_func(smMesh,nr[1],far[2],nr[2],mark_active_tris,NULL);
124 <    smLocator_apply_func(smMesh,far[2],nr[1],far[1],mark_active_tris,NULL);
125 <    /* Top face triangles */
126 <    smLocator_apply_func(smMesh,nr[0],far[0],nr[1],mark_active_tris,NULL);
127 <    smLocator_apply_func(smMesh,nr[1],far[0],far[1],mark_active_tris,NULL);
128 <    /* Bottom face triangles */
129 <    smLocator_apply_func(smMesh,nr[3],nr[2],far[3],mark_active_tris,NULL);
130 <    smLocator_apply_func(smMesh,nr[2],far[2],far[3],mark_active_tris,NULL);
131 <    /* Far face triangles */
132 <    smLocator_apply_func(smMesh,far[0],far[2],far[1],mark_active_tris,NULL);
133 <    smLocator_apply_func(smMesh,far[2],far[0],far[3],mark_active_tris,NULL);
134 <
135 < #ifdef TEST_DRIVER
136 <    VCOPY(FrustumFar[0],far[0]);
137 <    VCOPY(FrustumFar[1],far[1]);
138 <    VCOPY(FrustumFar[2],far[2]);
139 <    VCOPY(FrustumFar[3],far[3]);
140 <    VCOPY(FrustumNear[0],nr[0]);
141 <    VCOPY(FrustumNear[1],nr[1]);
142 <    VCOPY(FrustumNear[2],nr[2]);
143 <    VCOPY(FrustumNear[3],nr[3]);
144 < #endif
100 >        if (qt_hsiz == 0 && !qtCache_init(1))
101 >                return(NULL);
102 > tryagain:                               /* hash table lookup */
103 >        ndx = (unsigned long)qt % qt_hsiz;
104 >        for (i = 0, n = 1; i < qt_hsiz; i++, n += 2) {
105 >                le = &qt_htbl[ndx];
106 >                if (QT_IS_EMPTY(le->qt) || le->qt == qt)
107 >                        return(le);
108 >                if ((ndx += n) >= qt_hsiz)      /* this happens rarely */
109 >                        ndx = ndx % qt_hsiz;
110 >        }
111 >                                        /* table is full, reallocate */
112 >        le = qt_htbl;
113 >        ndx = qt_hsiz;
114 >        if (!qtCache_init(ndx+1)) {     /* no more memory! */
115 >                qt_htbl = le;
116 >                qt_hsiz = ndx;
117 >                return(NULL);
118 >        }
119 >                                        /* copy old table to new and free */
120 >        while (ndx--)
121 >                if (!QT_IS_EMPTY(le[ndx].qt))
122 >                        copystruct(qtCache_find(le[ndx].qt), &le[ndx]);
123 >        free((char *)le);
124 >        goto tryagain;                  /* should happen only once! */
125   }
126  
147 – /*
148 – * smClean()            : display has been wiped clean
149 – *
150 – * Called after display has been effectively cleared, meaning that all
151 – * geometry must be resent down the pipeline in the next call to smUpdate().
152 – */
153 – smClean()
154 – {
155 –    smClean_notify = TRUE;
156 – }
157 –
158 –
127   stCount_level_leaves(lcnt, qt)  /* count quadtree leaf nodes at each level */
128   int lcnt[];
129   register QUADTREE qt;
# Line 171 | Line 139 | register QUADTREE qt;
139      stCount_level_leaves(lcnt+1, QT_NTH_CHILD(qt,3));
140    }
141    else
142 <    lcnt[0]++;
142 >    if(QT_LEAF_IS_FLAG(qt))
143 >      lcnt[0]++;
144   }
145  
146  
# Line 183 | Line 152 | SM *sm;
152   int lvl;
153   {
154    FVECT a,b,c;
155 <  LUENT *le;
155 >  register QT_LUENT *le;
156    QTRAVG *rc[4];
157 <  register QTRAVG *ra;
157 >  TRI *tri;
158    
159    if (QT_IS_EMPTY(qt))                          /* empty leaf node */
160      return(NULL);
161    if (QT_IS_TREE(qt) && !QT_IS_FLAG(qt))        /* not in our frustum */
162      return(NULL);
163 +  if(QT_IS_LEAF(qt)  && !QT_LEAF_IS_FLAG(qt))   /* not in our frustum */
164 +    return(NULL);
165                                          /* else look up node */
166 <  if ((le = lu_find(&qtr_tab,(char *)qt)) == NULL)
167 <    goto nomemory;
168 <  ra = (QTRAVG *)le->data;
198 <  if (QT_IS_TREE(qt) && (ra == NULL || lvl > 0))
166 >  if ((le = qtCache_find(qt)) == NULL)
167 >    error(SYSTEM, "out of memory in qtRender_level");
168 >  if (QT_IS_TREE(qt) && (QT_IS_EMPTY(le->qt) || lvl > 0))
169    {                                     /* compute children */
170      qtSubdivide_tri(v0,v1,v2,a,b,c);
171 <    rc[0] = qtRender_level(QT_NTH_CHILD(qt,0),v0,a,c,sm,lvl-1);
172 <    rc[1] = qtRender_level(QT_NTH_CHILD(qt,1),a,v1,b,sm,lvl-1);
173 <    rc[2] = qtRender_level(QT_NTH_CHILD(qt,2),c,b,v2,sm,lvl-1);
174 <    rc[3] = qtRender_level(QT_NTH_CHILD(qt,3),b,c,a,sm,lvl-1);
171 >    rc[0] = qtRender_level(QT_NTH_CHILD(qt,0),v0,c,b,sm,lvl-1);
172 >    rc[1] = qtRender_level(QT_NTH_CHILD(qt,1),c,v1,a,sm,lvl-1);
173 >    rc[2] = qtRender_level(QT_NTH_CHILD(qt,2),b,a,v2,sm,lvl-1);
174 >    rc[3] = qtRender_level(QT_NTH_CHILD(qt,3),a,b,c,sm,lvl-1);
175    }
176 <  if (ra == NULL)
176 >  if (QT_IS_EMPTY(le->qt))
177    {                                     /* let's make some data! */
178      int rgbs[3];
179      double distsum;
180 <    int i;
211 <    register int n;
180 >    register int i, n;
181                                          /* average our triangle vertices */
182      rgbs[0] = rgbs[1] = rgbs[2] = 0;
183      distsum = 0.; n = 0;
184      if(QT_IS_TREE(qt))
185      {                                   /* from subtree */
186        for (i = 4; i--; )
187 <        if ((ra = rc[i]) != NULL)
187 >        if (rc[i] != NULL)
188          {
189 <          rgbs[0] += ra->rgb[0]; rgbs[1] += ra->rgb[1]; rgbs[2] += ra->rgb[2];
190 <          distsum += ra->dist; n++;
189 >          rgbs[0] += rc[i]->rgb[0]; rgbs[1] += rc[i]->rgb[1];
190 >          rgbs[2] += rc[i]->rgb[2]; distsum += rc[i]->dist; n++;
191          }
192      }
193      else
194      {                                   /* from triangle set */
195 <      OBJECT os[QT_MAX_SET+1];
195 >      OBJECT *os;
196        int s0, s1, s2;
197 <
198 <      qtgetset(os,qt);
199 <      for (n = os[0]; n; n--)
197 >      
198 >      os = qtqueryset(qt);
199 >      for (i = os[0]; i; i--)
200        {
201 <        qtTri_from_id(os[n],a,b,c,NULL,NULL,NULL,&s0,&s1,&s2);
201 >        if(SM_IS_NTH_T_BASE(sm,os[i]))
202 >           continue;
203 >        tri = SM_NTH_TRI(sm,os[i]);
204 >        if(!T_IS_VALID(tri))
205 >          continue;
206 >        n++;
207 >        s0 = T_NTH_V(tri,0);
208 >        s1 = T_NTH_V(tri,1);
209 >        s2 = T_NTH_V(tri,2);
210 >        VCOPY(a,SM_NTH_WV(sm,s0));
211 >        VCOPY(b,SM_NTH_WV(sm,s1));
212 >        VCOPY(c,SM_NTH_WV(sm,s2));            
213          distsum += SM_BG_SAMPLE(sm,s0) ? dev_zmax
214                                  : sqrt(dist2(a,SM_VIEW_CENTER(sm)));
215          distsum += SM_BG_SAMPLE(sm,s1) ? dev_zmax
# Line 243 | Line 223 | int lvl;
223          rgbs[2] += SM_NTH_RGB(sm,s0)[2] + SM_NTH_RGB(sm,s1)[2]
224                    + SM_NTH_RGB(sm,s2)[2];
225        }
226 <      n = 3*os[0];
226 >      n *= 3;
227      }
228      if (!n)
229        return(NULL);
230 <    if ((ra = (QTRAVG *)malloc(sizeof(QTRAVG))) == NULL)
231 <      goto nomemory;
232 <    ra->rgb[0] = rgbs[0]/n; ra->rgb[1] = rgbs[1]/n; ra->rgb[2] = rgbs[2]/n;
253 <    ra->dist = distsum/(double)n;
254 <    le->key = (char *)qt;
255 <    le->data = (char *)ra;
230 >    le->qt = qt;
231 >    le->av.rgb[0] = rgbs[0]/n; le->av.rgb[1] = rgbs[1]/n;
232 >    le->av.rgb[2] = rgbs[2]/n; le->av.dist = distsum/(double)n;
233    }
234    if (lvl == 0 || (lvl > 0 && QT_IS_LEAF(qt)))
235    {                             /* render this node */
236                                          /* compute pseudo vertices */
237      VCOPY(a,v0); VCOPY(b,v1); VCOPY(c,v2);
238      normalize(a); normalize(b); normalize(c);
239 <    VSUM(a,SM_VIEW_CENTER(sm),a,ra->dist);
240 <    VSUM(b,SM_VIEW_CENTER(sm),b,ra->dist);
241 <    VSUM(c,SM_VIEW_CENTER(sm),c,ra->dist);
239 >    VSUM(a,SM_VIEW_CENTER(sm),a,le->av.dist);
240 >    VSUM(b,SM_VIEW_CENTER(sm),b,le->av.dist);
241 >    VSUM(c,SM_VIEW_CENTER(sm),c,le->av.dist);
242                                          /* draw triangle */
243 <    glColor3ub(ra->rgb[0],ra->rgb[1],ra->rgb[2]);
267 <    /* NOTE: Triangle vertex order may change */
268 <    glVertex3d(c[0],c[1],c[2]);
269 <    glVertex3d(b[0],b[1],b[2]);
243 >    glColor3ub(le->av.rgb[0],le->av.rgb[1],le->av.rgb[2]);
244      glVertex3d(a[0],a[1],a[2]);
245 +    glVertex3d(b[0],b[1],b[2]);
246 +    glVertex3d(c[0],c[1],c[2]);
247 +
248    }
249 <  return(ra);
273 < nomemory:
274 <  error(SYSTEM, "out of memory in qtRender_level");
249 >  return(&le->av);
250   }
251  
252  
# Line 279 | Line 254 | smRender_stree_level(sm,lvl)
254   SM *sm;
255   int lvl;
256   {
257 <  QUADTREE root;
257 >  QUADTREE qt;
258    int i;
259    FVECT t0,t1,t2;
260 +  STREE *st;
261  
262 <  if (lvl < 1)
262 >  
263 >  if (lvl < 0)
264      return;
265 +  st = SM_LOCATOR(sm);
266    glPushAttrib(GL_LIGHTING_BIT);
267    glShadeModel(GL_FLAT);
268    glBegin(GL_TRIANGLES);
269 <  for(i=0; i < 4; i++)
269 >  for(i=0; i < ST_NUM_ROOT_NODES; i++)
270    {
271 <    root = ST_NTH_ROOT(SM_LOCATOR(sm),i);
272 <    stNth_base_verts(SM_LOCATOR(sm),i,t0,t1,t2);
273 <    qtRender_level(root,t0,t1,t2,sm,lvl-1);
271 >    qt = ST_ROOT_QT(st,i);
272 >    qtRender_level(qt,ST_NTH_V(st,i,0),ST_NTH_V(st,i,1),ST_NTH_V(st,i,2),
273 >                   sm,lvl);
274    }
275    glEnd();
276    glPopAttrib();
# Line 305 | Line 283 | int qual;
283   {
284    int i, ntarget;
285    int lvlcnt[QT_MAX_LEVELS];
286 +  STREE *st;
287  
288    if (qual <= 0)
289      return;
# Line 317 | Line 296 | int qual;
296      return;
297    for (i = QT_MAX_LEVELS; i--; )
298      lvlcnt[i] = 0;
299 <  stCount_level_leaves(lvlcnt, SM_LOCATOR(sm)->root);
299 >  
300 >  st = SM_LOCATOR(sm);
301 >  for(i=0; i < ST_NUM_ROOT_NODES;i++)
302 >    stCount_level_leaves(lvlcnt, ST_ROOT_QT(st,i));
303 >  
304    for (ntarget -= lvlcnt[i=0]; i < QT_MAX_LEVELS-1; ntarget -= lvlcnt[++i])
305      if (ntarget < lvlcnt[i+1])
306        break;
# Line 326 | Line 309 | int qual;
309   }
310  
311  
329 – smRender_tri(sm,i,vp,clr)
330 – SM *sm;
331 – int i;
332 – FVECT vp;
333 – int clr;
334 – {
335 –  TRI *tri;
336 –  double ptr[3];
337 –  int j;
312  
313 <  tri = SM_NTH_TRI(sm,i);
314 <  if (clr) SM_CLEAR_NTH_T_NEW(sm,i);
313 > #define render_tri(v0,v1,v2,rgb0,rgb1,rgb2) \
314 >  {glColor3ub(rgb0[0],rgb0[1],rgb0[2]);  glVertex3fv(v0); \
315 >  glColor3ub(rgb1[0],rgb1[1],rgb1[2]);  glVertex3fv(v1); \
316 >  glColor3ub(rgb2[0],rgb2[1],rgb2[2]);  glVertex3fv(v2);} \
317  
318 <  /* NOTE:Triangles are defined clockwise:historical relative to spherical
319 <     tris: could change
320 <     */
321 <  for(j=2; j>= 0; j--)
322 <  {
347 < #ifdef DEBUG
348 <    if(SM_BG_SAMPLE(sm,T_NTH_V(tri,j)))
349 <      eputs("SmRenderTri(): shouldnt have bg samples\n");
350 < #endif
351 <    glColor3ub(SM_NTH_RGB(sm,T_NTH_V(tri,j))[0],
352 <               SM_NTH_RGB(sm,T_NTH_V(tri,j))[1],
353 <               SM_NTH_RGB(sm,T_NTH_V(tri,j))[2]);
354 <    VCOPY(ptr,SM_T_NTH_WV(sm,tri,j));
355 <    glVertex3d(ptr[0],ptr[1],ptr[2]);
356 <  }
357 < }
358 <
359 < smRender_mixed_tri(sm,i,vp,clr)
360 < SM *sm;
361 < int i;
362 < FVECT vp;
363 < int clr;
318 > render_mixed_tri(v0,v1,v2,rgb0,rgb1,rgb2,bg0,bg1,bg2,vp,vc)
319 > float v0[3],v1[3],v2[3];
320 > BYTE rgb0[3],rgb1[3],rgb2[3];
321 > int bg0,bg1,bg2;
322 > FVECT vp,vc;
323   {
365 –  TRI *tri;
324    double p[3],d;
325    int j,ids[3],cnt;
326    int rgb[3];
327  
370 –  tri = SM_NTH_TRI(sm,i);
371 –  if (clr) SM_CLEAR_NTH_T_NEW(sm,i);
372 –
328    /* NOTE:Triangles are defined clockwise:historical relative to spherical
329       tris: could change
330       */
331    cnt = 0;
332    d = 0.0;
333    rgb[0] = rgb[1] = rgb[2] = 0;
334 <  for(j=0;j < 3;j++)
334 >
335 >  if(bg0 && bg1 && bg2)
336 >    return;
337 >
338 >  if(!bg0)
339    {
340 <      ids[j] = T_NTH_V(tri,j);
341 <      if(!SM_BG_SAMPLE(sm,ids[j]))
342 <      {
343 <          rgb[0] += SM_NTH_RGB(sm,ids[j])[0];
344 <          rgb[1] += SM_NTH_RGB(sm,ids[j])[1];
386 <          rgb[2] += SM_NTH_RGB(sm,ids[j])[2];
387 <          cnt++;
388 <          d += DIST(vp,SM_NTH_WV(sm,ids[j]));
389 <      }
340 >    rgb[0] += rgb0[0];
341 >    rgb[1] += rgb0[1];
342 >    rgb[2] += rgb0[2];
343 >    cnt++;
344 >    d += DIST(vp,v0);
345    }
346 +  if(!bg1)
347 +  {
348 +    rgb[0] += rgb1[0];
349 +    rgb[1] += rgb1[1];
350 +    rgb[2] += rgb1[2];
351 +    cnt++;
352 +    d += DIST(vp,v1);
353 +  }
354 +  if(!bg2)
355 +  {
356 +    rgb[0] += rgb2[0];
357 +    rgb[1] += rgb2[1];
358 +    rgb[2] += rgb2[2];
359 +    cnt++;
360 +    d += DIST(vp,v2);
361 +  }
362    if(cnt > 1)
363    {
364      rgb[0]/=cnt; rgb[1]/=cnt; rgb[2]/=cnt;
365      d /= (double)cnt;
366    }
367 <  for(j=2; j>= 0; j--)
367 >  if(bg0)
368    {
369 <    if(SM_BG_SAMPLE(sm,ids[j]))
370 <    {
371 <        glColor3ub(rgb[0],rgb[1],rgb[2]);
372 <        VSUB(p,SM_NTH_WV(sm,ids[j]),SM_VIEW_CENTER(sm));
373 <        p[0] *= d;
374 <        p[1] *= d;
375 <        p[2] *= d;
376 <        VADD(p,p,SM_VIEW_CENTER(sm));
377 <    }
378 <    else
379 <    {
380 <        glColor3ub(SM_NTH_RGB(sm,ids[j])[0],SM_NTH_RGB(sm,ids[j])[1],
410 <                   SM_NTH_RGB(sm,ids[j])[2]);
411 <        VCOPY(p,SM_NTH_WV(sm,ids[j]));
412 <    }
413 <    glVertex3d(p[0],p[1],p[2]);
369 >    glColor3ub(rgb[0],rgb[1],rgb[2]);
370 >    VSUB(p,v0,vc);
371 >    p[0] *= d;
372 >    p[1] *= d;
373 >    p[2] *= d;
374 >    VADD(p,p,vc);
375 >    glVertex3dv(p);
376 >  }
377 >  else
378 >  {
379 >    glColor3ub(rgb0[0],rgb0[1],rgb0[2]);
380 >    glVertex3fv(v0);
381     }
382 +  if(bg1)
383 +  {
384 +    glColor3ub(rgb[0],rgb[1],rgb[2]);
385 +    VSUB(p,v1,vc);
386 +    p[0] *= d;
387 +    p[1] *= d;
388 +    p[2] *= d;
389 +    VADD(p,p,vc);
390 +    glVertex3dv(p);
391 +  }
392 +  else
393 +  {
394 +    glColor3ub(rgb1[0],rgb1[1],rgb1[2]);
395 +    glVertex3fv(v1);
396 +   }
397 +  if(bg2)
398 +  {
399 +    glColor3ub(rgb[0],rgb[1],rgb[2]);
400 +    VSUB(p,v2,vc);
401 +    p[0] *= d;
402 +    p[1] *= d;
403 +    p[2] *= d;
404 +    VADD(p,p,vc);
405 +    glVertex3dv(p);
406 +  }
407 +  else
408 +  {
409 +    glColor3ub(rgb2[0],rgb2[1],rgb2[2]);
410 +    glVertex3fv(v2);
411 +   }
412 +
413   }
414  
415 < smRender_bg_tri(sm,i,vp,d,clr)
416 < SM *sm;
417 < int i;
418 < FVECT vp;
415 > render_bg_tri(v0,v1,v2,rgb0,rgb1,rgb2,vp,vc,d)
416 > float v0[3],v1[3],v2[3];
417 > BYTE rgb0[3],rgb1[3],rgb2[3];
418 > FVECT vp,vc;
419   double d;
422 – int clr;
420   {
421    double p[3];
425 –  int j,id;
426 –  TRI *tri;
422    
423 <  tri = SM_NTH_TRI(sm,i);
424 <  if (clr) SM_CLEAR_NTH_T_NEW(sm,i);
423 >  glColor3ub(rgb0[0],rgb0[1],rgb0[2]);
424 >  VSUB(p,v0,vc);
425 >  if(dev_zmin >= 0.99)
426 >  {
427 >    p[0] *= d;
428 >    p[1] *= d;
429 >    p[2] *= d;
430 >  }
431 >  VADD(p,p,vp);
432 >  glVertex3dv(p);
433  
434 <  /* NOTE:Triangles are defined clockwise:historical relative to spherical
435 <     tris: could change
436 <     */
434 <  for(j=2; j>= 0; j--)
434 >  glColor3ub(rgb1[0],rgb1[1],rgb1[2]);
435 >  VSUB(p,v1,vc);
436 >  if(dev_zmin >= 0.99)
437    {
438 <      id = T_NTH_V(tri,j);
439 <      glColor3ub(SM_NTH_RGB(sm,id)[0],SM_NTH_RGB(sm,id)[1],
440 <                 SM_NTH_RGB(sm,id)[2]);
439 <      VSUB(p,SM_NTH_WV(sm,id),SM_VIEW_CENTER(sm));
440 <      if(dev_zmin >= 0.99)
441 <       {
442 <           p[0] *= d;
443 <           p[1] *= d;
444 <           p[2] *= d;
445 <       }
446 <      VADD(p,p,vp);
447 <      glVertex3d(p[0],p[1],p[2]);
438 >    p[0] *= d;
439 >    p[1] *= d;
440 >    p[2] *= d;
441    }
442 +  VADD(p,p,vp);
443 +  glVertex3dv(p);
444 +
445 +
446 +  glColor3ub(rgb2[0],rgb2[1],rgb2[2]);
447 +  VSUB(p,v2,vc);
448 +  if(dev_zmin >= 0.99)
449 +  {
450 +    p[0] *= d;
451 +    p[1] *= d;
452 +    p[2] *= d;
453 +  }
454 +  VADD(p,p,vp);
455 +  glVertex3dv(p);
456 +
457   }
458  
459   smRender_mesh(sm,vp,clr)
# Line 453 | Line 461 | SM *sm;
461   FVECT vp;
462   int clr;
463   {
464 <  int i;
464 >  int i,bg0,bg1,bg2;
465 >  double d;
466 >  int v0_id,v1_id,v2_id;
467    TRI *tri;
468 <  double ptr[3],d;
469 <  int j;
468 >  float (*wp)[3];
469 >  BYTE  (*rgb)[3];
470  
471 +  wp = SM_WP(sm);
472 +  rgb =SM_RGB(sm);
473    d = (dev_zmin+dev_zmax)/2.0;
474    glPushAttrib(GL_DEPTH_BUFFER_BIT);
475    
476    /* First draw background polygons */
465 –
477    glDisable(GL_DEPTH_TEST);
478    glBegin(GL_TRIANGLES);
479 +  /* Maintain a list? */
480    SM_FOR_ALL_ACTIVE_BG_TRIS(sm,i)
481 <     smRender_bg_tri(sm,i,vp,d,clr);
481 >  {
482 >    if (clr)
483 >      SM_CLR_NTH_T_NEW(sm,i);
484 >    tri = SM_NTH_TRI(sm,i);
485 >    v0_id = T_NTH_V(tri,0);
486 >    v1_id = T_NTH_V(tri,1);
487 >    v2_id = T_NTH_V(tri,2);
488 >    render_bg_tri(wp[v0_id],wp[v1_id],wp[v2_id],rgb[v0_id],rgb[v1_id],
489 >                   rgb[v2_id],vp,SM_VIEW_CENTER(sm),d);
490 >  }
491    glEnd();
471 –  
492    glEnable(GL_DEPTH_TEST);
493    glBegin(GL_TRIANGLES);
494    SM_FOR_ALL_ACTIVE_FG_TRIS(sm,i)
495    {
496 <      if(!SM_MIXED_TRI(sm,i))
497 <        smRender_tri(sm,i,vp,clr);
498 <     else
499 <        smRender_mixed_tri(sm,i,vp,clr);
496 >    if (clr)
497 >      SM_CLR_NTH_T_NEW(sm,i);
498 >    tri = SM_NTH_TRI(sm,i);
499 >    v0_id = T_NTH_V(tri,0);
500 >    v1_id = T_NTH_V(tri,1);
501 >    v2_id = T_NTH_V(tri,2);
502 >    bg0 = SM_DIR_ID(sm,v0_id) || SM_BASE_ID(sm,v0_id);
503 >    bg1 = SM_DIR_ID(sm,v1_id) || SM_BASE_ID(sm,v1_id);
504 >    bg2 = SM_DIR_ID(sm,v2_id) || SM_BASE_ID(sm,v2_id);
505 >    if(!(bg0 || bg1 || bg2))
506 >        render_tri(wp[v0_id],wp[v1_id],wp[v2_id],rgb[v0_id],rgb[v1_id],
507 >                   rgb[v2_id])
508 >   else
509 >        render_mixed_tri(wp[v0_id],wp[v1_id],wp[v2_id],rgb[v0_id],rgb[v1_id],
510 >           rgb[v2_id],bg0,bg1,bg2,vp,SM_VIEW_CENTER(sm));
511    }
512    glEnd();
513  
514    glPopAttrib();
515   }
516  
517 < smRender_tri_edges(sm,i)
518 < SM *sm;
488 < int i;
517 > int
518 > compare_tri_depths(T_DEPTH *td1,T_DEPTH *td2)
519   {
520 <  TRI *tri;
491 <  int j;
492 <  double ptr[3];
520 >  double d;
521  
522 +  if(td1->tri==-1)
523 +    {
524 +      if(td2->tri==-1)
525 +        return(0);
526 +      else
527 +        return(-1);
528 +    }
529 +  if(td2->tri==-1)
530 +    return(1);
531  
532 <  tri = SM_NTH_TRI(sm,i);
533 <
534 <  /* Triangles are defined clockwise:historical relative to spherical
535 <     tris: could change
536 <     */
537 <  for(j=2; j >=0; j--)
538 <  {
539 <    VCOPY(ptr,SM_NTH_WV(sm,T_NTH_V(tri,j)));
503 <    glVertex3d(ptr[0],ptr[1],ptr[2]);
504 <    VCOPY(ptr,SM_NTH_WV(sm,T_NTH_V(tri,(j+1)%3)));
505 <    glVertex3d(ptr[0],ptr[1],ptr[2]);
506 <  }
532 >  d = td2->depth-td1->depth;
533 >  
534 >  if(d > 0.0)
535 >    return(1);
536 >  if(d < 0.0)
537 >    return(-1);
538 >  
539 >  return(0);
540   }
541  
542   int
543 < compare_tri_depths(T_DEPTH *td1,T_DEPTH *td2)
543 > compare_tri_depths_old(T_DEPTH *td1,T_DEPTH *td2)
544   {
545    double d;
546  
# Line 531 | Line 564 | T_DEPTH *td;
564    TRI *tri;
565    double d,min_d;
566    LIST *tlist=NULL;
567 +  FVECT diff;
568  
569    i = 0;
570    SM_FOR_ALL_NEW_TRIS(sm,t_id)
# Line 548 | Line 582 | T_DEPTH *td;
582          v = T_NTH_V(tri,j);
583          if(!SM_BG_SAMPLE(sm,v))
584          {
585 <            d = DIST(vp,SM_NTH_WV(sm,v));
585 >            VSUB(diff,SM_NTH_WV(sm,v),vp);
586 >            d = DOT(diff,diff);
587              if(min_d == -1 || d < min_d)
588                 min_d = d;
589          }
# Line 563 | Line 598 | T_DEPTH *td;
598   }
599  
600  
601 +
602 + LIST
603 + *smOrder_new_tris(sm,vp,td,sort)
604 + SM *sm;
605 + FVECT vp;
606 + T_DEPTH *td;
607 + int sort;
608 + {
609 +  int i,j,t_id,v;
610 +  TRI *tri;
611 +  double d,min_d;
612 +  LIST *tlist=NULL;
613 +  FVECT diff;
614 +
615 +  i = 0;
616 +  for(i=0; i < smNew_tri_cnt;i++)
617 +  {
618 +    t_id = smNew_tris[i].tri;
619 +
620 +    tri = SM_NTH_TRI(sm,t_id);
621 +    if(!T_IS_VALID(tri))
622 +    {
623 +      smNew_tris[i].tri = -1;
624 +      continue;
625 +    }
626 +    if(SM_BG_TRI(sm,t_id))
627 +    {
628 +        tlist = push_data(tlist,t_id);
629 +        smNew_tris[i].tri = -1;
630 +        continue;
631 +    }
632 +    if(!sort)
633 +      continue;
634 +    min_d = -1;
635 +    for(j=0;j < 3;j++)
636 +    {
637 +        v = T_NTH_V(tri,j);
638 +        if(!SM_BG_SAMPLE(sm,v))
639 +        {
640 +            VSUB(diff,SM_NTH_WV(sm,v),vp);
641 +            d = DOT(diff,diff);
642 +            if(min_d == -1 || d < min_d)
643 +               min_d = d;
644 +        }
645 +    }
646 +    td[i].depth = min_d;
647 +  }
648 +  if(!sort)
649 +    return(tlist);
650 +  qsort((void *)td,smNew_tri_cnt,sizeof(T_DEPTH),compare_tri_depths);
651 +  return(tlist);
652 + }
653 +
654 +
655   smUpdate_Rendered_mesh(sm,vp,clr)
656   SM *sm;
657   FVECT vp;
# Line 570 | Line 659 | int clr;
659   {
660    static T_DEPTH *td= NULL;
661    static int tsize = 0;
662 <  int i;
662 >  int i,v0_id,v1_id,v2_id,bg0,bg1,bg2;
663    GLint depth_test;
664    double d;
665    LIST *bglist;
666 +  TRI *tri;
667 +  float (*wp)[3];
668 +  BYTE  (*rgb)[3];
669 +
670    /* For all of the NEW triangles (since last update): assume
671       ACTIVE. Go through and sort on depth value (from vp). Turn
672       Depth Buffer test off and render back-front
673       */
674    /* NOTE: could malloc each time or hard code */
675 + #if 0
676    if(smNew_tri_cnt > tsize)
677    {
678      if(td)
# Line 591 | Line 685 | int clr;
685      error(SYSTEM,"smUpdate_Rendered_mesh:Cannot allocate memory\n");
686    }
687    bglist = smDepth_sort_tris(sm,vp,td);
688 <
688 > #else
689 >  td = smNew_tris;
690 >  if(!EQUAL_VEC3(SM_VIEW_CENTER(sm),vp))
691 >    bglist = smOrder_new_tris(sm,vp,td,1);
692 >  else
693 >    bglist = smOrder_new_tris(sm,vp,td,0);
694 > #endif
695 >  wp = SM_WP(sm);
696 >  rgb =SM_RGB(sm);
697    /* Turn Depth Test off -- using Painter's algorithm */
698    glPushAttrib(GL_DEPTH_BUFFER_BIT);
699 <  glDisable(GL_DEPTH_TEST);
699 >  glDepthFunc(GL_ALWAYS);
700    d = (dev_zmin+dev_zmax)/2.0;
701    /* Now render back-to front */
702    /* First render bg triangles */
703    glBegin(GL_TRIANGLES);
704    while(bglist)
705 <     smRender_bg_tri(sm,pop_list(&bglist),vp,d,clr);
705 >  {
706 >    i = pop_list(&bglist);
707 >    if (clr)
708 >      SM_CLR_NTH_T_NEW(sm,i);
709 >    tri = SM_NTH_TRI(sm,i);
710 >    v0_id = T_NTH_V(tri,0);
711 >    v1_id = T_NTH_V(tri,1);
712 >    v2_id = T_NTH_V(tri,2);
713 >    render_bg_tri(wp[v0_id],wp[v1_id],wp[v2_id],rgb[v0_id],rgb[v1_id],
714 >                   rgb[v2_id],vp,SM_VIEW_CENTER(sm),d);
715 >  }
716    glEnd();
717  
718 <  glEnable(GL_DEPTH_TEST);
718 >
719    glBegin(GL_TRIANGLES);
720    i=0;
721 <  while(td[i].tri != -1)
722 <     if(!SM_MIXED_TRI(sm,td[i].tri))
723 <        smRender_tri(sm,td[i++].tri,vp,clr);
724 <     else
725 <        smRender_mixed_tri(sm,td[i++].tri,vp,clr);
721 >  while(i != smNew_tri_cnt)
722 >  {
723 >    if(td[i].tri == -1)
724 >      {
725 >        i++;
726 >        continue;
727 >      }
728 >    if (clr)
729 >      SM_CLR_NTH_T_NEW(sm,td[i].tri);
730 >    tri = SM_NTH_TRI(sm,td[i].tri);
731 >    v0_id = T_NTH_V(tri,0);
732 >    v1_id = T_NTH_V(tri,1);
733 >    v2_id = T_NTH_V(tri,2);
734 >    bg0 = SM_DIR_ID(sm,v0_id) || SM_BASE_ID(sm,v0_id);
735 >    bg1 = SM_DIR_ID(sm,v1_id) || SM_BASE_ID(sm,v1_id);
736 >    bg2 = SM_DIR_ID(sm,v2_id) || SM_BASE_ID(sm,v2_id);
737 >    if(!(bg0 || bg1 || bg2))
738 >      render_tri(wp[v0_id],wp[v1_id],wp[v2_id],rgb[v0_id],rgb[v1_id],
739 >                 rgb[v2_id])
740 >   else
741 >     render_mixed_tri(wp[v0_id],wp[v1_id],wp[v2_id],rgb[v0_id],rgb[v1_id],
742 >                      rgb[v2_id],bg0,bg1,bg2,vp,SM_VIEW_CENTER(sm));
743 >    i++;
744 >  }
745    glEnd();
746  
747    /* Restore Depth Test */
# Line 641 | Line 772 | smUpdate(view,qual)
772       epsilon is calculated as running avg of distance of sample points
773       from canonical view: m = 1/(AVG(1/r)): some fraction of this
774     */
775 +
776 +  if(!smMesh)
777 +    return;
778 +
779    d = DIST(view->vp,SM_VIEW_CENTER(smMesh));
780    if(qual >= 100 && d > SM_ALLOWED_VIEW_CHANGE(smMesh))
781    {
782        /* Re-build the mesh */
783   #ifdef TEST_DRIVER
784      odev.v = *view;
785 < #endif    
786 <      smRebuild_mesh(smMesh,view->vp);
785 > #endif  
786 >      mark_tris_in_frustum(view);
787 >      smRebuild_mesh(smMesh,view);
788 >      smClean_notify = TRUE;
789    }
790    /* This is our final update iff qual==100 and view==&odev.v */
791    last_update = qual>=100 && view==&(odev.v);
792    /* Check if we should draw ALL triangles in current frustum */
793 <  if(smClean_notify || smNew_tri_cnt > SM_NUM_TRIS(smMesh)*SM_INC_PERCENT)
793 >  if(smClean_notify || smNew_tri_cnt > SM_SAMPLE_TRIS(smMesh)*SM_INC_PERCENT)
794    {
795   #ifdef TEST_DRIVER
796      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
797   #else
798 <    if (SM_TONE_MAP(smMesh) < SM_NUM_SAMP(smMesh))
798 >    if ( SM_TONE_MAP(smMesh) < SM_NUM_SAMP(smMesh))
799      {
800         tmClearHisto();
801         tmAddHisto(SM_BRT(smMesh),SM_NUM_SAMP(smMesh),1);
802 <       if(tmComputeMapping(0.,0.,0.) != TM_E_OK ||
803 <                   tmMapPixels(SM_RGB(smMesh),SM_BRT(smMesh),SM_CHR(smMesh),
804 <                                SM_NUM_SAMP(smMesh)) != TM_E_OK)
668 <            return;
802 >       tmComputeMapping(0.,0.,0.);
803 >       tmMapPixels(SM_RGB(smMesh),SM_BRT(smMesh),SM_CHR(smMesh),
804 >                   SM_NUM_SAMP(smMesh));
805      }
806   #endif
807      mark_tris_in_frustum(view);
# Line 680 | Line 816 | smUpdate(view,qual)
816    }
817    /* Do an incremental update instead */
818    else
819 <  {  
820 <    if(!smNew_tri_cnt)
819 >  {
820 >      if(!smNew_tri_cnt)
821        return;
822   #ifdef TEST_DRIVER
823      glDrawBuffer(GL_FRONT);
# Line 694 | Line 830 | smUpdate(view,qual)
830          if(tmComputeMapping(0.,0.,0.) != TM_E_OK)
831             return;
832      }
833 <    if(tmMapPixels(SM_NTH_RGB(smMesh,t),&SM_NTH_BRT(smMesh,t),
834 <                   SM_NTH_CHR(smMesh,t), SM_NUM_SAMP(smMesh)-t) != TM_E_OK)
835 <          return;
833 >    tmMapPixels(SM_NTH_RGB(smMesh,t),&SM_NTH_BRT(smMesh,t),
834 >                   SM_NTH_CHR(smMesh,t), SM_NUM_SAMP(smMesh)-t);
835 >        
836   #endif    
837      smUpdate_Rendered_mesh(smMesh,view->vp,last_update);
838      
# Line 704 | Line 840 | smUpdate(view,qual)
840      glDrawBuffer(GL_BACK);
841   #endif
842    }
843 +
844    SM_TONE_MAP(smMesh) = SM_NUM_SAMP(smMesh);
845 +
846    if (last_update)
847    {
848      smClean_notify = FALSE;
849      smNew_tri_cnt = 0;
850 <    lu_done(&qtr_tab);
850 > #if 0  
851 >    smClear_flags(smMesh,T_NEW_FLAG);
852 > #endif
853 >    qtCache_init(0);
854    }
855  
856   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines