qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 09:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Load the skybox faces into the correct cubemap slots.

Browse source 
Quake and GL are rotated relative to each other, so care must be taken
when loading and rendering.
This commit is contained in:
Bill Currie 2012-01-12 15:13:19 +09:00
parent f1eea0176c
commit 6e2d625d36
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/video/renderer/glsl/glsl_bsp.c
View file

@ -1181,14 +1181,16 @@ R_LoadSkys (const char *sky)
{
const char *name;
int i;
// NOTE: quake's world and GL's world are rotated relative to each other
// quake has x right, y in, z up. gl has x right, y up, z out
static const char *sky_suffix[] = { "ft", "bk", "lf", "rt", "up", "dn"};
static int sky_target[] = {
GL_TEXTURE_CUBE_MAP_POSITIVE_X,
GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z,
GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
GL_TEXTURE_CUBE_MAP_NEGATIVE_Z,
};
if (!sky || !*sky)

7
libs/video/renderer/glsl/quakeskb.frag
View file

@ -8,5 +8,10 @@ main (void)
vec3 dir = direction;
dir *= inversesqrt (dot (dir, dir));
gl_FragColor = textureCube(sky, dir);
// NOTE: quake's world and GL's world are rotated relative to each other
// quake has x right, y in, z up. gl has x right, y up, z out
// The textures are loaded with GL's z (quake's y) already negated, so
// all that's needed here is to swizzle y and z.
gl_FragColor = textureCube(sky, dir.xzy);
}