#include "quakedef.h"
-void LoadSky_f(void);
-
-cvar_t r_skyquality = {CVAR_SAVE, "r_skyquality", "2"};
-cvar_t r_skyflush = {0, "r_skyflush", "0"};
-
-static char skyworldname[1024];
-rtexture_t *solidskytexture;
-rtexture_t *alphaskytexture;
-static qboolean skyavailable_quake;
-static qboolean skyavailable_box;
-static rtexturepool_t *skytexturepool;
-
+cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
+qboolean skyavailable_quake;
+qboolean skyavailable_box;
int skyrendernow;
int skyrendermasked;
-int skyrenderglquake;
-
-static void r_sky_start(void)
-{
- skytexturepool = R_AllocTexturePool();
- solidskytexture = NULL;
- alphaskytexture = NULL;
-}
-
-static void r_sky_shutdown(void)
-{
- R_FreeTexturePool(&skytexturepool);
- solidskytexture = NULL;
- alphaskytexture = NULL;
-}
-
-int R_SetSkyBox(char *sky);
-
-static void r_sky_newmap(void)
-{
- skyavailable_quake = false;
- if (!strcmp(skyworldname, cl.worldmodel->name))
- skyavailable_quake = true;
-}
-
-void R_Sky_Init(void)
-{
- Cmd_AddCommand ("loadsky", &LoadSky_f);
- Cvar_RegisterVariable (&r_skyquality);
- Cvar_RegisterVariable (&r_skyflush);
- R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
-}
+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 rtexture_t *skyboxside[6];
void R_SkyStartFrame(void)
{
skyrendernow = false;
skyrendersphere = false;
skyrenderbox = false;
- skyrenderglquake = false;
skyrendermasked = false;
- if (r_skyquality.integer >= 1 && !fogenabled)
+ if (r_sky.integer && !fogenabled)
{
if (skyavailable_box)
skyrenderbox = true;
else if (skyavailable_quake)
- {
- switch(r_skyquality.integer)
- {
- case 1:
- skyrenderglquake = true;
- break;
- default:
- case 2:
- skyrendersphere = true;
- break;
- }
- }
- if (skyrenderbox || skyrendersphere)
- {
- // for depth-masked sky, render the sky on the first sky surface encountered
- skyrendernow = true;
- skyrendermasked = true;
- }
+ skyrendersphere = true;
+ // for depth-masked sky, render the sky on the first sky surface encountered
+ skyrendernow = true;
+ skyrendermasked = true;
}
}
-static char skyname[256];
-
/*
==================
R_SetSkyBox
==================
*/
-static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
-static rtexture_t *skyboxside[6];
-int R_SetSkyBox(char *sky)
+int R_SetSkyBox(const char *sky)
{
int i;
char name[1024];
}
}
-int skyboxindex[6] = {0, 1, 2, 0, 2, 3};
-
static void R_SkyBox(void)
{
- float r;
- float vert[4][4], st[4][2];
- rmeshinfo_t m;
+ rmeshstate_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;
+ 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 * 2 + 0] = (s) * (254.0f/256.0f) + (1.0f/256.0f);\
+ varray_texcoord[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.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(&m);
+ 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(&m);
+ 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(&m);
+ 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(&m);
+ 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(&m);
+ 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(&m);
+ R_Mesh_Draw(4, 2, polygonelements);
}
-#define skygridx 16
+#define skygridx 32
#define skygridx1 (skygridx + 1)
#define skygridxrecip (1.0f / (skygridx))
#define skygridy 32
}
}
-static void skyspherearrays(float *vert, float *tex, float *tex2, float *source, float s, float s2)
+static void skyspherearrays(float *v, float *t, float *source, float s)
{
- float *v, *t, *t2, radius;
int i;
- v = vert;
- t = tex;
- t2 = tex2;
- radius = r_farclip - 8;
- for (i = 0;i < (skygridx1*skygridy1);i++)
+ for (i = 0;i < (skygridx1*skygridy1);i++, 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;
+ t[0] = source[0] + s;
+ t[1] = source[1] + s;
+ v[0] = source[2];
+ v[1] = source[3];
+ v[2] = source[4];
}
}
static void R_SkySphere(void)
{
+ int numverts, numtriangles;
float speedscale, speedscale2;
- float vert[skygridx1*skygridy1*4], tex[skygridx1*skygridy1*2], tex2[skygridx1*skygridy1*2];
static qboolean skysphereinitialized = false;
- rmeshinfo_t m;
+ rmeshstate_t m;
if (!skysphereinitialized)
{
skysphereinitialized = true;
skyspherecalc(skysphere, 16, 16, 16 / 3);
}
- 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.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);
+
+ numverts = skygridx1*skygridy1;
+ numtriangles = skygridx*skygridy*2;
+
+ R_Mesh_ResizeCheck(numverts);
+
+ 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_Draw(&m);
+ R_Mesh_State(&m);
+
+ GL_Color(r_colorscale, r_colorscale, r_colorscale, 1);
+
+ skyspherearrays(varray_vertex, varray_texcoord[0], skysphere, speedscale);
+ R_Mesh_Draw(numverts, numtriangles, skysphereindices);
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_State(&m);
+
+ skyspherearrays(varray_vertex, varray_texcoord[0], skysphere, speedscale2);
+ R_Mesh_Draw(numverts, numtriangles, skysphereindices);
}
void R_Sky(void)
{
+ matrix4x4_t skymatrix;
if (skyrendermasked)
{
+ Matrix4x4_CreateTranslate(&skymatrix, r_origin[0], r_origin[1], r_origin[2]);
+ R_Mesh_Matrix(&skymatrix);
if (skyrendersphere)
+ {
+ // this does not modify depth buffer
R_SkySphere();
+ }
else if (skyrenderbox)
+ {
+ // this does not modify depth buffer
R_SkyBox();
-
- // clear the zbuffer that was used while rendering the sky
- R_Mesh_ClearDepth();
+ }
+ /* this will be skyroom someday
+ else
+ {
+ // 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);
+ }
+ */
}
}
qbyte skyupperlayerpixels[128*128*4], skylowerlayerpixels[128*128*4];
unsigned trans[128*128], transpix, *rgba;
- strcpy(skyworldname, loadmodel->name);
+ skyavailable_quake = true;
// flush skytexturepool so we won't build up a leak from uploading textures multiple times
R_FreeTexturePool(&skytexturepool);
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;
+ skyname[0] = 0;
+ skyavailable_box = false;
+}
+
+static void r_sky_start(void)
+{
+ skytexturepool = R_AllocTexturePool();
+ solidskytexture = NULL;
+ alphaskytexture = NULL;
+}
+
+static void r_sky_shutdown(void)
+{
+ R_FreeTexturePool(&skytexturepool);
+ solidskytexture = NULL;
+ alphaskytexture = NULL;
+}
+
+static void r_sky_newmap(void)
+{
+}
+
+void R_Sky_Init(void)
+{
+ Cmd_AddCommand ("loadsky", &LoadSky_f);
+ Cvar_RegisterVariable (&r_sky);
+ R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
+}
projects / xonotic / darkplaces.git / blobdiff