X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=7f941b478f56bbe75d6027f35d3251b3f0cd09df;hp=41b473a67243584108eb0299ae1ae93c1075b92f;hb=85a33377d64ae8438e6582a7b8472f5a4bd41942;hpb=aaff7d54980117a2dbf650516ffbdf3fa65016f8 diff --git a/r_sky.c b/r_sky.c index 41b473a6..7f941b47 100644 --- a/r_sky.c +++ b/r_sky.c @@ -6,21 +6,25 @@ 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"}; -int skyrendernow; +cvar_t r_sky_scissor = {0, "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; static rtexturepool_t *skytexturepool; static char skyname[MAX_QPATH]; +static matrix4x4_t skymatrix; +static matrix4x4_t skyinversematrix; typedef struct suffixinfo_s { - char *suffix; + const char *suffix; qboolean flipx, flipy, flipdiagonal; } suffixinfo_t; -static suffixinfo_t suffix[3][6] = +static const suffixinfo_t suffix[3][6] = { { {"px", false, false, false}, @@ -48,22 +52,23 @@ static suffixinfo_t suffix[3][6] = } }; -static rtexture_t *skyboxside[6]; +static skinframe_t *skyboxskinframe[6]; void R_SkyStartFrame(void) { - skyrendernow = false; skyrendersphere = false; skyrenderbox = false; skyrendermasked = false; - if (r_sky.integer && !r_refdef.fogenabled) + // 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 (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.worldmodel->brush.solidskytexture) + else if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.solidskyskinframe) skyrendersphere = true; - // for depth-masked sky, render the sky on the first sky surface encountered - skyrendernow = true; skyrendermasked = true; } } @@ -73,24 +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]) - R_FreeTexture(skyboxside[i]); - skyboxside[i] = NULL; + if (skyboxskinframe[i]) + { + // TODO: make a R_SkinFrame_Purge for single skins... + c++; + } + 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_rgba; + unsigned char *image_buffer; unsigned char *temp; + char vabuf[1024]; R_UnloadSkyBox(); @@ -102,21 +114,21 @@ 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_rgba = loadimagepixels(name, false, 0, 0))) + 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_rgba = loadimagepixels(name, false, 0, 0))) + 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_rgba = loadimagepixels(name, false, 0, 0))) + 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_rgba = loadimagepixels(name, false, 0, 0))) + 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_rgba, 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_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL); - Mem_Free(image_rgba); + 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, 0, 0, 0, vid.sRGB3D); + Mem_Free(image_buffer); Mem_Free(temp); success++; } @@ -128,6 +140,9 @@ int R_LoadSkyBox(void) if (j == 3) return false; + if (developer_loading.integer) + Con_Printf("loading skybox \"%s\"\n", name); + return true; } @@ -138,17 +153,17 @@ int R_SetSkyBox(const char *sky) if (strlen(sky) > 1000) { - Con_Printf("sky name too long (%i, max is 1000)\n", strlen(sky)); + Con_Printf("sky name too long (%i, max is 1000)\n", (int)strlen(sky)); return false; } - strcpy(skyname, sky); + strlcpy(skyname, sky, sizeof(skyname)); return R_LoadSkyBox(); } // LordHavoc: added LoadSky console command -void LoadSky_f (void) +static void LoadSky_f (void) { switch (Cmd_Argc()) { @@ -175,7 +190,7 @@ void LoadSky_f (void) } } -float skyboxvertex3f[6*4*3] = +static const float skyboxvertex3f[6*4*3] = { // skyside[0] 16, -16, 16, @@ -209,7 +224,7 @@ float skyboxvertex3f[6*4*3] = 16, 16, -16 }; -float skyboxtexcoord2f[6*4*2] = +static const float skyboxtexcoord2f[6*4*2] = { // skyside[0] 0, 1, @@ -243,7 +258,29 @@ float skyboxtexcoord2f[6*4*2] = 0, 0 }; -int 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, @@ -268,22 +305,10 @@ int skyboxelements[6*2*3] = static void R_SkyBox(void) { int i; - // FIXME: fixed function path can't properly handle r_view.colorscale > 1 - GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1); - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(false); - GL_DepthTest(false); // don't modify or read zbuffer - R_Mesh_VertexPointer(skyboxvertex3f); - R_Mesh_ColorPointer(NULL); - R_Mesh_ResetTextureState(); - R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f); - 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, 2, skyboxelements + i * 6); - } - 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); } #define skygridx 32 @@ -297,15 +322,17 @@ static void R_SkyBox(void) static float skysphere_vertex3f[skysphere_numverts * 3]; static float skysphere_texcoord2f[skysphere_numverts * 2]; static int skysphere_element3i[skysphere_numtriangles * 3]; +static unsigned short skysphere_element3s[skysphere_numtriangles * 3]; static void skyspherecalc(void) { - int i, j, *e; + int i, j; + unsigned short *e; float a, b, x, ax, ay, v[3], length, *vertex3f, *texcoord2f; float dx, dy, dz; - dx = 16; - dy = 16; - dz = 16 / 3; + dx = 16.0f; + dy = 16.0f; + dz = 16.0f / 3.0f; vertex3f = skysphere_vertex3f; texcoord2f = skysphere_texcoord2f; for (j = 0;j <= skygridy;j++) @@ -328,7 +355,7 @@ static void skyspherecalc(void) *vertex3f++ = v[2]; } } - e = skysphere_element3i; + e = skysphere_element3s; for (j = 0;j < skygridy;j++) { for (i = 0;i < skygridx;i++) @@ -342,11 +369,13 @@ 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) { - float speedscale; + double speedscale; static qboolean skysphereinitialized = false; matrix4x4_t scroll1matrix, scroll2matrix; if (!skysphereinitialized) @@ -358,80 +387,52 @@ static void R_SkySphere(void) // wrap the scroll values just to be extra kind to float accuracy // scroll speed for upper layer - speedscale = r_refdef.time*r_skyscroll1.value*8.0/128.0; - speedscale -= (int)speedscale; + speedscale = r_refdef.scene.time*r_skyscroll1.value*8.0/128.0; + speedscale -= floor(speedscale); Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0); // scroll speed for lower layer (transparent layer) - speedscale = r_refdef.time*r_skyscroll2.value*8.0/128.0; - speedscale -= (int)speedscale; + speedscale = r_refdef.scene.time*r_skyscroll2.value*8.0/128.0; + speedscale -= floor(speedscale); Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0); - // FIXME: fixed function path can't properly handle r_view.colorscale > 1 - GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1); - GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(true); - GL_DepthTest(false); // don't modify or read zbuffer - R_Mesh_VertexPointer(skysphere_vertex3f); - R_Mesh_ColorPointer(NULL); - R_Mesh_ResetTextureState(); - R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture)); - R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f); - R_Mesh_TexMatrix(0, &scroll1matrix); - if (r_textureunits.integer >= 2 && r_view.colorscale == 1) - { - // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer - R_Mesh_TexBind(1, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture)); - R_Mesh_TexCombine(1, gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL, GL_MODULATE, 1, 1); - R_Mesh_TexCoordPointer(1, 2, skysphere_texcoord2f); - R_Mesh_TexMatrix(1, &scroll2matrix); - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); - GL_LockArrays(0, 0); - } - else - { - // two pass - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); - - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture)); - R_Mesh_TexMatrix(0, &scroll2matrix); - GL_LockArrays(0, skysphere_numverts); - R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); - 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); + 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); } void R_Sky(void) { - matrix4x4_t skymatrix; - if (skyrendermasked) + 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) { - Matrix4x4_CreateTranslate(&skymatrix, r_view.origin[0], r_view.origin[1], r_view.origin[2]); - R_Mesh_Matrix(&skymatrix); - if (skyrendersphere) - { - // this does not modify depth buffer - R_SkySphere(); - } - else if (skyrenderbox) - { - // this does not modify depth buffer - R_SkyBox(); - } - /* this will be skyroom someday - else - { - // this modifies the depth buffer so we have to clear it afterward - //R_SkyRoom(); - // clear the depthbuffer that was used while rendering the skyroom - //GL_Clear(GL_DEPTH_BUFFER_BIT); - } - */ - GL_DepthTest(true); - GL_DepthMask(true); + // 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 + R_SkySphere(); + } + else if (skyrenderbox) + { + // this does not modify depth buffer + R_SkyBox(); + } + /* this will be skyroom someday + else + { + // this modifies the depth buffer so we have to clear it afterward + //R_SkyRoom(); + // clear the depthbuffer that was used while rendering the skyroom + //GL_Clear(GL_DEPTH_BUFFER_BIT); } + */ + GL_Scissor(0, 0, vid.width, vid.height); } //=============================================================== @@ -466,8 +467,9 @@ void R_Sky_Init(void) 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); }