R_SetSkyBox
==================
*/
-int R_SetSkyBox(const char *sky)
+void R_UnloadSkyBox(void)
{
int i;
- char name[1024];
- qbyte *image_rgba;
-
- if (strcmp(sky, skyname) == 0) // no change
- return true;
-
- skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
- skyavailable_box = false;
- skyname[0] = 0;
-
- if (!sky[0])
- return true;
-
- if (strlen(sky) > 1000)
+ for (i = 0;i < 6;i++)
{
- Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
- return false;
+ if (skyboxside[i])
+ R_FreeTexture(skyboxside[i]);
+ skyboxside[i] = NULL;;
}
+}
+void R_LoadSkyBox(void)
+{
+ int i;
+ char name[1024];
+ qbyte *image_rgba;
+ R_UnloadSkyBox();
+ if (!skyname[0])
+ return;
for (i = 0;i < 6;i++)
{
- sprintf (name, "env/%s%s", sky, suf[i]);
- if (!(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)))
{
- sprintf (name, "gfx/env/%s%s", sky, suf[i]);
- if (!(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)))
{
- Con_Printf ("Couldn't load env/%s%s or gfx/env/%s%s\n", sky, suf[i], sky, suf[i]);
+ Con_Printf ("Couldn't load env/%s%s or gfx/env/%s%s\n", skyname, suf[i], skyname, suf[i]);
continue;
}
}
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);
}
+}
+
+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;
+ }
+
+ 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;
- strcpy(skyname, sky);
return true;
}
return false;
int skyboxelements[6*2*3] =
{
- // skyside[0]
- 8, 9, 10,
- 8, 10, 11,
+ // 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[3]
- 0, 1, 2,
- 0, 2, 3,
// skyside[4]
16, 17, 18,
16, 18, 19,
{
int i;
rmeshstate_t m;
- GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+ GL_Color(1, 1, 1, 1);
memset(&m, 0, sizeof(m));
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_DepthMask(true);
{
m.tex[0] = R_GetTexture(skyboxside[i]);
R_Mesh_State_Texture(&m);
- R_Mesh_Draw(4, 2, skyboxelements + i * 6);
+ R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
}
}
Matrix4x4_CreateIdentity(&identitymatrix);
GL_VertexPointer(skysphere_vertex3f);
- GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+ GL_Color(1, 1, 1, 1);
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_DepthMask(true);
GL_DepthTest(false); // don't modify or read zbuffer
m.tex[0] = R_GetTexture(solidskytexture);
m.pointer_texcoord[0] = skysphere_texcoord2f;
R_Mesh_TextureMatrix(0, &scroll1matrix);
- if (r_colorscale == 1 && r_textureunits.integer >= 2)
+ if (r_textureunits.integer >= 2)
{
// one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
- // LordHavoc: note that color is not set here because it does not
- // matter with GL_REPLACE
m.tex[1] = R_GetTexture(alphaskytexture);
m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
m.pointer_texcoord[1] = skysphere_texcoord2f;
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)
{
// 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);
}
*/
}
*/
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;
- union
- {
- int i;
- qbyte b[4];
- }
- transpixunion;
+ int i, j;
+ unsigned solidpixels[128*128], alphapixels[128*128];
skyavailable_quake = true;
if (bytesperpixel == 4)
{
- transpixunion.i = 0;
for (i = 0;i < 128;i++)
+ {
for (j = 0;j < 128;j++)
- trans[(i*128) + j] = ((unsigned *)src)[i*256+j+128];
+ {
+ 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 (i = 0;i < 128;i++)
{
- for (j=0 ; j<128 ; j++)
+ for (j = 0;j < 128;j++)
{
- p = src[i*256 + j + 128];
- rgba = &palette_complete[p];
- trans[(i*128) + j] = *rgba;
- r += ((qbyte *)rgba)[0];
- g += ((qbyte *)rgba)[1];
- b += ((qbyte *)rgba)[2];
+ rgba.i = palette_complete[src[i*256 + j + 128]];
+ r += rgba.b[0];
+ g += rgba.b[1];
+ b += rgba.b[2];
}
}
-
- transpixunion.i = 0;
- transpixunion.b[0] = r/(128*128);
- transpixunion.b[1] = g/(128*128);
- transpixunion.b[2] = b/(128*128);
- transpixunion.b[3] = 0;
- }
- transpix = transpixunion.i;
-
- memcpy(skyupperlayerpixels, trans, 128*128*4);
-
- solidskytexture = R_LoadTexture2D(skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE, NULL);
-
- if (bytesperpixel == 4)
- {
+ 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++)
- trans[(i*128) + j] = ((unsigned *)src)[i*256+j];
- }
- else
- {
- for (i=0 ; i<128 ; i++)
{
- for (j=0 ; j<128 ; j++)
+ for (j = 0;j < 128;j++)
{
- p = src[i*256 + j];
- if (p == 0)
- trans[(i*128) + j] = transpix;
- else
- trans[(i*128) + j] = palette_complete[p];
+ 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;
}
}
}
- memcpy(skylowerlayerpixels, trans, 128*128*4);
-
- alphaskytexture = R_LoadTexture2D(skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+ 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)
skytexturepool = R_AllocTexturePool();
solidskytexture = NULL;
alphaskytexture = NULL;
+ R_LoadSkyBox();
}
static void r_sky_shutdown(void)
{
+ R_UnloadSkyBox();
R_FreeTexturePool(&skytexturepool);
solidskytexture = NULL;
alphaskytexture = NULL;
{
Cmd_AddCommand ("loadsky", &LoadSky_f);
Cvar_RegisterVariable (&r_sky);
+ R_ResetSkyBox();
+ R_ResetQuakeSky();
R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
}
projects / xonotic / darkplaces.git / blobdiff