X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=7fd1463dbc7239c60c998ea3124db9ca861234a5;hp=8f63cabe7750bc99e332a9a5ea24e5ee4cefb553;hb=0024f172c0c10136e5ae18914be014a5b422ffb8;hpb=621e9a6a36d11a2906817008ef4233cff86657cb diff --git a/r_sky.c b/r_sky.c index 8f63cabe..7fd1463d 100644 --- a/r_sky.c +++ b/r_sky.c @@ -3,11 +3,13 @@ #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; @@ -19,7 +21,7 @@ static matrix4x4_t skyinversematrix; typedef struct suffixinfo_s { const char *suffix; - qboolean flipx, flipy, flipdiagonal; + qbool flipx, flipy, flipdiagonal; } suffixinfo_t; static const suffixinfo_t suffix[3][6] = @@ -50,7 +52,7 @@ static const suffixinfo_t suffix[3][6] = } }; -static rtexture_t *skyboxside[6]; +static skinframe_t *skyboxskinframe[6]; void R_SkyStartFrame(void) { @@ -59,11 +61,13 @@ void R_SkyStartFrame(void) skyrendermasked = false; // for depth-masked sky, we need to know whether any sky was rendered skyrenderlater = false; - if (r_sky.integer && !(r_refdef.fogenabled && r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1] < (1.0f / 256.0f))) + // we can scissor the sky to just the relevant area + Vector4Clear(skyscissor); + if (r_sky.integer) { - if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5]) + if (skyboxskinframe[0] || skyboxskinframe[1] || skyboxskinframe[2] || skyboxskinframe[3] || skyboxskinframe[4] || skyboxskinframe[5]) skyrenderbox = true; - else if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.solidskytexture) + else if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.solidskyskinframe) skyrendersphere = true; skyrendermasked = true; } @@ -74,30 +78,31 @@ void R_SkyStartFrame(void) R_SetSkyBox ================== */ -void R_UnloadSkyBox(void) +static void R_UnloadSkyBox(void) { int i; int c = 0; for (i = 0;i < 6;i++) { - if (skyboxside[i]) + if (skyboxskinframe[i]) { - R_FreeTexture(skyboxside[i]); + R_SkinFrame_PurgeSkinFrame(skyboxskinframe[i]); c++; } - skyboxside[i] = NULL; + skyboxskinframe[i] = NULL; } if (c && developer_loading.integer) Con_Printf("unloading skybox\n"); } -int R_LoadSkyBox(void) +static int R_LoadSkyBox(void) { int i, j, success; int indices[4] = {0,1,2,3}; char name[MAX_INPUTLINE]; unsigned char *image_buffer; unsigned char *temp; + char vabuf[1024]; R_UnloadSkyBox(); @@ -109,20 +114,20 @@ int R_LoadSkyBox(void) success = 0; for (i=0; i<6; i++) { - if (dpsnprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false))) + if (dpsnprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false, false, NULL))) { - if (dpsnprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false))) + if (dpsnprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false, false, NULL))) { - if (dpsnprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false))) + if (dpsnprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false, false, NULL))) { - if (dpsnprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false))) + if (dpsnprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_buffer = loadimagepixelsbgra(name, false, false, false, NULL))) continue; } } } 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); - skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, temp, TEXTYPE_BGRA, TEXF_CLAMP | TEXF_PRECACHE | (gl_texturecompression_sky.integer ? TEXF_COMPRESS : 0), NULL); + 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++; @@ -157,10 +162,10 @@ int R_SetSkyBox(const char *sky) return R_LoadSkyBox(); } -// LordHavoc: added LoadSky console command -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]) @@ -169,7 +174,7 @@ void LoadSky_f (void) 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); @@ -177,7 +182,7 @@ void LoadSky_f (void) 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"); @@ -253,7 +258,29 @@ static const float skyboxtexcoord2f[6*4*2] = 0, 0 }; -static const unsigned short skyboxelements[6*2*3] = +static const int skyboxelement3i[6*2*3] = +{ + // skyside[3] + 0, 1, 2, + 0, 2, 3, + // skyside[1] + 4, 5, 6, + 4, 6, 7, + // skyside[0] + 8, 9, 10, + 8, 10, 11, + // skyside[2] + 12, 13, 14, + 12, 14, 15, + // skyside[4] + 16, 17, 18, + 16, 18, 19, + // skyside[5] + 20, 21, 22, + 20, 22, 23 +}; + +static const unsigned short skyboxelement3s[6*2*3] = { // skyside[3] 0, 1, 2, @@ -278,39 +305,10 @@ static const unsigned short skyboxelements[6*2*3] = static void R_SkyBox(void) { int i; - // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1 - GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1); - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_CullFace(GL_NONE); - GL_DepthMask(false); - GL_DepthRange(0, 1); - GL_PolygonOffset(0, 0); - GL_DepthTest(false); // don't modify or read zbuffer - R_Mesh_VertexPointer(skyboxvertex3f, 0, 0); - R_Mesh_ColorPointer(NULL, 0, 0); - R_Mesh_ResetTextureState(); - R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f, 0, 0); - R_SetupGenericShader(true); - GL_LockArrays(0, 6*4); + 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++) - { - R_Mesh_TexBind(0, R_GetTexture(skyboxside[i])); - R_Mesh_Draw(0, 6*4, i*2, 2, NULL, skyboxelements, 0, 0); - } - - if(r_refdef.fogenabled) - { - R_SetupGenericShader(false); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]); - for (i = 0;i < 6;i++) - { - R_Mesh_TexBind(0, 0); - R_Mesh_Draw(0, 6*4, i*2, 2, NULL, skyboxelements, 0, 0); - } - } - - GL_LockArrays(0, 0); + if(skyboxskinframe[i]) + 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 @@ -323,7 +321,8 @@ static void R_SkyBox(void) #define skysphere_numtriangles (skygridx * skygridy * 2) static float skysphere_vertex3f[skysphere_numverts * 3]; static float skysphere_texcoord2f[skysphere_numverts * 2]; -static unsigned short skysphere_elements[skysphere_numtriangles * 3]; +static int skysphere_element3i[skysphere_numtriangles * 3]; +static unsigned short skysphere_element3s[skysphere_numtriangles * 3]; static void skyspherecalc(void) { @@ -356,7 +355,7 @@ static void skyspherecalc(void) *vertex3f++ = v[2]; } } - e = skysphere_elements; + e = skysphere_element3s; for (j = 0;j < skygridy;j++) { for (i = 0;i < skygridx;i++) @@ -370,12 +369,14 @@ static void skyspherecalc(void) *e++ = (j + 1) * skygridx1 + i; } } + for (i = 0;i < skysphere_numtriangles*3;i++) + skysphere_element3i[i] = skysphere_element3s[i]; } static void R_SkySphere(void) { double speedscale; - static qboolean skysphereinitialized = false; + static qbool skysphereinitialized = false; matrix4x4_t scroll1matrix, scroll2matrix; if (!skysphereinitialized) { @@ -394,57 +395,9 @@ static void R_SkySphere(void) speedscale -= floor(speedscale); Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0); - // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1 - GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1); - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_CullFace(GL_NONE); - GL_DepthMask(true); - GL_DepthRange(0, 1); - GL_PolygonOffset(0, 0); - GL_DepthTest(false); // don't modify or read zbuffer - R_Mesh_VertexPointer(skysphere_vertex3f, 0, 0); - R_Mesh_ColorPointer(NULL, 0, 0); - R_Mesh_ResetTextureState(); - R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.solidskytexture)); - R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f, 0, 0); - R_Mesh_TexMatrix(0, &scroll1matrix); - if (r_textureunits.integer >= 2 && r_refdef.view.colorscale == 1) - { - // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer - R_SetupGenericTwoTextureShader(GL_DECAL); - R_Mesh_TexBind(1, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture)); - R_Mesh_TexCoordPointer(1, 2, skysphere_texcoord2f, 0, 0); - R_Mesh_TexMatrix(1, &scroll2matrix); - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0); - GL_LockArrays(0, 0); - R_Mesh_TexBind(1, 0); - } - else - { - // two pass - R_SetupGenericShader(true); - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0); - - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture)); - R_Mesh_TexMatrix(0, &scroll2matrix); - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0); - GL_LockArrays(0, 0); - } - - if(r_refdef.fogenabled) - { - R_SetupGenericShader(false); - R_Mesh_TexBind(0, 0); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]); - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0); - GL_LockArrays(0, 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, 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) @@ -452,7 +405,14 @@ 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); - R_Mesh_Matrix(&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 @@ -472,9 +432,7 @@ void R_Sky(void) //GL_Clear(GL_DEPTH_BUFFER_BIT); } */ - GL_DepthRange(0, 1); - GL_DepthTest(true); - GL_DepthMask(true); + GL_Scissor(0, 0, r_fb.screentexturewidth, r_fb.screentextureheight); } //=============================================================== @@ -482,7 +440,7 @@ void R_Sky(void) void R_ResetSkyBox(void) { R_UnloadSkyBox(); - skyname[0] = 0; + memset(skyname,0,MAX_QPATH); R_LoadSkyBox(); } @@ -505,12 +463,13 @@ static void r_sky_newmap(void) 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); - memset(&skyboxside, 0, sizeof(skyboxside)); + 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); + R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap, NULL, NULL); }