+
#include "quakedef.h"
void LoadSky_f(void);
}
}
-#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];\
- st[i][0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
- st[i][1] = (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][4], st[4][2];
- rmeshinfo_t m;
+ rmeshbufferinfo_t m;
+
+#define R_SkyBoxPolyVec(i,s,t,x,y,z) \
+ m.vertex[i * 4 + 0] = (x) * 16.0f + r_origin[0];\
+ m.vertex[i * 4 + 1] = (y) * 16.0f + r_origin[1];\
+ m.vertex[i * 4 + 2] = (z) * 16.0f + r_origin[2];\
+ m.texcoords[0][i * 2 + 0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
+ m.texcoords[0][i * 2 + 1] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
+
memset(&m, 0, sizeof(m));
m.transparent = false;
m.blendfunc1 = GL_ONE;
m.blendfunc2 = GL_ZERO;
m.numtriangles = 2;
m.numverts = 4;
- m.index = skyboxindex;
- m.vertex = &vert[0][0];
- m.vertexstep = sizeof(float[4]);
- m.cr = 1;
- m.cg = 1;
- m.cb = 1;
- m.ca = 1;
- 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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skyboxindex, sizeof(int[6]));
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 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);
+ }
m.tex[0] = R_GetTexture(skyboxside[1]); // back
- 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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skyboxindex, sizeof(int[6]));
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 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);
+ }
m.tex[0] = R_GetTexture(skyboxside[0]); // right
- 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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skyboxindex, sizeof(int[6]));
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 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);
+ }
m.tex[0] = R_GetTexture(skyboxside[2]); // left
- 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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skyboxindex, sizeof(int[6]));
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 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);
+ }
m.tex[0] = R_GetTexture(skyboxside[4]); // up
- 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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skyboxindex, sizeof(int[6]));
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 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);
+ }
m.tex[0] = R_GetTexture(skyboxside[5]); // down
- 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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skyboxindex, sizeof(int[6]));
+ m.color[0] = m.color[4] = m.color[8] = m.color[12] = m.colorscale;
+ m.color[1] = m.color[5] = m.color[9] = m.color[13] = m.colorscale;
+ m.color[2] = m.color[6] = m.color[10] = m.color[14] = m.colorscale;
+ m.color[3] = m.color[7] = m.color[11] = m.color[15] = 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);
+ }
}
-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++;
}
}
-static void skyspherearrays(float *vert, float *tex, float *tex2, float *source, float s, float s2)
+static void skyspherearrays(float *v, float *t, float *c, float *source, float s, float colorscale)
{
- float *v, *t, *t2, radius;
int i;
- v = vert;
- t = tex;
- t2 = tex2;
- radius = r_farclip - 8;
- for (i = 0;i < (33*33);i++)
+ for (i = 0;i < (skygridx1*skygridy1);i++, c += 4, t += 2, v += 4, source += 5)
{
- *t++ = source[0] + s;
- *t++ = source[1] + s;
- *t2++ = source[0] + s2;
- *t2++ = source[1] + s2;
- *v++ = source[2] + r_origin[0];
- *v++ = source[3] + r_origin[1];
- *v++ = source[4] + r_origin[2];
- *v++ = 0;
- source += 5;
+ c[0] = colorscale;
+ c[1] = colorscale;
+ c[2] = colorscale;
+ c[3] = 1;
+ t[0] = source[0] + s;
+ t[1] = source[1] + s;
+ v[0] = source[2] + r_origin[0];
+ v[1] = source[3] + r_origin[1];
+ v[2] = source[4] + r_origin[2];
}
}
static void R_SkySphere(void)
{
float speedscale, speedscale2;
- float vert[33*33*4], tex[33*33*2], tex2[33*33*2];
static qboolean skysphereinitialized = false;
- rmeshinfo_t m;
+ rmeshbufferinfo_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.index = skysphereindices;
- m.vertex = vert;
- m.vertexstep = sizeof(float[4]);
- m.cr = 1;
- m.cg = 1;
- m.cb = 1;
- m.ca = 1;
- m.texcoords[0] = tex;
- m.texcoordstep[0] = sizeof(float[2]);
+
speedscale = cl.time*8.0/128.0;
speedscale -= (int)speedscale;
speedscale2 = cl.time*16.0/128.0;
speedscale2 -= (int)speedscale2;
- skyspherearrays(vert, tex, tex2, skysphere, speedscale, speedscale2);
- m.tex[0] = R_GetTexture(solidskytexture);
- R_Mesh_Draw(&m);
+ memset(&m, 0, sizeof(m));
+ m.transparent = false;
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ m.numtriangles = skygridx*skygridy*2;
+ m.numverts = skygridx1*skygridy1;
+ m.tex[0] = R_GetTexture(solidskytexture);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skysphereindices, m.numtriangles * sizeof(int[3]));
+ skyspherearrays(m.vertex, m.texcoords[0], m.color, skysphere, speedscale, m.colorscale);
+ }
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);
+ if (R_Mesh_Draw_GetBuffer(&m))
+ {
+ memcpy(m.index, skysphereindices, m.numtriangles * sizeof(int[3]));
+ skyspherearrays(m.vertex, m.texcoords[0], m.color, skysphere, speedscale2, m.colorscale);
+ }
}
void R_Sky(void)
memcpy(skyupperlayerpixels, trans, 128*128*4);
solidskytexture = R_LoadTexture (skytexturepool, "sky_solidtexture", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_PRECACHE);
- /*
- for (i = 0;i < 128*128;i++)
- {
- ((qbyte *)&trans[i])[0] >>= 1;
- ((qbyte *)&trans[i])[1] >>= 1;
- ((qbyte *)&trans[i])[2] >>= 1;
- }
- solidskytexture_half = R_LoadTexture (skytexturepool, "sky_solidtexture_half", 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, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
- /*
- for (i = 0;i < 128*128;i++)
- {
- ((qbyte *)&trans[i])[0] >>= 1;
- ((qbyte *)&trans[i])[1] >>= 1;
- ((qbyte *)&trans[i])[2] >>= 1;
- }
- alphaskytexture_half = R_LoadTexture (skytexturepool, "sky_alphatexture_half", 128, 128, (qbyte *) trans, TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE);
- */
}
+
projects / xonotic / darkplaces.git / blobdiff