cvar_t gl_printcheckerror = {0, "gl_printcheckerror", "0"};
cvar_t r_render = {0, "r_render", "1"};
+cvar_t r_waterwarp = {CVAR_SAVE, "r_waterwarp", "1"};
+cvar_t gl_polyblend = {CVAR_SAVE, "gl_polyblend", "1"};
cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1"}; // whether or not to use dithering
cvar_t gl_lockarrays = {0, "gl_lockarrays", "1"};
}
Cvar_RegisterVariable(&r_render);
+ Cvar_RegisterVariable(&r_waterwarp);
+ Cvar_RegisterVariable(&gl_polyblend);
Cvar_RegisterVariable(&gl_dither);
Cvar_RegisterVariable(&gl_lockarrays);
Cvar_RegisterVariable(&gl_delayfinish);
void GL_SetupView_Mode_Perspective (double fovx, double fovy, double zNear, double zFar)
{
double xmax, ymax;
+ double m[16];
if (!r_render.integer)
return;
ymax = zNear * tan(fovy * M_PI / 360.0);
// set view pyramid
qglFrustum(-xmax, xmax, -ymax, ymax, zNear, zFar);CHECKGLERROR
+ qglGetDoublev(GL_PROJECTION_MATRIX, m);
+ backend_projectmatrix.m[0][0] = m[0];
+ backend_projectmatrix.m[1][0] = m[1];
+ backend_projectmatrix.m[2][0] = m[2];
+ backend_projectmatrix.m[3][0] = m[3];
+ backend_projectmatrix.m[0][1] = m[4];
+ backend_projectmatrix.m[1][1] = m[5];
+ backend_projectmatrix.m[2][1] = m[6];
+ backend_projectmatrix.m[3][1] = m[7];
+ backend_projectmatrix.m[0][2] = m[8];
+ backend_projectmatrix.m[1][2] = m[9];
+ backend_projectmatrix.m[2][2] = m[10];
+ backend_projectmatrix.m[3][2] = m[11];
+ backend_projectmatrix.m[0][3] = m[12];
+ backend_projectmatrix.m[1][3] = m[13];
+ backend_projectmatrix.m[2][3] = m[14];
+ backend_projectmatrix.m[3][3] = m[15];
qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
GL_SetupView_Orientation_Identity();
}
void GL_SetupView_Mode_PerspectiveInfiniteFarClip (double fovx, double fovy, double zNear)
{
- float nudge, m[16];
+ double nudge, m[16];
if (!r_render.integer)
return;
m[13] = 0;
m[14] = -2 * zNear * nudge;
m[15] = 0;
- qglLoadMatrixf(m);
+ qglLoadMatrixd(m);
qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
GL_SetupView_Orientation_Identity();
backend_projectmatrix.m[0][0] = m[0];
void GL_SetupView_Mode_Ortho (double x1, double y1, double x2, double y2, double zNear, double zFar)
{
+ double m[16];
+
if (!r_render.integer)
return;
qglMatrixMode(GL_PROJECTION);CHECKGLERROR
qglLoadIdentity();CHECKGLERROR
qglOrtho(x1, x2, y2, y1, zNear, zFar);
+ qglGetDoublev(GL_PROJECTION_MATRIX, m);
+ backend_projectmatrix.m[0][0] = m[0];
+ backend_projectmatrix.m[1][0] = m[1];
+ backend_projectmatrix.m[2][0] = m[2];
+ backend_projectmatrix.m[3][0] = m[3];
+ backend_projectmatrix.m[0][1] = m[4];
+ backend_projectmatrix.m[1][1] = m[5];
+ backend_projectmatrix.m[2][1] = m[6];
+ backend_projectmatrix.m[3][1] = m[7];
+ backend_projectmatrix.m[0][2] = m[8];
+ backend_projectmatrix.m[1][2] = m[9];
+ backend_projectmatrix.m[2][2] = m[10];
+ backend_projectmatrix.m[3][2] = m[11];
+ backend_projectmatrix.m[0][3] = m[12];
+ backend_projectmatrix.m[1][3] = m[13];
+ backend_projectmatrix.m[2][3] = m[14];
+ backend_projectmatrix.m[3][3] = m[15];
qglMatrixMode(GL_MODELVIEW);CHECKGLERROR
GL_SetupView_Orientation_Identity();
}
float rgbscale, alphascale;
int combinergb, combinealpha;
// FIXME: add more combine stuff
+ // texmatrixenabled exists only to avoid unnecessary texmatrix compares
+ int texmatrixenabled;
matrix4x4_t matrix;
}
gltextureunit_t;
unit->alphascale = 1;
unit->combinergb = GL_MODULATE;
unit->combinealpha = GL_MODULATE;
+ unit->texmatrixenabled = false;
unit->matrix = r_identitymatrix;
+ qglMatrixMode(GL_TEXTURE);
+ qglLoadIdentity();
+ qglMatrixMode(GL_MODELVIEW);
qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), NULL);CHECKGLERROR
qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
iw = 1.0f / out[3];
out[0] = r_view_x + (out[0] * iw + 1.0f) * r_view_width * 0.5f;
out[1] = r_view_y + (out[1] * iw + 1.0f) * r_view_height * 0.5f;
- out[2] = out[2] * iw;
+ out[2] = r_view_z + (out[2] * iw + 1.0f) * r_view_depth * 0.5f;
}
// called at beginning of frame
void R_Mesh_State(const rmeshstate_t *m)
{
- int i, combinergb, combinealpha, scale, arrayis3d;
+ int i, combinergb, combinealpha, scale;
gltextureunit_t *unit;
- const matrix4x4_t *texmatrix;
matrix4x4_t tempmatrix;
- const float *texcoords;
BACKENDACTIVECHECK
for (i = 0, unit = gl_state.units;i < backendunits;i++, unit++)
{
+ // update 1d texture binding
if (unit->t1d != m->tex1d[i])
{
- GL_ActiveTexture(i);
if (m->tex1d[i])
{
if (unit->t1d == 0)
+ {
+ GL_ActiveTexture(i);
qglEnable(GL_TEXTURE_1D);CHECKGLERROR
+ }
+ unit->t1d = m->tex1d[i];
+ GL_ActiveTexture(i);
+ qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
}
else
{
if (unit->t1d)
+ {
+ unit->t1d = 0;
+ GL_ActiveTexture(i);
qglDisable(GL_TEXTURE_1D);CHECKGLERROR
+ }
}
- qglBindTexture(GL_TEXTURE_1D, (unit->t1d = m->tex1d[i]));CHECKGLERROR
}
+ // update 2d texture binding
if (unit->t2d != m->tex[i])
{
- GL_ActiveTexture(i);
if (m->tex[i])
{
if (unit->t2d == 0)
+ {
+ GL_ActiveTexture(i);
qglEnable(GL_TEXTURE_2D);CHECKGLERROR
+ }
+ unit->t2d = m->tex[i];
+ GL_ActiveTexture(i);
+ qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
}
else
{
if (unit->t2d)
+ {
+ unit->t2d = 0;
+ GL_ActiveTexture(i);
qglDisable(GL_TEXTURE_2D);CHECKGLERROR
+ }
}
- qglBindTexture(GL_TEXTURE_2D, (unit->t2d = m->tex[i]));CHECKGLERROR
}
+ // update 3d texture binding
if (unit->t3d != m->tex3d[i])
{
- GL_ActiveTexture(i);
if (m->tex3d[i])
{
if (unit->t3d == 0)
+ {
+ GL_ActiveTexture(i);
qglEnable(GL_TEXTURE_3D);CHECKGLERROR
+ }
+ unit->t3d = m->tex3d[i];
+ GL_ActiveTexture(i);
+ qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
}
else
{
if (unit->t3d)
+ {
+ unit->t3d = 0;
+ GL_ActiveTexture(i);
qglDisable(GL_TEXTURE_3D);CHECKGLERROR
+ }
}
- qglBindTexture(GL_TEXTURE_3D, (unit->t3d = m->tex3d[i]));CHECKGLERROR
}
+ // update cubemap texture binding
if (unit->tcubemap != m->texcubemap[i])
{
- GL_ActiveTexture(i);
if (m->texcubemap[i])
{
if (unit->tcubemap == 0)
+ {
+ GL_ActiveTexture(i);
qglEnable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+ }
+ unit->tcubemap = m->texcubemap[i];
+ GL_ActiveTexture(i);
+ qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
}
else
{
if (unit->tcubemap)
+ {
+ unit->tcubemap = 0;
+ GL_ActiveTexture(i);
qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
+ }
}
- qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, (unit->tcubemap = m->texcubemap[i]));CHECKGLERROR
}
- combinergb = m->texcombinergb[i];
- if (!combinergb)
- combinergb = GL_MODULATE;
- if (unit->combinergb != combinergb)
+ // update texture unit settings if the unit is enabled
+ if (unit->t1d || unit->t2d || unit->t3d || unit->tcubemap)
{
- GL_ActiveTexture(i);
- unit->combinergb = combinergb;
- if (gl_combine.integer)
+ // texture unit is enabled, enable the array
+ if (!unit->arrayenabled)
{
- qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
+ unit->arrayenabled = true;
+ GL_ClientActiveTexture(i);
+ qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
}
- else
+ // update combine settings
+ if (gl_combine.integer)
{
- qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR
+ // GL_ARB_texture_env_combine
+ combinergb = m->texcombinergb[i] ? m->texcombinergb[i] : GL_MODULATE;
+ if (unit->combinergb != combinergb)
+ {
+ unit->combinergb = combinergb;
+ GL_ActiveTexture(i);
+ qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB, unit->combinergb);CHECKGLERROR
+ }
+ combinealpha = m->texcombinealpha[i] ? m->texcombinealpha[i] : GL_MODULATE;
+ if (unit->combinealpha != combinealpha)
+ {
+ unit->combinealpha = combinealpha;
+ GL_ActiveTexture(i);
+ qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
+ }
+ scale = max(m->texrgbscale[i], 1);
+ if (unit->rgbscale != scale)
+ {
+ GL_ActiveTexture(i);
+ qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = scale));CHECKGLERROR
+ }
+ scale = max(m->texalphascale[i], 1);
+ if (unit->alphascale != scale)
+ {
+ GL_ActiveTexture(i);
+ qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = scale));CHECKGLERROR
+ }
}
- }
- combinealpha = m->texcombinealpha[i];
- if (!combinealpha)
- combinealpha = GL_MODULATE;
- if (unit->combinealpha != combinealpha)
- {
- GL_ActiveTexture(i);
- unit->combinealpha = combinealpha;
- if (gl_combine.integer)
+ else
{
- qglTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB, unit->combinealpha);CHECKGLERROR
+ // normal GL texenv
+ combinergb = m->texcombinergb[i] ? m->texcombinergb[i] : GL_MODULATE;
+ if (unit->combinergb != combinergb)
+ {
+ unit->combinergb = combinergb;
+ GL_ActiveTexture(i);
+ qglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->combinergb);CHECKGLERROR
+ }
}
- }
- scale = max(m->texrgbscale[i], 1);
- if (unit->rgbscale != scale)
- {
- GL_ActiveTexture(i);
- qglTexEnvi(GL_TEXTURE_ENV, GL_RGB_SCALE_ARB, (unit->rgbscale = scale));CHECKGLERROR
- }
- scale = max(m->texalphascale[i], 1);
- if (unit->alphascale != scale)
- {
- GL_ActiveTexture(i);
- qglTexEnvi(GL_TEXTURE_ENV, GL_ALPHA_SCALE, (unit->alphascale = scale));CHECKGLERROR
- }
- if (m->pointer_texcoord3f[i])
- {
- arrayis3d = true;
- texcoords = m->pointer_texcoord3f[i];
- }
- else
- {
- arrayis3d = false;
- texcoords = m->pointer_texcoord[i];
- }
- if (texcoords && !unit->t1d && !unit->t2d && !unit->t3d && !unit->tcubemap)
- texcoords = NULL;
- if (unit->pointer_texcoord != texcoords || unit->arrayis3d != arrayis3d)
- {
- GL_ClientActiveTexture(i);
- if (texcoords)
+ // update array settings
+ if (m->pointer_texcoord3f[i])
{
- if (!unit->arrayenabled)
+ // 3d texcoord array
+ if (unit->pointer_texcoord != m->pointer_texcoord3f[i] || !unit->arrayis3d)
{
- unit->arrayenabled = true;
- qglEnableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+ unit->pointer_texcoord = m->pointer_texcoord3f[i];
+ unit->arrayis3d = true;
+ GL_ClientActiveTexture(i);
+ qglTexCoordPointer(3, GL_FLOAT, sizeof(float[3]), unit->pointer_texcoord);
+ CHECKGLERROR
}
}
else
{
- if (unit->arrayenabled)
+ // 2d texcoord array
+ if (unit->pointer_texcoord != m->pointer_texcoord[i] || unit->arrayis3d)
{
- unit->arrayenabled = false;
- qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+ unit->pointer_texcoord = m->pointer_texcoord[i];
+ unit->arrayis3d = false;
+ GL_ClientActiveTexture(i);
+ qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), unit->pointer_texcoord);
+ CHECKGLERROR
+ }
+ }
+ // update texmatrix
+ if (m->texmatrix[i].m[3][3])
+ {
+ // texmatrix specified, check if it is different
+ if (!unit->texmatrixenabled || memcmp(&unit->matrix, &m->texmatrix[i], sizeof(matrix4x4_t)))
+ {
+ unit->texmatrixenabled = true;
+ unit->matrix = m->texmatrix[i];
+ Matrix4x4_Transpose(&tempmatrix, &unit->matrix);
+ qglMatrixMode(GL_TEXTURE);
+ GL_ActiveTexture(i);
+ qglLoadMatrixf(&tempmatrix.m[0][0]);
+ qglMatrixMode(GL_MODELVIEW);
}
}
- unit->pointer_texcoord = texcoords;
- unit->arrayis3d = arrayis3d;
- if (unit->arrayis3d)
- qglTexCoordPointer(3, GL_FLOAT, sizeof(float[3]), unit->pointer_texcoord);
else
- qglTexCoordPointer(2, GL_FLOAT, sizeof(float[2]), unit->pointer_texcoord);
- CHECKGLERROR
+ {
+ // no texmatrix specified, revert to identity
+ if (unit->texmatrixenabled)
+ {
+ unit->texmatrixenabled = false;
+ qglMatrixMode(GL_TEXTURE);
+ GL_ActiveTexture(i);
+ qglLoadIdentity();
+ qglMatrixMode(GL_MODELVIEW);
+ }
+ }
}
- // if texmatrix is not set (3,3 should always be 1 in a texture matrix) just compare to the identity matrix
- if (m->texmatrix[i].m[3][3])
- texmatrix = &m->texmatrix[i];
else
- texmatrix = &r_identitymatrix;
- if (memcmp(&unit->matrix, texmatrix, sizeof(matrix4x4_t)))
{
- unit->matrix = *texmatrix;
- Matrix4x4_Transpose(&tempmatrix, &unit->matrix);
- qglMatrixMode(GL_TEXTURE);
- GL_ActiveTexture(i);
- qglLoadMatrixf(&tempmatrix.m[0][0]);
- qglMatrixMode(GL_MODELVIEW);
+ // texture unit is disabled, disable the array
+ if (unit->arrayenabled)
+ {
+ unit->arrayenabled = false;
+ GL_ClientActiveTexture(i);
+ qglDisableClientState(GL_TEXTURE_COORD_ARRAY);CHECKGLERROR
+ }
+ // no need to update most settings on a disabled texture unit
}
}
}
==============================================================================
*/
-qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height, qboolean jpeg)
+qboolean SCR_ScreenShot(char *filename, qbyte *buffer1, qbyte *buffer2, qbyte *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg)
{
+ int indices[3] = {0,1,2};
qboolean ret;
- qbyte *buffer;
if (!r_render.integer)
return false;
- buffer = Mem_Alloc(tempmempool, width*height*3);
- qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+ qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);
CHECKGLERROR
+ Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices);
+
if (jpeg)
- ret = JPEG_SaveImage_preflipped (filename, width, height, buffer);
+ ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2);
else
- ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer);
+ ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer2, buffer3);
- Mem_Free(buffer);
return ret;
}
float CalcFov (float fov_x, float width, float height)
{
// calculate vision size and alter by aspect, then convert back to angle
- return atan (height / (width / tan(fov_x/360*M_PI))) * 360 / M_PI;
+ return atan (((height/width)/vid_pixelaspect.value)*tan(fov_x/360.*M_PI))*360./M_PI;
}
/*
// LordHavoc: viewzoom (zoom in for sniper rifles, etc)
r_refdef.fov_x = scr_fov.value * cl.viewzoom;
r_refdef.fov_y = CalcFov (r_refdef.fov_x, r_refdef.width, r_refdef.height);
-
- if (cl.worldmodel)
+
+ if (r_waterwarp.value > 0)
{
- Mod_CheckLoaded(cl.worldmodel);
- contents = CL_PointSuperContents(r_vieworigin);
- if (contents & SUPERCONTENTS_LIQUIDSMASK)
+ if (cl.worldmodel)
{
- r_refdef.fov_x *= (sin(cl.time * 4.7) * 0.015 + 0.985);
- r_refdef.fov_y *= (sin(cl.time * 3.0) * 0.015 + 0.985);
+ Mod_CheckLoaded(cl.worldmodel);
+ contents = CL_PointSuperContents(r_vieworigin);
+ if (contents & SUPERCONTENTS_LIQUIDSMASK)
+ {
+ r_refdef.fov_x *= 1 - (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value);
+ r_refdef.fov_y *= 1 - (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value);
+ }
}
}
projects / xonotic / darkplaces.git / blobdiff