ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/view.C
(Generate patch)

Comparing libgender/view.C (file contents):
Revision 1.71 by root, Thu Nov 4 04:46:58 2004 UTC vs.
Revision 1.76 by root, Sun Nov 7 03:28:20 2004 UTC

… …
2 2
3#include "opengl.h" 3#include "opengl.h"
4 4
5#include "view.h" 5#include "view.h"
6#include "oct.h" 6#include "oct.h"
7#include "material.h"
7 8
8using namespace gl; 9using namespace gl;
9 10
10pass pass_depth (0); 11pass_data pass_depth (0, DEPTH);
12pass_data pass_postdepth (0, POSTDEPTH);
11 13
12vector<GLuint> occ_query_objects; 14vector<GLuint> occ_query_objects;
13 15
14static GLuint begin_occ_query () 16static GLuint begin_occ_query ()
15{ 17{
… …
57} 59}
58 60
59void view::end_occ_query () 61void view::end_occ_query ()
60{ 62{
61 ::end_occ_query (); 63 ::end_occ_query ();
64}
65
66struct occ_query_material : material
67{
68 void vsh (view &ctx);
69 void fsh (view &ctx);
70};
71
72static struct occ_query_material occ_query_material;
73
74void occ_query_material::vsh (view &ctx)
75{
76 std_vsh ();
77}
78
79void occ_query_material::fsh (view &ctx)
80{
81 // nop
62} 82}
63 83
64bool view::may_draw (const entity *e) 84bool view::may_draw (const entity *e)
65{ 85{
66 if (drawn.find (e) != drawn.end ()) 86 if (drawn.find (e) != drawn.end ())
… …
108 GLdouble aspect = (GLdouble)w/h; 128 GLdouble aspect = (GLdouble)w/h;
109 GLdouble ftan = tan (fov * (.5 * M_PI / 180.)); 129 GLdouble ftan = tan (fov * (.5 * M_PI / 180.));
110 GLdouble ymax = z_near * ftan; 130 GLdouble ymax = z_near * ftan;
111 GLdouble xmax = ymax * aspect; 131 GLdouble xmax = ymax * aspect;
112 132
133 matrix perspective;
134#if 1
135 {
136 matrix &m = perspective;
137
138 m(0,0) = 1.F / xmax; m(0,1) = 0; m(0,2) = 0; m(0,3) = 0;
139 m(1,0) = 0; m(1,1) = 1.F / ymax; m(1,2) = 0; m(1,3) = 0;
140 m(2,0) = 0; m(2,1) = 0; m(2,2) = -1e10F / z_far; m(2,3) = 1;
141 m(3,0) = 0; m(3,1) = 0; m(3,2) = -1; m(3,3) = 0;
142
143 glLoadMatrixf (perspective);
144 }
145#else
113 glFrustum (-xmax, xmax, -ymax, ymax, z_near, z_far); 146 glFrustum (-xmax, xmax, -ymax, ymax, z_near, z_far);
147#endif
148
149 glGetFloatv (GL_PROJECTION_MATRIX, perspective);
114 150
115 perspfact = z_near / ymax * 0.5F * h; 151 perspfact = z_near / ymax * 0.5F * h;
152
153 glMatrixMode (GL_MODELVIEW);
154 glLoadIdentity ();
155 matrix &m = projection;
116 156
117 d = normalize (d);//D 157 d = normalize (d);//D
118 u = normalize (u);//D 158 u = normalize (u);//D
119 159
120 vec3 rz = -d; 160 vec3 rz = -d;
121 vec3 rx = cross (u, rz); 161 vec3 rx = cross (u, rz);
122 vec3 ry = cross (rz, rx); 162 vec3 ry = cross (rz, rx);
123 163
124 matrix &m = projection;
125 m(0,0) = rx.x; m(0,1) = rx.y; m(0,2) = rx.z; m(0,3) = 0; 164 m(0,0) = rx.x; m(0,1) = rx.y; m(0,2) = rx.z; m(0,3) = 0;
126 m(1,0) = ry.x; m(1,1) = ry.y; m(1,2) = ry.z; m(1,3) = 0; 165 m(1,0) = ry.x; m(1,1) = ry.y; m(1,2) = ry.z; m(1,3) = 0;
127 m(2,0) = rz.x; m(2,1) = rz.y; m(2,2) = rz.z; m(2,3) = 0; 166 m(2,0) = rz.x; m(2,1) = rz.y; m(2,2) = rz.z; m(2,3) = 0;
128 m(3,0) = 0; m(3,1) = 0; m(3,2) = 0; m(3,3) = 1; 167 m(3,0) = 0; m(3,1) = 0; m(3,2) = 0; m(3,3) = 1;
129 168
… …
131 //printf ("diagfact = %f\n", diagfact); 170 //printf ("diagfact = %f\n", diagfact);
132 diagfact = sqrtf (3.);//D WHY??? 171 diagfact = sqrtf (3.);//D WHY???
133 172
134 glMultMatrixf (m); 173 glMultMatrixf (m);
135 174
136 glGetFloatv (GL_PROJECTION_MATRIX, m); 175 glGetFloatv (GL_MODELVIEW_MATRIX, m);
176
177 m = perspective * m;
137 178
138 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) ); 179 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) );
139 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) ); 180 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) );
140 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) ); 181 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) );
141 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) ); 182 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) );
… …
156 GLdouble depth = h / ftan; 197 GLdouble depth = h / ftan;
157 198
158 frustum.c = cone (p, d, atan (sqrt (GLdouble (w * w + h * h)) * ftan / h)); 199 frustum.c = cone (p, d, atan (sqrt (GLdouble (w * w + h * h)) * ftan / h));
159 } 200 }
160 201
161 glMatrixMode (GL_MODELVIEW);
162 glLoadIdentity ();
163 glTranslatef (-p.x, -p.y, -p.z); 202 glTranslatef (-p.x, -p.y, -p.z);
164} 203}
165 204
166void view::begin () 205void view::begin ()
167{ 206{
… …
184 vislist.clear (); 223 vislist.clear ();
185} 224}
186 225
187#define DEPTH_OFFSET (1. / (GLdouble)(1L << 16)) 226#define DEPTH_OFFSET (1. / (GLdouble)(1L << 16))
188 227
189void view::render (enum pass_type p, pass &data) 228void view::render (pass_data &pass)
190{ 229{
191 pass_type = p; 230 this->pass = &pass;
192 pass_data = &data;
193 231
194 switch (pass_type) 232 switch (pass.type)
195 { 233 {
196 case DEPTH: 234 case DEPTH:
197 glColorMask (1, 1, 1, 1); 235 glColorMask (1, 1, 1, 1);
198 glDepthMask (1); 236 glDepthMask (1);
237 glDisable (GL_BLEND);
199 238
200 glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); 239 //glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
240 glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
201 241
202 //glEnable (GL_STENCIL_TEST); // for depth-passes 242 //glEnable (GL_STENCIL_TEST); // for depth-passes
203 //glStencilOp (GL_KEEP, GL_KEEP, GL_REPLACE); 243 //glStencilOp (GL_KEEP, GL_KEEP, GL_REPLACE);
204 //glStencilFunc (GL_LESS, 1, 255); 244 //glStencilFunc (GL_LESS, 1, 255);
205 245
206 //glEnable (GL_POLYGON_OFFSET_FILL); 246 //glEnable (GL_POLYGON_OFFSET_FILL);
207 //glPolygonOffset (0, 5); 247 //glPolygonOffset (0, 5);
248 glEnable (GL_CULL_FACE);
208 glDisable (GL_MINMAX); 249 glDisable (GL_MINMAX);
209 glDepthRange (DEPTH_OFFSET, 1.); 250 glDepthRange (DEPTH_OFFSET, 1.);
210 glDepthFunc (GL_LESS); 251 glDepthFunc (GL_LESS);
211 glEnable (GL_DEPTH_TEST); 252 glEnable (GL_DEPTH_TEST);
212 glColorMask (0, 0, 0, 0); 253 glColorMask (0, 0, 0, 0);
… …
221 glDepthFunc (GL_LESS); 262 glDepthFunc (GL_LESS);
222 glColorMask (0, 0, 0, 0); 263 glColorMask (0, 0, 0, 0);
223 glDepthMask (0); 264 glDepthMask (0);
224 glEnable (GL_DEPTH_CLAMP_NV); 265 glEnable (GL_DEPTH_CLAMP_NV);
225 glDisable (GL_STENCIL_TEST); 266 glDisable (GL_STENCIL_TEST);
267 glDisable (GL_CULL_FACE);
226 268
269 occ_query_material.enable (*this);
270
227 // check occlusion queries 271 // check occlusion queries
228 for (vector<oq_data>::iterator i = occ_queries.begin (); i != occ_queries.end (); ++i) 272 for (vector<oq_data>::iterator i = occ_queries.begin (); i != occ_queries.end (); ++i)
229 { 273 {
230 occ_query oq(*this, i->data, ::occ_query_result (i->id)); 274 occ_query oq(*this, i->data, ::occ_query_result (i->id));
231 i->recv->event (oq); 275 i->recv->event (oq);
232 } 276 }
233 277
278 occ_query_material.disable (*this);
279
234 occ_queries.clear (); 280 occ_queries.clear ();
235 281
236 break; 282 break;
237 283
238 case LIGHTED: 284 case LIGHTED:
285 glEnable (GL_CULL_FACE);
286 //glEnable (GL_BLEND);//TODO, only when not first lighted pass
287 glBlendFunc (GL_ONE, GL_ONE);
239 glClear (GL_STENCIL_BUFFER_BIT); 288 //glClear (GL_STENCIL_BUFFER_BIT);
240 //glEnable (GL_STENCIL_TEST); 289 //glEnable (GL_STENCIL_TEST);
241 glEnable (GL_MINMAX); 290 glEnable (GL_MINMAX);
242 glDepthRange (0., 1. - DEPTH_OFFSET); 291 glDepthRange (0., 1. - DEPTH_OFFSET);
243 glDepthFunc (GL_LESS); 292 glDepthFunc (GL_LESS);
244 glColorMask (1, 1, 1, 1); 293 glColorMask (1, 1, 1, 1);
… …
249 } 298 }
250 299
251 for (vector<octant *>::iterator i = vislist.begin (); i != vislist.end (); ++i) 300 for (vector<octant *>::iterator i = vislist.begin (); i != vislist.end (); ++i)
252 (*i)->display (*this); 301 (*i)->display (*this);
253 302
254 if (pass_type == DEPTH) 303 if (pass.type == DEPTH)
255 printf ("fps %f NF %f:%f vis %d CAM (%d,%d,%d)\n", timer.fps, z_near, z_far, drawn.size (), orig.x, orig.y, orig.z);//D 304 printf ("fps %f NF %f:%f vis %d CAM (%d,%d,%d)\n", timer.fps, z_near, z_far, drawn.size (), orig.x, orig.y, orig.z);//D
256 305
257 drawn.clear (); 306 drawn.clear ();
258 307
259#if 0 308#if 0
… …
291{ 340{
292 using namespace shader::compile; 341 using namespace shader::compile;
293 342
294 lightvec = xyz (lightpos - model_view_matrix * vin.vertex); 343 lightvec = xyz (lightpos - model_view_matrix * vin.vertex);
295 camdist = max (1 - length (lightvec) / radius, 0); 344 camdist = max (1 - length (lightvec) / radius, 0);
296}
297 345
298shader::temp_3f linear_light::operator ()() 346 fsh ();
347}
348
349void linear_light::fsh ()
299{ 350{
300 using namespace shader::compile; 351 using namespace shader::compile;
301 352
302 temp_3f res; 353 sh_lightvec = lightvec;
303 res = float3 (c.r / 255.F, c.g / 255.F, c.b / 255.F) * (min (intensity * camdist * 0.6F + 0.9F, 1.F)); 354 sh_colour = float3 (c.r / 255.F, c.g / 255.F, c.b / 255.F) * (min (intensity * camdist * 100.F + 0.9F, 1.F));
304
305 return res;
306} 355}
307 356
308 357

Diff Legend

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