#include "image.h"
// FIXME: fix skybox after vid_restart
-cvar_t r_sky = {CVAR_SAVE, "r_sky", "1", "enables sky rendering (black otherwise)"};
-cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1", "speed at which upper clouds layer scrolls in quake sky"};
-cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2", "speed at which lower clouds layer scrolls in quake sky"};
+cvar_t r_sky = {CF_CLIENT | CF_ARCHIVE, "r_sky", "1", "enables sky rendering (black otherwise)"};
+cvar_t r_skyscroll1 = {CF_CLIENT | CF_ARCHIVE, "r_skyscroll1", "1", "speed at which upper clouds layer scrolls in quake sky"};
+cvar_t r_skyscroll2 = {CF_CLIENT | CF_ARCHIVE, "r_skyscroll2", "2", "speed at which lower clouds layer scrolls in quake sky"};
+cvar_t r_sky_scissor = {CF_CLIENT, "r_sky_scissor", "1", "limit rendering of sky to approximately the area of the sky surfaces"};
int skyrenderlater;
int skyrendermasked;
+int skyscissor[4];
static int skyrendersphere;
static int skyrenderbox;
typedef struct suffixinfo_s
{
const char *suffix;
- qboolean flipx, flipy, flipdiagonal;
+ qbool flipx, flipy, flipdiagonal;
}
suffixinfo_t;
static const suffixinfo_t suffix[3][6] =
skyrendermasked = false;
// for depth-masked sky, we need to know whether any sky was rendered
skyrenderlater = false;
+ // we can scissor the sky to just the relevant area
+ Vector4Clear(skyscissor);
if (r_sky.integer)
{
if (skyboxskinframe[0] || skyboxskinframe[1] || skyboxskinframe[2] || skyboxskinframe[3] || skyboxskinframe[4] || skyboxskinframe[5])
{
if (skyboxskinframe[i])
{
- // TODO: make a R_SkinFrame_Purge for single skins...
+ R_SkinFrame_PurgeSkinFrame(skyboxskinframe[i]);
c++;
}
skyboxskinframe[i] = NULL;
}
temp = (unsigned char *)Mem_Alloc(tempmempool, image_width*image_height*4);
Image_CopyMux (temp, image_buffer, image_width, image_height, suffix[j][i].flipx, suffix[j][i].flipy, suffix[j][i].flipdiagonal, 4, 4, indices);
- skyboxskinframe[i] = R_SkinFrame_LoadInternalBGRA(va(vabuf, sizeof(vabuf), "skyboxside%d", i), TEXF_CLAMP | (gl_texturecompression_sky.integer ? TEXF_COMPRESS : 0), temp, image_width, image_height, vid.sRGB3D);
+ skyboxskinframe[i] = R_SkinFrame_LoadInternalBGRA(va(vabuf, sizeof(vabuf), "skyboxside%d", i), TEXF_CLAMP | (gl_texturecompression_sky.integer ? TEXF_COMPRESS : 0), temp, image_width, image_height, 0, 0, 0, vid.sRGB3D);
Mem_Free(image_buffer);
Mem_Free(temp);
success++;
return R_LoadSkyBox();
}
-// LordHavoc: added LoadSky console command
-static void LoadSky_f (void)
+// LadyHavoc: added LoadSky console command
+static void LoadSky_f(cmd_state_t *cmd)
{
- switch (Cmd_Argc())
+ switch (Cmd_Argc(cmd))
{
case 1:
if (skyname[0])
Con_Print("no skybox has been set\n");
break;
case 2:
- if (R_SetSkyBox(Cmd_Argv(1)))
+ if (R_SetSkyBox(Cmd_Argv(cmd, 1)))
{
if (skyname[0])
Con_Printf("skybox set to %s\n", skyname);
Con_Print("skybox disabled\n");
}
else
- Con_Printf("failed to load skybox %s\n", Cmd_Argv(1));
+ Con_Printf(CON_ERROR "failed to load skybox %s\n", Cmd_Argv(cmd, 1));
break;
default:
Con_Print("usage: loadsky skyname\n");
RSurf_ActiveCustomEntity(&skymatrix, &skyinversematrix, 0, 0, 1, 1, 1, 1, 6*4, skyboxvertex3f, skyboxtexcoord2f, NULL, NULL, NULL, NULL, 6*2, skyboxelement3i, skyboxelement3s, false, false);
for (i = 0;i < 6;i++)
if(skyboxskinframe[i])
- R_DrawCustomSurface(skyboxskinframe[i], &identitymatrix, MATERIALFLAG_SKY | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE | MATERIALFLAG_NODEPTHTEST, i*4, 4, i*2, 2, false, false);
+ R_DrawCustomSurface(skyboxskinframe[i], &identitymatrix, MATERIALFLAG_SKY | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE | MATERIALFLAG_NODEPTHTEST, i*4, 4, i*2, 2, false, false, false);
}
#define skygridx 32
static void R_SkySphere(void)
{
double speedscale;
- static qboolean skysphereinitialized = false;
+ static qbool skysphereinitialized = false;
matrix4x4_t scroll1matrix, scroll2matrix;
if (!skysphereinitialized)
{
Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
RSurf_ActiveCustomEntity(&skymatrix, &skyinversematrix, 0, 0, 1, 1, 1, 1, skysphere_numverts, skysphere_vertex3f, skysphere_texcoord2f, NULL, NULL, NULL, NULL, skysphere_numtriangles, skysphere_element3i, skysphere_element3s, false, false);
- R_DrawCustomSurface(r_refdef.scene.worldmodel->brush.solidskyskinframe, &scroll1matrix, MATERIALFLAG_SKY | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE | MATERIALFLAG_NODEPTHTEST , 0, skysphere_numverts, 0, skysphere_numtriangles, false, false);
- R_DrawCustomSurface(r_refdef.scene.worldmodel->brush.alphaskyskinframe, &scroll2matrix, MATERIALFLAG_SKY | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE | MATERIALFLAG_NODEPTHTEST | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED, 0, skysphere_numverts, 0, skysphere_numtriangles, false, false);
+ R_DrawCustomSurface(r_refdef.scene.worldmodel->brush.solidskyskinframe, &scroll1matrix, MATERIALFLAG_SKY | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE | MATERIALFLAG_NODEPTHTEST , 0, skysphere_numverts, 0, skysphere_numtriangles, false, false, false);
+ R_DrawCustomSurface(r_refdef.scene.worldmodel->brush.alphaskyskinframe, &scroll2matrix, MATERIALFLAG_SKY | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE | MATERIALFLAG_NODEPTHTEST | MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED, 0, skysphere_numverts, 0, skysphere_numtriangles, false, false, false);
}
void R_Sky(void)
Matrix4x4_CreateFromQuakeEntity(&skymatrix, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2], 0, 0, 0, r_refdef.farclip * (0.5f / 16.0f));
Matrix4x4_Invert_Simple(&skyinversematrix, &skymatrix);
+ if (r_sky_scissor.integer)
+ {
+ // if the scissor is empty just return
+ if (skyscissor[2] == 0 || skyscissor[3] == 0)
+ return;
+ GL_Scissor(skyscissor[0], skyscissor[1], skyscissor[2], skyscissor[3]);
+ GL_ScissorTest(true);
+ }
if (skyrendersphere)
{
// this does not modify depth buffer
//GL_Clear(GL_DEPTH_BUFFER_BIT);
}
*/
+ GL_Scissor(0, 0, r_fb.screentexturewidth, r_fb.screentextureheight);
}
//===============================================================
void R_ResetSkyBox(void)
{
R_UnloadSkyBox();
- skyname[0] = 0;
+ memset(skyname,0,MAX_QPATH);
R_LoadSkyBox();
}
void R_Sky_Init(void)
{
- Cmd_AddCommand ("loadsky", &LoadSky_f, "load a skybox by basename (for example loadsky mtnsun_ loads mtnsun_ft.tga and so on)");
+ Cmd_AddCommand(CF_CLIENT, "loadsky", &LoadSky_f, "load a skybox by basename (for example loadsky mtnsun_ loads mtnsun_ft.tga and so on)");
Cvar_RegisterVariable (&r_sky);
Cvar_RegisterVariable (&r_skyscroll1);
Cvar_RegisterVariable (&r_skyscroll2);
+ Cvar_RegisterVariable (&r_sky_scissor);
memset(&skyboxskinframe, 0, sizeof(skyboxskinframe));
skyname[0] = 0;
R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap, NULL, NULL);