X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=5c0aca5f702edfea9aa482f203fcf819352ca142;hp=110407c5b3da14331a780203e6ef4f2271d5b1c3;hb=3aadac36c2aa86365586a589bf1910d895122a0e;hpb=73624ef15d754ca65acb6f2037989fb582cd7b92 diff --git a/r_sky.c b/r_sky.c index 110407c5..5c0aca5f 100644 --- a/r_sky.c +++ b/r_sky.c @@ -4,18 +4,50 @@ // FIXME: fix skybox after vid_restart cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"}; -qboolean skyavailable_quake; -qboolean skyavailable_box; +cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1"}; +cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2"}; int skyrendernow; int skyrendermasked; -static rtexture_t *solidskytexture; -static rtexture_t *alphaskytexture; static int skyrendersphere; static int skyrenderbox; static rtexturepool_t *skytexturepool; static char skyname[256]; -static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"}; + +typedef struct suffixinfo_s +{ + char *suffix; + qboolean flipx, flipy, flipdiagonal; +} +suffixinfo_t; +static suffixinfo_t suffix[3][6] = +{ + { + {"px", false, false, false}, + {"nx", false, false, false}, + {"py", false, false, false}, + {"ny", false, false, false}, + {"pz", false, false, false}, + {"nz", false, false, false} + }, + { + {"posx", false, false, false}, + {"negx", false, false, false}, + {"posy", false, false, false}, + {"negy", false, false, false}, + {"posz", false, false, false}, + {"negz", false, false, false} + }, + { + {"rt", false, false, true}, + {"lf", true, true, true}, + {"bk", false, true, false}, + {"ft", true, false, false}, + {"up", false, false, true}, + {"dn", false, false, true} + } +}; + static rtexture_t *skyboxside[6]; void R_SkyStartFrame(void) @@ -26,9 +58,9 @@ void R_SkyStartFrame(void) skyrendermasked = false; if (r_sky.integer && !fogenabled) { - if (skyavailable_box) + if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5]) skyrenderbox = true; - else if (skyavailable_quake) + else if (cl.worldmodel->brush.solidskytexture) skyrendersphere = true; // for depth-masked sky, render the sky on the first sky surface encountered skyrendernow = true; @@ -48,37 +80,53 @@ void R_UnloadSkyBox(void) { if (skyboxside[i]) R_FreeTexture(skyboxside[i]); - skyboxside[i] = NULL;; + skyboxside[i] = NULL; } } void R_LoadSkyBox(void) { - int i; + int i, j, success; + int indices[4] = {0,1,2,3}; char name[1024]; qbyte *image_rgba; + qbyte *temp; + R_UnloadSkyBox(); + if (!skyname[0]) return; - for (i = 0;i < 6;i++) + + for (j=0; j<3; j++) { - if (snprintf(name, sizeof(name), "%s_%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) + success = 0; + for (i=0; i<6; i++) { - if (snprintf(name, sizeof(name), "%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) + if (snprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) { - if (snprintf(name, sizeof(name), "env/%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) + if (snprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) { - if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suf[i]) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) + if (snprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) { - Con_Printf("Couldn't load %s_%s or %s%s or env/%s%s or gfx/env/%s%s\n", skyname, suf[i], skyname, suf[i], skyname, suf[i], skyname, suf[i]); - continue; + if (snprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) >= (int)sizeof(name) || !(image_rgba = loadimagepixels(name, false, 0, 0))) + continue; } } } + temp = 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); + Mem_Free(temp); + success++; } - skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL); - Mem_Free(image_rgba); + + if (success) + break; } + + if (j == 3) + Con_Printf ("Failed to load %s as skybox\n", skyname); } int R_SetSkyBox(const char *sky) @@ -92,20 +140,12 @@ int R_SetSkyBox(const char *sky) return false; } - skyavailable_box = false; strcpy(skyname, sky); - R_UnloadSkyBox(); R_LoadSkyBox(); if (!skyname[0]) return true; - - if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5]) - { - skyavailable_box = true; - return true; - } return false; } @@ -140,68 +180,68 @@ void LoadSky_f (void) float skyboxvertex3f[6*4*3] = { // skyside[0] - 16, 16, 16, + 16, -16, 16, + 16, -16, -16, 16, 16, -16, - -16, 16, -16, - -16, 16, 16, + 16, 16, 16, // skyside[1] -16, 16, 16, -16, 16, -16, -16, -16, -16, -16, -16, 16, // skyside[2] + 16, 16, 16, + 16, 16, -16, + -16, 16, -16, + -16, 16, 16, + // skyside[3] -16, -16, 16, -16, -16, -16, 16, -16, -16, 16, -16, 16, - // skyside[3] - 16, -16, 16, - 16, -16, -16, - 16, 16, -16, - 16, 16, 16, // skyside[4] + -16, -16, 16, 16, -16, 16, 16, 16, 16, -16, 16, 16, - -16, -16, 16, // skyside[5] - 16, 16, -16, 16, -16, -16, -16, -16, -16, - -16, 16, -16 + -16, 16, -16, + 16, 16, -16 }; float skyboxtexcoord2f[6*4*2] = { // skyside[0] - 1, 0, - 1, 1, 0, 1, + 1, 1, + 1, 0, 0, 0, // skyside[1] 1, 0, - 1, 1, - 0, 1, 0, 0, + 0, 1, + 1, 1, // skyside[2] - 1, 0, 1, 1, - 0, 1, - 0, 0, - // skyside[3] 1, 0, - 1, 1, + 0, 0, 0, 1, + // skyside[3] 0, 0, - // skyside[4] - 1, 0, + 0, 1, 1, 1, + 1, 0, + // skyside[4] 0, 1, + 1, 1, + 1, 0, 0, 0, // skyside[5] - 1, 0, - 1, 1, 0, 1, + 1, 1, + 1, 0, 0, 0 }; @@ -234,16 +274,18 @@ static void R_SkyBox(void) GL_Color(1, 1, 1, 1); memset(&m, 0, sizeof(m)); GL_BlendFunc(GL_ONE, GL_ZERO); - GL_DepthMask(true); + GL_DepthMask(false); GL_DepthTest(false); // don't modify or read zbuffer m.pointer_vertex = skyboxvertex3f; m.pointer_texcoord[0] = skyboxtexcoord2f; + GL_LockArrays(0, 6*4); for (i = 0;i < 6;i++) { m.tex[0] = R_GetTexture(skyboxside[i]); R_Mesh_State(&m); R_Mesh_Draw(6*4, 2, skyboxelements + i * 6); } + GL_LockArrays(0, 0); } #define skygridx 32 @@ -309,22 +351,23 @@ static void R_SkySphere(void) float speedscale; static qboolean skysphereinitialized = false; rmeshstate_t m; - matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix; + matrix4x4_t scroll1matrix, scroll2matrix; if (!skysphereinitialized) { skysphereinitialized = true; skyspherecalc(); } + // wrap the scroll values just to be extra kind to float accuracy + // scroll speed for upper layer - speedscale = cl.time*8.0/128.0; - // wrap the scroll just to be extra kind to float accuracy + speedscale = cl.time*r_skyscroll1.value*8.0/128.0; speedscale -= (int)speedscale; - - // scroll the lower cloud layer twice as fast (just like quake did) Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0); - Matrix4x4_CreateTranslate(&scroll2matrix, speedscale * 2, speedscale * 2, 0); - Matrix4x4_CreateIdentity(&identitymatrix); + // scroll speed for lower layer (transparent layer) + speedscale = cl.time*r_skyscroll2.value*8.0/128.0; + speedscale -= (int)speedscale; + Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0); GL_Color(1, 1, 1, 1); GL_BlendFunc(GL_ONE, GL_ZERO); @@ -332,33 +375,37 @@ static void R_SkySphere(void) GL_DepthTest(false); // don't modify or read zbuffer memset(&m, 0, sizeof(m)); m.pointer_vertex = skysphere_vertex3f; - m.tex[0] = R_GetTexture(solidskytexture); + m.tex[0] = R_GetTexture(cl.worldmodel->brush.solidskytexture); m.pointer_texcoord[0] = skysphere_texcoord2f; - R_Mesh_TextureMatrix(0, &scroll1matrix); + m.texmatrix[0] = scroll1matrix; if (r_textureunits.integer >= 2) { // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer - m.tex[1] = R_GetTexture(alphaskytexture); + m.tex[1] = R_GetTexture(cl.worldmodel->brush.alphaskytexture); m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL; m.pointer_texcoord[1] = skysphere_texcoord2f; + m.texmatrix[1] = scroll2matrix; R_Mesh_State(&m); - R_Mesh_TextureMatrix(1, &scroll2matrix); + GL_LockArrays(0, skysphere_numverts); R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i); - R_Mesh_TextureMatrix(1, &identitymatrix); + GL_LockArrays(0, 0); } else { // two pass R_Mesh_State(&m); + GL_LockArrays(0, skysphere_numverts); R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i); + GL_LockArrays(0, 0); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - m.tex[0] = R_GetTexture(alphaskytexture); + m.tex[0] = R_GetTexture(cl.worldmodel->brush.alphaskytexture); + m.texmatrix[0] = scroll2matrix; R_Mesh_State(&m); - R_Mesh_TextureMatrix(0, &scroll2matrix); + GL_LockArrays(0, skysphere_numverts); R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_element3i); + GL_LockArrays(0, 0); } - R_Mesh_TextureMatrix(0, &identitymatrix); } void R_Sky(void) @@ -392,94 +439,16 @@ void R_Sky(void) //=============================================================== -/* -============= -R_InitSky - -A sky texture is 256*128, with the right side being a masked overlay -============== -*/ -void R_InitSky (qbyte *src, int bytesperpixel) -{ - int i, j; - unsigned solidpixels[128*128], alphapixels[128*128]; - - skyavailable_quake = true; - - // flush skytexturepool so we won't build up a leak from uploading textures multiple times - R_FreeTexturePool(&skytexturepool); - skytexturepool = R_AllocTexturePool(); - solidskytexture = NULL; - alphaskytexture = NULL; - - if (bytesperpixel == 4) - { - for (i = 0;i < 128;i++) - { - for (j = 0;j < 128;j++) - { - solidpixels[(i*128) + j] = ((unsigned *)src)[i*256+j+128]; - alphapixels[(i*128) + j] = ((unsigned *)src)[i*256+j]; - } - } - } - else - { - // make an average value for the back to avoid - // a fringe on the top level - int p, r, g, b; - union - { - unsigned int i; - unsigned char b[4]; - } - rgba; - r = g = b = 0; - for (i = 0;i < 128;i++) - { - for (j = 0;j < 128;j++) - { - rgba.i = palette_complete[src[i*256 + j + 128]]; - r += rgba.b[0]; - g += rgba.b[1]; - b += rgba.b[2]; - } - } - rgba.b[0] = r/(128*128); - rgba.b[1] = g/(128*128); - rgba.b[2] = b/(128*128); - rgba.b[3] = 0; - for (i = 0;i < 128;i++) - { - for (j = 0;j < 128;j++) - { - solidpixels[(i*128) + j] = palette_complete[src[i*256 + j + 128]]; - alphapixels[(i*128) + j] = (p = src[i*256 + j]) ? palette_complete[p] : rgba.i; - } - } - } - - solidskytexture = R_LoadTexture2D(skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) solidpixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL); - alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) alphapixels, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL); -} - -void R_ResetQuakeSky(void) -{ - skyavailable_quake = false; -} - void R_ResetSkyBox(void) { skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL; skyname[0] = 0; - skyavailable_box = false; + R_LoadSkyBox(); } static void r_sky_start(void) { skytexturepool = R_AllocTexturePool(); - solidskytexture = NULL; - alphaskytexture = NULL; R_LoadSkyBox(); } @@ -487,20 +456,21 @@ static void r_sky_shutdown(void) { R_UnloadSkyBox(); R_FreeTexturePool(&skytexturepool); - solidskytexture = NULL; - alphaskytexture = NULL; } static void r_sky_newmap(void) { } + void R_Sky_Init(void) { Cmd_AddCommand ("loadsky", &LoadSky_f); Cvar_RegisterVariable (&r_sky); - R_ResetSkyBox(); - R_ResetQuakeSky(); + Cvar_RegisterVariable (&r_skyscroll1); + Cvar_RegisterVariable (&r_skyscroll2); + skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL; + skyname[0] = 0; R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap); }