return;
for (i = 0;i < 6;i++)
{
- 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, suf[i]) >= (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), "%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", skyname, suf[i], skyname, suf[i]);
- continue;
+ 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), "gfx/env/%s%s", skyname, suf[i]) >= (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;
+ }
+ }
}
}
skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL);
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", strlen(sky));
return false;
}
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)))
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;
}
}
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_DepthMask(true);
GL_DepthTest(false); // don't modify or read zbuffer
- GL_VertexPointer(skyboxvertex3f);
+ 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_Texture(&m);
+ R_Mesh_State(&m);
R_Mesh_Draw(6*4, 2, skyboxelements + i * 6);
}
+ GL_LockArrays(0, 0);
}
#define skygridx 32
float speedscale;
static qboolean skysphereinitialized = false;
rmeshstate_t m;
- matrix4x4_t scroll1matrix, scroll2matrix, identitymatrix;
+ matrix4x4_t scroll1matrix, scroll2matrix;
if (!skysphereinitialized)
{
skysphereinitialized = true;
// 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);
- GL_VertexPointer(skysphere_vertex3f);
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.pointer_vertex = skysphere_vertex3f;
m.tex[0] = R_GetTexture(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
- // 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;
- R_Mesh_State_Texture(&m);
- R_Mesh_TextureMatrix(1, &scroll2matrix);
+ m.texmatrix[1] = scroll2matrix;
+ R_Mesh_State(&m);
+ 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_Texture(&m);
+ 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);
- R_Mesh_State_Texture(&m);
- R_Mesh_TextureMatrix(0, &scroll2matrix);
+ m.texmatrix[0] = scroll2matrix;
+ R_Mesh_State(&m);
+ 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)
// 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)
projects / xonotic / darkplaces.git / blobdiff