--- libgender/oct.C 2004/10/10 14:15:15 1.48 +++ libgender/oct.C 2004/10/28 22:29:29 1.67 @@ -1,7 +1,6 @@ #include #include - using namespace std; #include "opengl.h" @@ -10,15 +9,48 @@ #include "view.h" #include "entity.h" +enum visibility_state { FULL, PARTIAL, SMALL, OCCLUDED }; + +struct evis { + visibility_state state; + double last; // time of last check + evis () : last(0.), state(FULL) { }; +}; + +struct oct_visibility : visibility_base +{ + typedef map evismap; + evismap vismap; + + visibility_state state; + + oct_visibility (octant &oct) + : state(FULL) + { + } +}; + octant world(0, sector (SOFFS_MIN, SOFFS_MIN, SOFFS_MIN), MAXEXTENT); octant::octant (octant *parent, const sector &orig, uoffs extent) -: parent(parent), orig(orig), extent(extent) +: parent(parent) +, orig(orig) +, extent(extent) { for (fill = 8; fill--; ) sub[fill] = 0; } +visibility_base *octant::new_visibility () +{ + return new oct_visibility (*this); +} + +void octant::clear_visibility (visibility_base *vs) +{ + ((oct_visibility *)vs)->vismap.clear (); +} + octant::~octant () { for (fill = 8; fill--; ) @@ -31,7 +63,7 @@ sector center_1 = o1 + ea; sector size_2 = b - a; - sector center_2 = a + size_2 / 2; + sector center_2 = a + (size_2 >> 1); return abs (center_1 - center_2) <= ea + size_2; } @@ -43,10 +75,10 @@ if (overlap (orig, extent, a, b)) { - uoffs extent2 = extent / 2; + uoffs extent2 = extent >> 1; uoffs size = max (abs (b - a)); - if (size > extent2 || !extent2) + if (size >= extent2 >> 1) { push_back (e); e->o.push_back (this); @@ -61,7 +93,10 @@ if (overlap (s, extent2, a, b)) { if (!sub[i]) - sub[i] = new octant (this, s, extent2); + { + sub[i] = new octant (this, s, extent2); + fill++; + } sub[i]->add (e); } @@ -73,84 +108,90 @@ { } -void octant::detect_visibility (view &ctx) +bool octant::detect_visibility (view &ctx) { - visibility_state &vs = ctx.vismap[this]; - GLfloat extent2 = 0.5F * (GLfloat)extent; - point center = point (orig + (extent >> 1) - ctx.orig); - if (extent & 1) center = center + 0.5F; + sector centeri = orig + (extent >> 1) - ctx.orig; + point centerf = point (centeri) + ((extent & 1) ? 0.5F : 0.F); + GLfloat rad = ctx.diagfact * extent2; - if (vs.generation + 1 != ctx.generation) - vs.visibility = visibility_state::UNKNOWN; + if (!overlap (ctx.frustum.c, sphere (centerf, rad))) + return false; - vs.generation = ctx.generation; + oct_visibility &vs = *(oct_visibility *)get_visibility (ctx); if (orig <= ctx.orig && ctx.orig <= orig + extent) - vs.visibility = visibility_state::PARTIAL; + vs.state = PARTIAL; else { - if (ctx.frustum.t.distance (center) < -rad) return; - if (ctx.frustum.b.distance (center) < -rad) return; - if (ctx.frustum.l.distance (center) < -rad) return; - if (ctx.frustum.r.distance (center) < -rad) return; - if (ctx.frustum.n.distance (center) < -rad) return; + if (distance (ctx.frustum.t, centerf) < -rad) return false; + if (distance (ctx.frustum.b, centerf) < -rad) return false; + if (distance (ctx.frustum.l, centerf) < -rad) return false; + if (distance (ctx.frustum.r, centerf) < -rad) return false; + if (distance (ctx.frustum.n, centerf) < -rad) return false; - GLfloat fd = ctx.frustum.f.distance (center); +#if 0 + GLfloat fd = distance (ctx.frustum.f, centerf); if (fd < -(ctx.c_far - ctx.z_far) -rad * 3.F) - return; + return false; +#endif } - if (vs.visibility == visibility_state::OCCLUDED - || vs.visibility == visibility_state::UNKNOWN) +#if 1 + if (vs.state == OCCLUDED) { - ctx.farlist.push_back (this); - return; + if (size ()) + ctx.vislist.push_back (this); + //return false; } - -#if 0 - if (vs.visibility == visibility_state::UNKNOWN) - vs.visibility = visibility_state::FULL; #endif - GLfloat z = ctx.z_near + ctx.frustum.n.distance (center) + rad; + GLfloat z = ctx.z_near + distance (ctx.frustum.n, centerf) + rad; + if (ctx.perspfact * extent / z < 1.) // very crude "too small to see" check + return false; + //printf ("z %f, perspfact %f, z*p %f\n", z, ctx.perspfact, ctx.perspfact / z); - if (vs.visibility == visibility_state::FULL) +#if 0 + if (vs.state == PARTIAL || vs.state == FULL) ctx.nc_far = max (ctx.nc_far, z); - - if (size () - && (vs.visibility == visibility_state::PARTIAL - || vs.visibility == visibility_state::FULL)) - { - ctx.nz_far = max (ctx.nz_far, z); - ctx.vislist.push_back (this); - } +#endif // node to start with - unsigned char si = ctx.d.x < 0 ? 1 : 0 - | ctx.d.y < 0 ? 2 : 0 - | ctx.d.z < 0 ? 4 : 0; + unsigned char si = centeri.x > 0 ? 1 : 0 + | centeri.y > 0 ? 2 : 0 + | centeri.z > 0 ? 4 : 0; + + //printf ("si %d C %Ld,%Ld,%Ld\n", si, centeri.x, centeri.y, centeri.z); // bit-toggle to find next child for front-to-back order - static unsigned char next[8] - = { 0, 0^1, 1^2, 2^4, 4^3, 3^5, 5^6, 6^7 }; + static unsigned char toggle[8+1] + = { 0, 0^1, 1^2, 2^4, 4^3, 3^5, 5^6, 6^7, 0 }; - for (int i = 0; i < 8; i++) + unsigned char *next = toggle; + do { - si ^= next[i]; + si ^= *next; if (sub[si]) sub[si]->detect_visibility (ctx); } + while (*++next); + + if (size () + && (vs.state == PARTIAL || vs.state == FULL || vs.state == OCCLUDED)) + ctx.vislist.push_back (this); + + return true; } void octant::display (view &ctx) { #if 0 - glBegin (GL_LINES); sector s = orig - ctx.orig; + + glBegin (GL_LINES); vec3 clr(0, 0.8, 0); glMaterialfv (GL_FRONT_AND_BACK, GL_DIFFUSE, (const GLfloat*)&clr); @@ -158,7 +199,7 @@ for (int ji = 3; ji--; ) { int j = i | (1 << ji); - if (i != j) + if (i < j) { glVertex3i (s.x + !!(i & 1) * extent, s.y + !!(i & 2) * extent, @@ -171,27 +212,86 @@ glEnd (); #endif + oct_visibility &vs = *(oct_visibility *)get_visibility (ctx); - for (iterator i = end (); i != begin (); ) - (*--i)->display (ctx); -} + if (vs.state == OCCLUDED) + { + if (ctx.pass == view::POSTDEPTH) + { + ctx.begin_occ_query (*this, 0); + sector s = orig - ctx.orig; + gl::draw_bbox (s, s + extent); + ctx.end_occ_query (); + } + } + else + { + int nvis = 0; -void octant::draw_bbox (view &ctx) -{ - sector s = orig - ctx.orig; + for (iterator i = begin (); i != end (); ) + { + entity *e = *i++; + + evis &evs = vs.vismap[e]; - gl::draw_box (ctx, s, s + extent); + if (ctx.pass == view::POSTDEPTH) + { + if (evs.state == OCCLUDED) + { + ctx.begin_occ_query (*this, e); + gl::draw_bbox (e->a - ctx.orig, e->b - ctx.orig); + ctx.end_occ_query (); + } + else + nvis++; + } + else + { + if (!ctx.may_draw (e)) + continue; + + + if (evs.state != OCCLUDED) + { + sector center = ((e->a + e->b) >> 1) - ctx.orig; + GLfloat z = length (vec3 (center)); + ctx.pixfact = ctx.perspfact / z; + + ctx.nz_far = max (ctx.nz_far, z + extent); + ctx.nz_near = min (ctx.nz_near, z - extent); + + if (ctx.pass == view::DEPTH || evs.last + 0.3 > timer.now) + e->draw (ctx); + else + { + evs.last = timer.now; + ctx.begin_occ_query (*this, e); + e->draw (ctx); + ctx.end_occ_query (); + } + } + } + } + +#if 1 + if (ctx.pass == view::POSTDEPTH && nvis == 0 && size ()) + vs.state = OCCLUDED; +#endif + } } void octant::event (occ_query &ev) { - visibility_state &vs = ev.v.vismap[this]; + oct_visibility &vs = *(oct_visibility *)get_visibility (ev.ctx); + entity *e = (entity *)ev.id; - vs.last = timer.now; - vs.visibility = ev.r <= 0 - ? visibility_state::OCCLUDED - : visibility_state::FULL; - //if (extent > 0x16) - //printf ("OCT(%x,%x,%x+%x) samples %d\n", orig.x, orig.y, orig.z, extent, ev.r); + if (e) + { + evis &evs = vs.vismap[e]; + evs.state = ev.count ? FULL : OCCLUDED; + } + else + vs.state = ev.count ? FULL : OCCLUDED; } +