-#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;
-static qboolean skyavailable_box;
-static rtexturepool_t *skytexturepool;
+#include "quakedef.h"
+#include "image.h"
+// FIXME: fix skybox after vid_restart
+cvar_t r_sky = {CVAR_SAVE, "r_sky", "1"};
+cvar_t r_skyscroll1 = {CVAR_SAVE, "r_skyscroll1", "1"};
+cvar_t r_skyscroll2 = {CVAR_SAVE, "r_skyscroll2", "2"};
int skyrendernow;
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 int skyrendersphere;
+static int skyrenderbox;
+static rtexturepool_t *skytexturepool;
+static char skyname[256];
-static void r_sky_shutdown(void)
+typedef struct suffixinfo_s
{
- R_FreeTexturePool(&skytexturepool);
- mergeskytexture = NULL;
- solidskytexture = NULL;
- alphaskytexture = NULL;
+ char *suffix;
+ qboolean flipx, flipy, flipdiagonal;
}
-
-int R_SetSkyBox(char *sky);
-
-static void r_sky_newmap(void)
+suffixinfo_t;
+static suffixinfo_t suffix[3][6] =
{
- 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_mergesky);
- Cvar_RegisterVariable (&r_skyflush);
- R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
-}
+ {
+ {"px", false, false, false},
+ {"nx", false, false, false},
+ {"py", false, false, false},
+ {"ny", false, false, false},
+ {"pz", false, false, false},
+ {"nz", false, false, false}
+ },
+ {
+ {"posx", false, false, false},
+ {"negx", false, false, false},
+ {"posy", false, false, false},
+ {"negy", false, false, false},
+ {"posz", false, false, false},
+ {"negz", false, false, false}
+ },
+ {
+ {"rt", false, false, true},
+ {"lf", true, true, true},
+ {"bk", false, true, false},
+ {"ft", true, false, false},
+ {"up", false, false, true},
+ {"dn", false, false, true}
+ }
+};
-static int skyrendersphere;
-static int skyrenderbox;
+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)
+ if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
skyrenderbox = true;
- else if (skyavailable_quake)
- {
- switch(r_skyquality.integer)
- {
- case 1:
- skyrenderglquake = true;
- break;
- default:
- case 2:
- skyrendersphere = true;
- 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
- skyrendernow = true;
- skyrendermasked = true;
- }
+ else if (r_refdef.worldmodel->brush.solidskytexture)
+ 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)
+void R_UnloadSkyBox(void)
{
- int i;
- char name[1024];
- byte* image_rgba;
-
- if (strcmp(sky, skyname) == 0) // no change
- return true;
+ int i;
+ for (i = 0;i < 6;i++)
+ {
+ if (skyboxside[i])
+ R_FreeTexture(skyboxside[i]);
+ skyboxside[i] = NULL;
+ }
+}
- skyboxside[0] = skyboxside[1] = skyboxside[2] = skyboxside[3] = skyboxside[4] = skyboxside[5] = NULL;
- skyavailable_box = false;
- skyname[0] = 0;
+void R_LoadSkyBox(void)
+{
+ int i, j, success;
+ int indices[4] = {0,1,2,3};
+ char name[1024];
+ qbyte *image_rgba;
+ qbyte *temp;
- if (!sky[0])
- return true;
+ R_UnloadSkyBox();
- if (strlen(sky) > 1000)
- {
- Con_Printf ("sky name too long (%i, max is 1000)\n", strlen(sky));
- return false;
- }
+ if (!skyname[0])
+ return;
- for (i = 0;i < 6;i++)
+ for (j=0; j<3; j++)
{
- sprintf (name, "env/%s%s", sky, suf[i]);
- if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
+ success = 0;
+ for (i=0; i<6; i++)
{
- sprintf (name, "gfx/env/%s%s", sky, suf[i]);
- if (!(image_rgba = loadimagepixels(name, false, 0, 0)))
+ if (dpsnprintf(name, sizeof(name), "%s_%s", skyname, suffix[j][i].suffix) < 0 || !(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]);
- continue;
+ if (dpsnprintf(name, sizeof(name), "%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ {
+ if (dpsnprintf(name, sizeof(name), "env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ {
+ if (dpsnprintf(name, sizeof(name), "gfx/env/%s%s", skyname, suffix[j][i].suffix) < 0 || !(image_rgba = loadimagepixels(name, false, 0, 0)))
+ continue;
+ }
+ }
}
+ temp = Mem_Alloc(tempmempool, image_width*image_height*4);
+ Image_CopyMux (temp, image_rgba, image_width, image_height, suffix[j][i].flipx, suffix[j][i].flipy, suffix[j][i].flipdiagonal, 4, 4, indices);
+ skyboxside[i] = R_LoadTexture2D(skytexturepool, va("skyboxside%d", i), image_width, image_height, temp, TEXTYPE_RGBA, TEXF_CLAMP | TEXF_PRECACHE, NULL);
+ Mem_Free(image_rgba);
+ Mem_Free(temp);
+ success++;
}
- skyboxside[i] = R_LoadTexture(skytexturepool, va("skyboxside%d", i), image_width, image_height, image_rgba, TEXTYPE_RGBA, TEXF_PRECACHE);
- Mem_Free(image_rgba);
+
+ if (success)
+ break;
}
- if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
- {
- skyavailable_box = true;
- strcpy(skyname, sky);
+ if (j == 3)
+ Con_Printf ("Failed to load %s as skybox\n", skyname);
+}
+
+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;
}
+
+ strcpy(skyname, sky);
+
+ R_LoadSkyBox();
+
+ if (!skyname[0])
+ return true;
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;
}
}
-#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};
+float skyboxvertex3f[6*4*3] =
+{
+ // skyside[0]
+ 16, -16, 16,
+ 16, -16, -16,
+ 16, 16, -16,
+ 16, 16, 16,
+ // skyside[1]
+ -16, 16, 16,
+ -16, 16, -16,
+ -16, -16, -16,
+ -16, -16, 16,
+ // skyside[2]
+ 16, 16, 16,
+ 16, 16, -16,
+ -16, 16, -16,
+ -16, 16, 16,
+ // skyside[3]
+ -16, -16, 16,
+ -16, -16, -16,
+ 16, -16, -16,
+ 16, -16, 16,
+ // skyside[4]
+ -16, -16, 16,
+ 16, -16, 16,
+ 16, 16, 16,
+ -16, 16, 16,
+ // skyside[5]
+ 16, -16, -16,
+ -16, -16, -16,
+ -16, 16, -16,
+ 16, 16, -16
+};
+
+float skyboxtexcoord2f[6*4*2] =
+{
+ // skyside[0]
+ 0, 1,
+ 1, 1,
+ 1, 0,
+ 0, 0,
+ // skyside[1]
+ 1, 0,
+ 0, 0,
+ 0, 1,
+ 1, 1,
+ // skyside[2]
+ 1, 1,
+ 1, 0,
+ 0, 0,
+ 0, 1,
+ // skyside[3]
+ 0, 0,
+ 0, 1,
+ 1, 1,
+ 1, 0,
+ // skyside[4]
+ 0, 1,
+ 1, 1,
+ 1, 0,
+ 0, 0,
+ // skyside[5]
+ 0, 1,
+ 1, 1,
+ 1, 0,
+ 0, 0
+};
+
+int skyboxelements[6*2*3] =
+{
+ // 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[4]
+ 16, 17, 18,
+ 16, 18, 19,
+ // skyside[5]
+ 20, 21, 22,
+ 20, 22, 23
+};
static void R_SkyBox(void)
{
- float vert[4][4], st[4][2];
- rmeshinfo_t m;
+ int i;
+ rmeshstate_t m;
+ GL_Color(1, 1, 1, 1);
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);
- 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);
- 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);
- 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);
- 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);
- 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);
- 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();
+ GL_BlendFunc(GL_ONE, GL_ZERO);
+ GL_DepthMask(false);
+ GL_DepthTest(false); // don't modify or read zbuffer
+ 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(&m);
+ R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6);
+ }
+ GL_LockArrays(0, 0);
}
-static float skysphere[33*33*5];
-static int skysphereindices[32*32*6];
-static void skyspherecalc(float *sphere, float dx, float dy, float dz)
+#define skygridx 32
+#define skygridx1 (skygridx + 1)
+#define skygridxrecip (1.0f / (skygridx))
+#define skygridy 32
+#define skygridy1 (skygridy + 1)
+#define skygridyrecip (1.0f / (skygridy))
+#define skysphere_numverts (skygridx1 * skygridy1)
+#define skysphere_numtriangles (skygridx * skygridy * 2)
+static float skysphere_vertex3f[skysphere_numverts * 3];
+static float skysphere_texcoord2f[skysphere_numverts * 2];
+static int skysphere_element3i[skysphere_numtriangles * 3];
+
+static void skyspherecalc(void)
{
- float a, b, x, ax, ay, v[3], length;
- int i, j, *index;
- for (a = 0;a <= 1;a += (1.0 / 32.0))
+ int i, j, *e;
+ float a, b, x, ax, ay, v[3], length, *vertex3f, *texcoord2f;
+ float dx, dy, dz;
+ dx = 16;
+ dy = 16;
+ dz = 16 / 3;
+ vertex3f = skysphere_vertex3f;
+ texcoord2f = skysphere_texcoord2f;
+ 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++)
{
- x = cos(b * M_PI * 2);
+ b = i * skygridxrecip;
+ x = cos((b + 0.5) * M_PI);
v[0] = ax*x * dx;
v[1] = ay*x * dy;
- v[2] = -sin(b * M_PI * 2) * dz;
+ v[2] = -sin((b + 0.5) * M_PI) * dz;
length = 3.0f / sqrt(v[0]*v[0]+v[1]*v[1]+(v[2]*v[2]*9));
- *sphere++ = v[0] * length;
- *sphere++ = v[1] * length;
- *sphere++ = v[0];
- *sphere++ = v[1];
- *sphere++ = v[2];
+ *texcoord2f++ = v[0] * length;
+ *texcoord2f++ = v[1] * length;
+ *vertex3f++ = v[0];
+ *vertex3f++ = v[1];
+ *vertex3f++ = v[2];
}
}
- index = skysphereindices;
- for (j = 0;j < 32;j++)
+ e = skysphere_element3i;
+ 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;
+ *e++ = j * skygridx1 + i;
+ *e++ = j * skygridx1 + i + 1;
+ *e++ = (j + 1) * skygridx1 + i;
- *index++ = j * 33 + i + 1;
- *index++ = (j + 1) * 33 + i + 1;
- *index++ = (j + 1) * 33 + i;
+ *e++ = j * skygridx1 + i + 1;
+ *e++ = (j + 1) * skygridx1 + i + 1;
+ *e++ = (j + 1) * skygridx1 + i;
}
- i++;
- }
-}
-
-static void skyspherearrays(float *vert, float *tex, float *tex2, float *source, float s, float s2)
-{
- float *v, *t, *t2, radius;
- int i;
- v = vert;
- t = tex;
- t2 = tex2;
- radius = r_farclip - 8;
- for (i = 0;i < (33*33);i++)
- {
- *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;
}
}
static void R_SkySphere(void)
{
- float speedscale, speedscale2;
- float vert[33*33*4], tex[33*33*2], tex2[33*33*2];
+ float speedscale;
static qboolean skysphereinitialized = false;
- rmeshinfo_t m;
+ rmeshstate_t m;
+ matrix4x4_t scroll1matrix, scroll2matrix;
if (!skysphereinitialized)
{
skysphereinitialized = true;
- skyspherecalc(skysphere, 1024, 1024, 1024 / 3);
+ skyspherecalc();
}
- 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;
+
+ // wrap the scroll values just to be extra kind to float accuracy
+
+ // scroll speed for upper layer
+ speedscale = r_refdef.time*r_skyscroll1.value*8.0/128.0;
+ speedscale -= (int)speedscale;
+ Matrix4x4_CreateTranslate(&scroll1matrix, speedscale, speedscale, 0);
+ // scroll speed for lower layer (transparent layer)
+ speedscale = r_refdef.time*r_skyscroll2.value*8.0/128.0;
speedscale -= (int)speedscale;
- 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)
+ Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
+
+ 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(r_refdef.worldmodel->brush.solidskytexture);
+ m.pointer_texcoord[0] = skysphere_texcoord2f;
+ m.texmatrix[0] = scroll1matrix;
+ if (r_textureunits.integer >= 2)
{
- m.tex[0] = R_GetTexture(mergeskytexture);
- R_Mesh_Draw(&m);
+ // one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
+ m.tex[1] = R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture);
+ m.texcombinergb[1] = gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL;
+ m.pointer_texcoord[1] = skysphere_texcoord2f;
+ m.texmatrix[1] = scroll2matrix;
+ R_Mesh_State(&m);
+ GL_LockArrays(0, skysphere_numverts);
+ R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+ GL_LockArrays(0, 0);
}
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);
+ // two pass
+ R_Mesh_State(&m);
+ GL_LockArrays(0, skysphere_numverts);
+ R_Mesh_Draw(0, 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(r_refdef.worldmodel->brush.alphaskytexture);
+ m.texmatrix[0] = scroll2matrix;
+ R_Mesh_State(&m);
+ GL_LockArrays(0, skysphere_numverts);
+ R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i);
+ GL_LockArrays(0, 0);
}
- 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();
}
void R_Sky(void)
{
- if (skyrendersphere)
- R_SkySphere();
- else if (skyrenderbox)
- R_SkyBox();
-}
-
-//===============================================================
-
-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)
-{
- int x, y, ux, uy, lx, ly;
- byte *m, *u, *l;
- m = skymergedpixels;
- for (y = 0;y < 128;y++)
+ matrix4x4_t skymatrix;
+ if (skyrendermasked)
{
- uy = (y + scrollupper) & 127;
- ly = (y + scrolllower) & 127;
- for (x = 0;x < 128;x++)
+ Matrix4x4_CreateTranslate(&skymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2]);
+ R_Mesh_Matrix(&skymatrix);
+ if (skyrendersphere)
{
- 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;
+ // this does not modify depth buffer
+ R_SkySphere();
+ }
+ else if (skyrenderbox)
+ {
+ // this does not modify depth buffer
+ R_SkyBox();
+ }
+ /* 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
+ //GL_Clear(GL_DEPTH_BUFFER_BIT);
}
+ */
}
- 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_ResetSkyBox(void)
{
- int i, j, p;
- unsigned trans[128*128];
- unsigned transpix;
- int r, g, b;
- unsigned *rgba;
-
- strcpy(skyworldname, loadmodel->name);
+ R_UnloadSkyBox();
+ skyname[0] = 0;
+ R_LoadSkyBox();
+}
- // flush skytexturepool so we won't build up a leak from uploading textures multiple times
- R_FreeTexturePool(&skytexturepool);
+static void r_sky_start(void)
+{
skytexturepool = R_AllocTexturePool();
- mergeskytexture = NULL;
- solidskytexture = NULL;
- alphaskytexture = NULL;
-
- if (bytesperpixel == 4)
- {
- for (i = 0;i < 128;i++)
- for (j = 0;j < 128;j++)
- trans[(i*128) + j] = src[i*256+j+128];
- }
- else
- {
- // make an average value for the back to avoid
- // a fringe on the top level
- r = g = b = 0;
- for (i=0 ; i<128 ; i++)
- {
- for (j=0 ; j<128 ; j++)
- {
- 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];
- }
- }
-
- ((byte *)&transpix)[0] = r/(128*128);
- ((byte *)&transpix)[1] = g/(128*128);
- ((byte *)&transpix)[2] = b/(128*128);
- ((byte *)&transpix)[3] = 0;
- }
-
- memcpy(skyupperlayerpixels, trans, 128*128*4);
+ R_LoadSkyBox();
+}
- 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);
- */
+static void r_sky_shutdown(void)
+{
+ R_UnloadSkyBox();
+ R_FreeTexturePool(&skytexturepool);
+}
- if (bytesperpixel == 4)
- {
- for (i = 0;i < 128;i++)
- for (j = 0;j < 128;j++)
- trans[(i*128) + j] = src[i*256+j];
- }
- else
- {
- for (i=0 ; i<128 ; i++)
- {
- for (j=0 ; j<128 ; j++)
- {
- p = src[i*256 + j];
- if (p == 0)
- trans[(i*128) + j] = transpix;
- else
- trans[(i*128) + j] = d_8to24table[p];
- }
- }
- }
+static void r_sky_newmap(void)
+{
+}
- 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);
- */
+void R_Sky_Init(void)
+{
+ Cmd_AddCommand ("loadsky", &LoadSky_f);
+ Cvar_RegisterVariable (&r_sky);
+ Cvar_RegisterVariable (&r_skyscroll1);
+ Cvar_RegisterVariable (&r_skyscroll2);
+ memset(&skyboxside, 0, sizeof(skyboxside));
+ skyname[0] = 0;
+ R_RegisterModule("R_Sky", r_sky_start, r_sky_shutdown, r_sky_newmap);
}
+
projects / xonotic / darkplaces.git / blobdiff