X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_sky.c;h=8ed9da7b5f6d4bb9176fd068f6c80478290e0261;hp=6f1cb06ac2074c853c5f36b7420b15cad15a1a43;hb=1e72302958b4771d8dc043fa3274a10e8a14e9d8;hpb=8fd8e96110f501587d3331139e694f54e4f32c9f diff --git a/r_sky.c b/r_sky.c index 6f1cb06a..8ed9da7b 100644 --- a/r_sky.c +++ b/r_sky.c @@ -1,19 +1,53 @@ #include "quakedef.h" +#include "image.h" -cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"}; -qboolean skyavailable_quake; -qboolean skyavailable_box; +// 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"}; 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"}; +static char skyname[MAX_QPATH]; + +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) @@ -24,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 (r_refdef.worldmodel->brush.solidskytexture) skyrendersphere = true; // for depth-masked sky, render the sky on the first sky surface encountered skyrendernow = true; @@ -39,51 +73,78 @@ void R_SkyStartFrame(void) R_SetSkyBox ================== */ -int R_SetSkyBox(const char *sky) +void R_UnloadSkyBox(void) { int i; - char name[1024]; - qbyte *image_rgba; + for (i = 0;i < 6;i++) + { + if (skyboxside[i]) + R_FreeTexture(skyboxside[i]); + skyboxside[i] = NULL; + } +} - if (strcmp(sky, skyname) == 0) // no change - return true; +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 *temp; - skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL; - skyavailable_box = false; - skyname[0] = 0; + R_UnloadSkyBox(); - if (!sky[0]) + if (!skyname[0]) return true; - if (strlen(sky) > 1000) - { - Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky)); - return false; - } - - for (i = 0;i < 6;i++) + for (j=0; j<3; j++) { - sprintf (name, "env/%s%s", sky, suf[i]); - if (!(image_rgba = loadimagepixels(name, false, 0, 0))) + success = 0; + for (i=0; i<6; i++) { - sprintf (name, "gfx/env/%s%s", sky, suf[i]); - if (!(image_rgba = loadimagepixels(name, false, 0, 0))) + if (dpsnprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0))) { - Con_Printf ("Couldn't load env/%s%s or gfx/env/%s%s\n", sky, suf[i], sky, suf[i]); - continue; + 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), "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_rgba = loadimagepixels(name, false, 0, 0))) + 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); + Mem_Free(temp); + success++; } - skyboxside[i] = R_LoadTexture(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_PRECACHE); - Mem_Free(image_rgba); + + if (success) + break; } - if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5]) - { - skyavailable_box = true; - strcpy(skyname, sky); + if (j == 3) + return false; + + return true; +} + +int R_SetSkyBox(const char *sky) +{ + if (strcmp(sky, skyname) == 0) // no change return true; + + if (strlen(sky) > 1000) + { + Con_Printf("sky name too long (%i, max is 1000)\n", strlen(sky)); + return false; } - return false; + + strcpy(skyname, sky); + + return R_LoadSkyBox(); } // LordHavoc: added LoadSky console command @@ -95,7 +156,7 @@ void LoadSky_f (void) if (skyname[0]) Con_Printf("current sky: %s\n", skyname); else - Con_Printf("no skybox has been set\n"); + Con_Print("no skybox has been set\n"); break; case 2: if (R_SetSkyBox(Cmd_Argv(1))) @@ -103,77 +164,126 @@ void LoadSky_f (void) if (skyname[0]) Con_Printf("skybox set to %s\n", skyname); else - Con_Printf("skybox disabled\n"); + Con_Print("skybox disabled\n"); } else Con_Printf("failed to load skybox %s\n", Cmd_Argv(1)); break; default: - Con_Printf("usage: loadsky skyname\n"); + Con_Print("usage: loadsky skyname\n"); break; } } +float skyboxvertex3f[6*4*3] = +{ + // skyside[0] + 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[4] + -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 +}; + +float skyboxtexcoord2f[6*4*2] = +{ + // skyside[0] + 0, 1, + 1, 1, + 1, 0, + 0, 0, + // skyside[1] + 1, 0, + 0, 0, + 0, 1, + 1, 1, + // skyside[2] + 1, 1, + 1, 0, + 0, 0, + 0, 1, + // skyside[3] + 0, 0, + 0, 1, + 1, 1, + 1, 0, + // skyside[4] + 0, 1, + 1, 1, + 1, 0, + 0, 0, + // skyside[5] + 0, 1, + 1, 1, + 1, 0, + 0, 0 +}; + +int skyboxelements[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 void R_SkyBox(void) { + int i; rmeshstate_t m; - -#define R_SkyBoxPolyVec(i,s,t,x,y,z) \ - varray_vertex[i * 4 + 0] = (x) * 16.0f;\ - varray_vertex[i * 4 + 1] = (y) * 16.0f;\ - varray_vertex[i * 4 + 2] = (z) * 16.0f;\ - varray_texcoord[0][i * 4 + 0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\ - varray_texcoord[0][i * 4 + 1] = (t) * (254.0f/256.0f) + (1.0f/256.0f); - + GL_Color(1, 1, 1, 1); memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.depthdisable = true; // don't modify or read zbuffer - m.tex[0] = R_GetTexture(skyboxside[3]); // front - R_Mesh_State(&m); - - GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); - - R_SkyBoxPolyVec(0, 1, 0, 1, -1, 1); - R_SkyBoxPolyVec(1, 1, 1, 1, -1, -1); - R_SkyBoxPolyVec(2, 0, 1, 1, 1, -1); - R_SkyBoxPolyVec(3, 0, 0, 1, 1, 1); - R_Mesh_Draw(4, 2, polygonelements); - m.tex[0] = R_GetTexture(skyboxside[1]); // back - R_Mesh_State(&m); - R_SkyBoxPolyVec(0, 1, 0, -1, 1, 1); - R_SkyBoxPolyVec(1, 1, 1, -1, 1, -1); - R_SkyBoxPolyVec(2, 0, 1, -1, -1, -1); - R_SkyBoxPolyVec(3, 0, 0, -1, -1, 1); - R_Mesh_Draw(4, 2, polygonelements); - m.tex[0] = R_GetTexture(skyboxside[0]); // right - R_Mesh_State(&m); - R_SkyBoxPolyVec(0, 1, 0, 1, 1, 1); - R_SkyBoxPolyVec(1, 1, 1, 1, 1, -1); - R_SkyBoxPolyVec(2, 0, 1, -1, 1, -1); - R_SkyBoxPolyVec(3, 0, 0, -1, 1, 1); - R_Mesh_Draw(4, 2, polygonelements); - m.tex[0] = R_GetTexture(skyboxside[2]); // left - R_Mesh_State(&m); - R_SkyBoxPolyVec(0, 1, 0, -1, -1, 1); - R_SkyBoxPolyVec(1, 1, 1, -1, -1, -1); - R_SkyBoxPolyVec(2, 0, 1, 1, -1, -1); - R_SkyBoxPolyVec(3, 0, 0, 1, -1, 1); - R_Mesh_Draw(4, 2, polygonelements); - m.tex[0] = R_GetTexture(skyboxside[4]); // up - R_Mesh_State(&m); - R_SkyBoxPolyVec(0, 1, 0, 1, -1, 1); - R_SkyBoxPolyVec(1, 1, 1, 1, 1, 1); - R_SkyBoxPolyVec(2, 0, 1, -1, 1, 1); - R_SkyBoxPolyVec(3, 0, 0, -1, -1, 1); - R_Mesh_Draw(4, 2, polygonelements); - m.tex[0] = R_GetTexture(skyboxside[5]); // down - R_Mesh_State(&m); - R_SkyBoxPolyVec(0, 1, 0, 1, 1, -1); - R_SkyBoxPolyVec(1, 1, 1, 1, -1, -1); - R_SkyBoxPolyVec(2, 0, 1, -1, -1, -1); - R_SkyBoxPolyVec(3, 0, 0, -1, 1, -1); - R_Mesh_Draw(4, 2, polygonelements); + GL_BlendFunc(GL_ONE, GL_ZERO); + 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(0, 6*4, 2, skyboxelements + i * 6); + } + GL_LockArrays(0, 0); } #define skygridx 32 @@ -184,20 +294,20 @@ static void R_SkyBox(void) #define skygridyrecip (1.0f / (skygridy)) #define skysphere_numverts (skygridx1 * skygridy1) #define skysphere_numtriangles (skygridx * skygridy * 2) -static float skysphere_vertex[skysphere_numverts * 4]; -static float skysphere_texcoord[skysphere_numverts * 4]; -static int skysphere_elements[skysphere_numtriangles * 3]; +static float skysphere_vertex3f[skysphere_numverts * 3]; +static float skysphere_texcoord2f[skysphere_numverts * 2]; +static int skysphere_element3i[skysphere_numtriangles * 3]; static void skyspherecalc(void) { int i, j, *e; - float a, b, x, ax, ay, v[3], length, *vertex, *texcoord; + float a, b, x, ax, ay, v[3], length, *vertex3f, *texcoord2f; float dx, dy, dz; dx = 16; dy = 16; dz = 16 / 3; - vertex = skysphere_vertex; - texcoord = skysphere_texcoord; + vertex3f = skysphere_vertex3f; + texcoord2f = skysphere_texcoord2f; for (j = 0;j <= skygridy;j++) { a = j * skygridyrecip; @@ -206,22 +316,19 @@ static void skyspherecalc(void) for (i = 0;i <= skygridx;i++) { b = i * skygridxrecip; - x = cos(b * M_PI * 2); + x = cos((b + 0.5) * M_PI); v[0] = ax*x * dx; v[1] = ay*x * dy; - v[2] = -sin(b * M_PI * 2) * dz; + v[2] = -sin((b + 0.5) * M_PI) * dz; length = 3.0f / sqrt(v[0]*v[0]+v[1]*v[1]+(v[2]*v[2]*9)); - *texcoord++ = v[0] * length; - *texcoord++ = v[1] * length; - *texcoord++ = 0; - *texcoord++ = 0; - *vertex++ = v[0]; - *vertex++ = v[1]; - *vertex++ = v[2]; - *vertex++ = 1; + *texcoord2f++ = v[0] * length; + *texcoord2f++ = v[1] * length; + *vertex3f++ = v[0]; + *vertex3f++ = v[1]; + *vertex3f++ = v[2]; } } - e = skysphere_elements; + e = skysphere_element3i; for (j = 0;j < skygridy;j++) { for (i = 0;i < skygridx;i++) @@ -234,59 +341,69 @@ static void skyspherecalc(void) *e++ = (j + 1) * skygridx1 + i + 1; *e++ = (j + 1) * skygridx1 + i; } - i++; } } static void R_SkySphere(void) { - int i; - float speedscale, *t; + float speedscale; static qboolean skysphereinitialized = false; rmeshstate_t m; + 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 = r_refdef.time*r_skyscroll1.value*8.0/128.0; speedscale -= (int)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; + Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0); - R_Mesh_ResizeCheck(skysphere_numverts); - + GL_Color(1, 1, 1, 1); + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + GL_DepthTest(false); // don't modify or read zbuffer memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_ONE; - m.blendfunc2 = GL_ZERO; - m.depthdisable = true; // don't modify or read zbuffer - m.tex[0] = R_GetTexture(solidskytexture); - R_Mesh_State(&m); - - GL_Color(r_colorscale, r_colorscale, r_colorscale, 1); - - memcpy(varray_vertex, skysphere_vertex, skysphere_numverts * sizeof(float[4])); - memcpy(varray_texcoord[0], skysphere_texcoord, skysphere_numverts * sizeof(float[4])); - for (i = 0, t = varray_texcoord[0];i < skysphere_numverts;i++, t += 4) + m.pointer_vertex = skysphere_vertex3f; + m.tex[0] = R_GetTexture(r_refdef.worldmodel->brush.solidskytexture); + m.pointer_texcoord[0] = skysphere_texcoord2f; + m.texmatrix[0] = scroll1matrix; + if (r_textureunits.integer >= 2) { - t[0] += speedscale; - t[1] += speedscale; + // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer + m.tex[1] = R_GetTexture(r_refdef.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); + GL_LockArrays(0, skysphere_numverts); + R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); + GL_LockArrays(0, 0); } - R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_elements); - - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - m.tex[0] = R_GetTexture(alphaskytexture); - R_Mesh_State(&m); - - // scroll it again, this makes the lower cloud layer scroll twice as fast (just like quake did) - for (i = 0, t = varray_texcoord[0];i < skysphere_numverts;i++, t += 4) + else { - t[0] += speedscale; - t[1] += speedscale; + // two pass + R_Mesh_State(&m); + GL_LockArrays(0, skysphere_numverts); + R_Mesh_Draw(0, 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(r_refdef.worldmodel->brush.alphaskytexture); + m.texmatrix[0] = scroll2matrix; + R_Mesh_State(&m); + GL_LockArrays(0, skysphere_numverts); + R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i); + GL_LockArrays(0, 0); } - R_Mesh_Draw(skysphere_numverts, skysphere_numtriangles, skysphere_elements); } void R_Sky(void) @@ -294,7 +411,7 @@ void R_Sky(void) matrix4x4_t skymatrix; if (skyrendermasked) { - Matrix4x4_CreateTranslate(&skymatrix, r_origin[0], r_origin[1], r_origin[2]); + Matrix4x4_CreateTranslate(&skymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2]); R_Mesh_Matrix(&skymatrix); if (skyrendersphere) { @@ -312,128 +429,47 @@ void R_Sky(void) // this modifies the depth buffer so we have to clear it afterward //R_SkyRoom(); // clear the depthbuffer that was used while rendering the skyroom - //qglClear(GL_DEPTH_BUFFER_BIT); + //GL_Clear(GL_DEPTH_BUFFER_BIT); } */ + GL_DepthTest(true); } } //=============================================================== -/* -============= -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, p, r, g, b; - qbyte skyupperlayerpixels[128*128*4], skylowerlayerpixels[128*128*4]; - unsigned trans[128*128], transpix, *rgba; - - 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++) - trans[(i*128) + j] = src[i*256+j+128]; - } - else - { - // make an average value for the back to avoid - // a fringe on the top level - r = g = b = 0; - for (i=0 ; i<128 ; i++) - { - for (j=0 ; j<128 ; j++) - { - p = src[i*256 + j + 128]; - rgba = &d_8to24table[p]; - trans[(i*128) + j] = *rgba; - r += ((qbyte *)rgba)[0]; - g += ((qbyte *)rgba)[1]; - b += ((qbyte *)rgba)[2]; - } - } - - ((qbyte *)&transpix)[0] = r/(128*128); - ((qbyte *)&transpix)[1] = g/(128*128); - ((qbyte *)&transpix)[2] = b/(128*128); - ((qbyte *)&transpix)[3] = 0; - } - - memcpy(skyupperlayerpixels, trans, 128*128*4); - - solidskytexture = R_LoadTexture (skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE); - - if (bytesperpixel == 4) - { - for (i = 0;i < 128;i++) - for (j = 0;j < 128;j++) - trans[(i*128) + j] = src[i*256+j]; - } - else - { - for (i=0 ; i<128 ; i++) - { - for (j=0 ; j<128 ; j++) - { - p = src[i*256 + j]; - if (p == 0) - trans[(i*128) + j] = transpix; - else - trans[(i*128) + j] = d_8to24table[p]; - } - } - } - - memcpy(skylowerlayerpixels, trans, 128*128*4); - - alphaskytexture = R_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE); -} - -void R_ResetQuakeSky(void) -{ - skyavailable_quake = false; -} - void R_ResetSkyBox(void) { - skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL; + R_UnloadSkyBox(); skyname[0] = 0; - skyavailable_box = false; + R_LoadSkyBox(); } static void r_sky_start(void) { skytexturepool = R_AllocTexturePool(); - solidskytexture = NULL; - alphaskytexture = NULL; + R_LoadSkyBox(); } 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); + Cmd_AddCommand ("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)); + skyname[0] = 0; R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap); } +