+
#include "quakedef.h"
void LoadSky_f(void);
cvar_t r_skyquality = {CVAR_SAVE, "r_skyquality", "2"};
-cvar_t r_mergesky = {CVAR_SAVE, "r_mergesky", "0"};
cvar_t r_skyflush = {0, "r_skyflush", "0"};
static char skyworldname[1024];
-rtexture_t *mergeskytexture;
rtexture_t *solidskytexture;
rtexture_t *alphaskytexture;
static qboolean skyavailable_quake;
int skyrendermasked;
int skyrenderglquake;
-static void R_BuildSky (int scrollupper, int scrolllower);
-
static void r_sky_start(void)
{
skytexturepool = R_AllocTexturePool();
- mergeskytexture = NULL;
solidskytexture = NULL;
alphaskytexture = NULL;
}
static void r_sky_shutdown(void)
{
R_FreeTexturePool(&skytexturepool);
- mergeskytexture = NULL;
solidskytexture = NULL;
alphaskytexture = NULL;
}
{
Cmd_AddCommand ("loadsky", &LoadSky_f);
Cvar_RegisterVariable (&r_skyquality);
- Cvar_RegisterVariable (&r_mergesky);
Cvar_RegisterVariable (&r_skyflush);
R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
}
break;
}
}
- if (r_mergesky.integer && (skyrenderglquake || skyrendersphere))
- {
- // R_BuildSky((int) (cl.time * 8.0), (int) (cl.time * 16.0));
- // R_BuildSky((int) (cl.time * -8.0), 0);
- R_BuildSky(0, (int) (cl.time * 8.0));
- }
if (skyrenderbox || skyrendersphere)
{
// for depth-masked sky, render the sky on the first sky surface encountered
static rtexture_t *skyboxside[6];
int R_SetSkyBox(char *sky)
{
- int i;
- char name[1024];
- byte* image_rgba;
+ int i;
+ char name[1024];
+ qbyte *image_rgba;
if (strcmp(sky, skyname) == 0) // no change
return true;
}
}
-#define R_SkyBoxPolyVec(i,s,t,x,y,z) \
- vert[i][0] = (x) * 1024.0f + r_origin[0];\
- vert[i][1] = (y) * 1024.0f + r_origin[1];\
- vert[i][2] = (z) * 1024.0f + r_origin[2];\
- vert[i][4] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
- vert[i][5] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
-
int skyboxindex[6] = {0, 1, 2, 0, 2, 3};
static void R_SkyBox(void)
{
- float vert[4][6];
+ float r;
+ float vert[4][4], st[4][2];
rmeshinfo_t m;
+
+#define R_SkyBoxPolyVec(i,s,t,x,y,z) \
+ vert[i][0] = (x) * r + r_origin[0];\
+ vert[i][1] = (y) * r + r_origin[1];\
+ vert[i][2] = (z) * r + r_origin[2];\
+ st[i][0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
+ st[i][1] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
+
+ r = 16.0f;
+
memset(&m, 0, sizeof(m));
m.transparent = false;
m.blendfunc1 = GL_ONE;
m.numverts = 4;
m.index = skyboxindex;
m.vertex = &vert[0][0];
- m.vertexstep = sizeof(float[6]);
+ m.vertexstep = sizeof(float[4]);
m.cr = 1;
m.cg = 1;
m.cb = 1;
m.ca = 1;
- m.texcoords[0] = &vert[0][4];
- m.texcoordstep[0] = sizeof(float[6]);
+ m.texcoords[0] = &st[0][0];
+ m.texcoordstep[0] = sizeof(float[2]);
m.tex[0] = R_GetTexture(skyboxside[3]); // front
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(&m);
- R_Mesh_Render();
- if (r_skyflush.integer)
- glFlush();
- // clear the zbuffer that was used while rendering the sky
- glClear(GL_DEPTH_BUFFER_BIT);
- if (r_skyflush.integer)
- glFlush();
}
-static float skysphere[33*33*5];
-static int skysphereindices[32*32*6];
+#define skygridx 16
+#define skygridx1 (skygridx + 1)
+#define skygridxrecip (1.0f / (skygridx))
+#define skygridy 32
+#define skygridy1 (skygridy + 1)
+#define skygridyrecip (1.0f / (skygridy))
+
+static float skysphere[skygridx1*skygridy1*5];
+static int skysphereindices[skygridx*skygridy*6];
static void skyspherecalc(float *sphere, float dx, float dy, float dz)
{
float a, b, x, ax, ay, v[3], length;
int i, j, *index;
- for (a = 0;a <= 1;a += (1.0 / 32.0))
+ for (j = 0;j <= skygridy;j++)
{
+ a = j * skygridyrecip;
ax = cos(a * M_PI * 2);
ay = -sin(a * M_PI * 2);
- for (b = 0;b <= 1;b += (1.0 / 32.0))
+ for (i = 0;i <= skygridx;i++)
{
+ b = i * skygridxrecip;
x = cos(b * M_PI * 2);
v[0] = ax*x * dx;
v[1] = ay*x * dy;
}
}
index = skysphereindices;
- for (j = 0;j < 32;j++)
+ for (j = 0;j < skygridy;j++)
{
- for (i = 0;i < 32;i++)
+ for (i = 0;i < skygridx;i++)
{
- *index++ = j * 33 + i;
- *index++ = j * 33 + i + 1;
- *index++ = (j + 1) * 33 + i;
+ *index++ = j * skygridx1 + i;
+ *index++ = j * skygridx1 + i + 1;
+ *index++ = (j + 1) * skygridx1 + i;
- *index++ = j * 33 + i + 1;
- *index++ = (j + 1) * 33 + i + 1;
- *index++ = (j + 1) * 33 + i;
+ *index++ = j * skygridx1 + i + 1;
+ *index++ = (j + 1) * skygridx1 + i + 1;
+ *index++ = (j + 1) * skygridx1 + i;
}
i++;
}
t = tex;
t2 = tex2;
radius = r_farclip - 8;
- for (i = 0;i < (33*33);i++)
+ for (i = 0;i < (skygridx1*skygridy1);i++)
{
*t++ = source[0] + s;
*t++ = source[1] + s;
static void R_SkySphere(void)
{
float speedscale, speedscale2;
- float vert[33*33*4], tex[33*33*2], tex2[33*33*2];
+ float vert[skygridx1*skygridy1*4], tex[skygridx1*skygridy1*2], tex2[skygridx1*skygridy1*2];
static qboolean skysphereinitialized = false;
rmeshinfo_t m;
if (!skysphereinitialized)
{
skysphereinitialized = true;
- skyspherecalc(skysphere, 1024, 1024, 1024 / 3);
+ skyspherecalc(skysphere, 16, 16, 16 / 3);
}
memset(&m, 0, sizeof(m));
m.transparent = false;
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
- m.numtriangles = 32*32*2;
- m.numverts = 33*33;
+ m.numtriangles = skygridx*skygridy*2;
+ m.numverts = skygridx1*skygridy1;
m.index = skysphereindices;
m.vertex = vert;
m.vertexstep = sizeof(float[4]);
speedscale2 = cl.time*16.0/128.0;
speedscale2 -= (int)speedscale2;
skyspherearrays(vert, tex, tex2, skysphere, speedscale, speedscale2);
- // do not lock the texcoord array, because it will be switched
- if (r_mergesky.integer)
- {
- m.tex[0] = R_GetTexture(mergeskytexture);
- R_Mesh_Draw(&m);
- }
- else
- {
- m.tex[0] = R_GetTexture(solidskytexture);
- R_Mesh_Draw(&m);
-
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- m.tex[0] = R_GetTexture(alphaskytexture);
- m.texcoords[0] = tex2;
- R_Mesh_Draw(&m);
- }
- R_Mesh_Render();
- if (r_skyflush.integer)
- glFlush();
- // clear the zbuffer that was used while rendering the sky
- glClear(GL_DEPTH_BUFFER_BIT);
- if (r_skyflush.integer)
- glFlush();
-}
+ m.tex[0] = R_GetTexture(solidskytexture);
+ R_Mesh_Draw(&m);
-void R_Sky(void)
-{
- if (skyrendersphere)
- R_SkySphere();
- else if (skyrenderbox)
- R_SkyBox();
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ m.tex[0] = R_GetTexture(alphaskytexture);
+ m.texcoords[0] = tex2;
+ R_Mesh_Draw(&m);
}
-//===============================================================
-
-static byte skyupperlayerpixels[128*128*4];
-static byte skylowerlayerpixels[128*128*4];
-static byte skymergedpixels[128*128*4];
-
-static void R_BuildSky (int scrollupper, int scrolllower)
+void R_Sky(void)
{
- int x, y, ux, uy, lx, ly;
- byte *m, *u, *l;
- m = skymergedpixels;
- for (y = 0;y < 128;y++)
+ if (skyrendermasked)
{
- uy = (y + scrollupper) & 127;
- ly = (y + scrolllower) & 127;
- for (x = 0;x < 128;x++)
- {
- ux = (x + scrollupper) & 127;
- lx = (x + scrolllower) & 127;
- u = &skyupperlayerpixels[(uy * 128 + ux) * 4];
- l = &skylowerlayerpixels[(ly * 128 + lx) * 4];
- if (l[3])
- {
- if (l[3] == 255)
- *((int *)m) = *((int *)l);
- else
- {
- m[0] = ((((int) l[0] - (int) u[0]) * (int) l[3]) >> 8) + (int) u[0];
- m[1] = ((((int) l[1] - (int) u[1]) * (int) l[3]) >> 8) + (int) u[1];
- m[2] = ((((int) l[2] - (int) u[2]) * (int) l[3]) >> 8) + (int) u[2];
- m[3] = 255;
- }
- }
- else
- *((int *)m) = *((int *)u);
- m += 4;
- }
+ if (skyrendersphere)
+ R_SkySphere();
+ else if (skyrenderbox)
+ R_SkyBox();
+
+ // clear the zbuffer that was used while rendering the sky
+ R_Mesh_ClearDepth();
}
- if (mergeskytexture)
- R_UpdateTexture(mergeskytexture, skymergedpixels);
- else
- mergeskytexture = R_LoadTexture(skytexturepool, "mergedskytexture", 128, 128, skymergedpixels, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE);
}
+//===============================================================
+
/*
=============
R_InitSky
A sky texture is 256*128, with the right side being a masked overlay
==============
*/
-void R_InitSky (byte *src, int bytesperpixel)
+void R_InitSky (qbyte *src, int bytesperpixel)
{
- int i, j, p;
- unsigned trans[128*128];
- unsigned transpix;
- int r, g, b;
- unsigned *rgba;
+ int i, j, p, r, g, b;
+ qbyte skyupperlayerpixels[128*128*4], skylowerlayerpixels[128*128*4];
+ unsigned trans[128*128], transpix, *rgba;
strcpy(skyworldname, loadmodel->name);
+
+ // 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++)
p = src[i*256 + j + 128];
rgba = &d_8to24table[p];
trans[(i*128) + j] = *rgba;
- r += ((byte *)rgba)[0];
- g += ((byte *)rgba)[1];
- b += ((byte *)rgba)[2];
+ r += ((qbyte *)rgba)[0];
+ g += ((qbyte *)rgba)[1];
+ b += ((qbyte *)rgba)[2];
}
}
- ((byte *)&transpix)[0] = r/(128*128);
- ((byte *)&transpix)[1] = g/(128*128);
- ((byte *)&transpix)[2] = b/(128*128);
- ((byte *)&transpix)[3] = 0;
+ ((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, (byte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
- /*
- for (i = 0;i < 128*128;i++)
- {
- ((byte *)&trans[i])[0] >>= 1;
- ((byte *)&trans[i])[1] >>= 1;
- ((byte *)&trans[i])[2] >>= 1;
- }
- solidskytexture_half = R_LoadTexture (skytexturepool, "sky_solidtexture_half", 128, 128, (byte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
- */
+ solidskytexture = R_LoadTexture (skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
if (bytesperpixel == 4)
{
memcpy(skylowerlayerpixels, trans, 128*128*4);
- alphaskytexture = R_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (byte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
- /*
- for (i = 0;i < 128*128;i++)
- {
- ((byte *)&trans[i])[0] >>= 1;
- ((byte *)&trans[i])[1] >>= 1;
- ((byte *)&trans[i])[2] >>= 1;
- }
- alphaskytexture_half = R_LoadTexture (skytexturepool, "sky_alphatexture_half", 128, 128, (byte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
- */
+ alphaskytexture = R_LoadTexture (skytexturepool, "sky_alphatexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
}
+
projects / xonotic / darkplaces.git / blobdiff