--- libgender/view.C 2004/10/04 07:04:58 1.4 +++ libgender/view.C 2004/10/11 00:05:48 1.48 @@ -1,18 +1,63 @@ #include -#include "oct.h" +#include "opengl.h" + #include "view.h" +#include "oct.h" + +vector occ_query_objects; -draw_context::draw_context (view &v) -: v(v), l(0), mode(LIGHTED) +static GLuint begin_occ_query () { + GLuint id; + + if (occ_query_objects.size ()) + { + id = *(occ_query_objects.end () - 1); + occ_query_objects.pop_back (); + } + else + glGenQueriesARB (1, &id); + + glBeginQueryARB (GL_SAMPLES_PASSED, id); + return id; } -draw_context::~draw_context () +inline void end_occ_query () { + glEndQueryARB (GL_SAMPLES_PASSED); } -bool draw_context::may_draw (entity_base *e) +static GLuint occ_query_result (GLuint id) +{ + GLuint count; + + glGetQueryObjectuivARB (id, GL_QUERY_RESULT, &count); + occ_query_objects.push_back (id); + + return count; +} + +view::view () +: gamma(1.0) +{ +} + +view::~view () +{ +} + +void view::begin_occ_query (recv_occ_query &recv) +{ + occ_queries.push_back (oq_data (&recv, ::begin_occ_query ())); +} + +void view::end_occ_query () +{ + ::end_occ_query (); +} + +bool view::may_draw (const entity *e) { if (drawn.find (e) != drawn.end ()) return false; @@ -21,64 +66,168 @@ return true; } -void view::draw (draw_context &ctx) +void view::reset_projection () { - // check occlusion queries here - - ctx.generation++; - - //renormalize (orig, p); + renormalize (orig, p); - if (ctx.mode == draw_context::DEPTH) - { - glEnable (GL_POLYGON_OFFSET_FILL); - glPolygonOffset (0, 1); - glDepthFunc (GL_LESS); - glDisable (GL_LIGHTING); - glColorMask (0, 0, 0, 0); - } - else - { - glDisable (GL_POLYGON_OFFSET_FILL); - glDrawBuffer (GL_BACK); - glDepthFunc (GL_LEQUAL); - glEnable (GL_LIGHTING); - glDepthMask (0); - } - glViewport (0, 0, w, h); glMatrixMode (GL_PROJECTION); glLoadIdentity (); GLdouble aspect = (GLdouble)w/h; - GLdouble zNear = 0.001; - GLdouble zFar = 100.; + GLdouble ymax = z_near * tan (fov * (M_PI / 360.0)); + + glFrustum (-ymax * aspect, ymax * aspect, -ymax, ymax, z_near, z_far); + + perspfact = z_near / ymax * 0.5 * (GLdouble)h; - GLdouble ymax = zNear * tan (fov * (M_PI / 360.0)); - glFrustum (-ymax * aspect, ymax * aspect, -ymax, ymax, zNear, zFar); + d = normalize (d);//D + u = normalize (u);//D vec3 rz = -d; vec3 rx = cross (u, rz); vec3 ry = cross (rz, rx); - gl_matrix &m = ctx.projection; + matrix &m = projection; m(0,0) = rx.x; m(0,1) = rx.y; m(0,2) = rx.z; m(0,3) = 0; m(1,0) = ry.x; m(1,1) = ry.y; m(1,2) = ry.z; m(1,3) = 0; m(2,0) = rz.x; m(2,1) = rz.y; m(2,2) = rz.z; m(2,3) = 0; m(3,0) = 0; m(3,1) = 0; m(3,2) = 0; m(3,3) = 1; - glMultMatrixf ((GLfloat *)m.data); + diagfact = abs (rz.x) + abs (rz.y) + abs (rz.z); + //printf ("diagfact = %f\n", diagfact); + diagfact = sqrtf (3.);//D WHY??? + + glMultMatrixf (m); + glTranslatef (-p.x, -p.y, -p.z); + + glGetFloatv (GL_PROJECTION_MATRIX, m); + + frustum.l = plane ( m(3,0) + m(0,0), m(3,1) + m(0,1), m(3,2) + m(0,2), m(3,3) + m(0,3) ); + frustum.r = plane ( m(3,0) - m(0,0), m(3,1) - m(0,1), m(3,2) - m(0,2), m(3,3) - m(0,3) ); + frustum.b = plane ( m(3,0) + m(1,0), m(3,1) + m(1,1), m(3,2) + m(1,2), m(3,3) + m(1,3) ); + frustum.t = plane ( m(3,0) - m(1,0), m(3,1) - m(1,1), m(3,2) - m(1,2), m(3,3) - m(1,3) ); + frustum.n = plane ( m(3,0) + m(2,0), m(3,1) + m(2,1), m(3,2) + m(2,2), m(3,3) + m(2,3) ); + frustum.f = plane ( m(3,0) - m(2,0), m(3,1) - m(2,1), m(3,2) - m(2,2), m(3,3) - m(2,3) ); glMatrixMode (GL_MODELVIEW); glLoadIdentity (); - glTranslatef (-p.x, -p.y, -p.z); +} - world.draw (ctx); +void view::begin () +{ + glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glDepthRange (0, 1. - (1. / pow (2., 16.))); + + vislist.clear (); + + generation++; + + farlist.clear (); + + // check occlusion queries + for (vector::iterator i = occ_queries.begin (); i != occ_queries.end (); ++i) + { + occ_query oq(*this, i->second, ::occ_query_result (i->second)); + i->first->event (oq); + } + + occ_queries.clear (); + + z_far = nz_far; + c_far = nc_far; + + if (z_far < z_near) + z_far = z_near * 2.; + + reset_projection (); + + nc_far = nz_far = z_near + 1.F; + world.detect_visibility (*this); + + printf ("far %f cf %f CAM (%d,%d,%d)\n", z_far, c_far, orig.x, orig.y, orig.z);//D +} + +void view::end () +{ + vislist.clear (); +} + +void view::pass (enum mode m) +{ + mode = m; + + glDisable (GL_ALPHA_TEST); + glDisable (GL_BLEND); + + if (mode == view::DEPTH) + { + glEnable (GL_POLYGON_OFFSET_FILL); + glPolygonOffset (0, 1); + glDepthFunc (GL_LESS); + glDisable (GL_LIGHTING); + glColorMask (0, 0, 0, 0); + //cgGLDisableProfile (vsh_profile);// z-fighting?? + //cgGLDisableProfile (fsh_profile); + } + else + { + glEnable (GL_MINMAX); + glDisable (GL_POLYGON_OFFSET_FILL); + glDepthFunc (GL_LESS); + glDepthMask (0); + //cgGLEnableProfile (vsh_profile); + //cgGLEnableProfile (fsh_profile); + } + + for (vector::iterator i = vislist.begin (); i != vislist.end (); ++i) + { + octant *o = *i; - ctx.drawn.clear (); + visibility_state &vs = vismap[o]; + bool oq = mode == LIGHTED + && vs.last + 1. < timer.now + && (vs.visibility == visibility_state::PARTIAL + || vs.visibility == visibility_state::FULL); + + if (oq) + begin_occ_query (*o); + + o->display (*this); + + if (oq) // && o->fill) WHY??? + { + glColorMask (0, 0, 0, 0); + o->draw_bbox (*this); + glColorMask (1, 1, 1, 0); + } + + if (oq) + end_occ_query (); + } + + drawn.clear (); + + if (mode == view::DEPTH) + { + glEnable (GL_DEPTH_CLAMP_NV); + glDepthMask (0); + glDepthFunc (GL_LESS); + + for (vector::iterator i = farlist.begin (); i != farlist.end (); ++i) + { + begin_occ_query (**i); + (*i)->draw_bbox (*this); + end_occ_query (); + } + + glDisable (GL_DEPTH_CLAMP_NV); + } glColorMask (1, 1, 1, 0); glDepthMask (1); + } +