typedef struct suffixinfo_s
{
- char *suffix;
+ const char *suffix;
qboolean flipx, flipy, flipdiagonal;
}
suffixinfo_t;
-static suffixinfo_t suffix[3][6] =
+static const suffixinfo_t suffix[3][6] =
{
{
{"px", false, false, false},
skyrendersphere = false;
skyrenderbox = false;
skyrendermasked = false;
- if (r_sky.integer && !(r_refdef.fogenabled && r_refdef.fog_end >= 1000000000))
+ if (r_sky.integer && !(r_refdef.fogenabled && r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1] < (1.0f / 256.0f)))
{
if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
skyrenderbox = true;
- else if (r_refdef.worldmodel && r_refdef.worldmodel->brush.solidskytexture)
+ else if (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.solidskytexture)
skyrendersphere = true;
// for depth-masked sky, render the sky on the first sky surface encountered
skyrendernow = true;
void R_UnloadSkyBox(void)
{
int i;
+ int c = 0;
for (i = 0;i < 6;i++)
{
if (skyboxside[i])
+ {
R_FreeTexture(skyboxside[i]);
+ c++;
+ }
skyboxside[i] = NULL;
}
+ if (c && developer_loading.integer)
+ Con_Printf("unloading skybox\n");
}
int R_LoadSkyBox(void)
if (j == 3)
return false;
+ if (developer_loading.integer)
+ Con_Printf("loading skybox \"%s\"\n", name);
+
return true;
}
}
}
-float skyboxvertex3f[6*4*3] =
+static const float skyboxvertex3f[6*4*3] =
{
// skyside[0]
16, -16, 16,
16, 16, -16
};
-float skyboxtexcoord2f[6*4*2] =
+static const float skyboxtexcoord2f[6*4*2] =
{
// skyside[0]
0, 1,
0, 0
};
-int skyboxelements[6*2*3] =
+static const unsigned short skyboxelements[6*2*3] =
{
// skyside[3]
0, 1, 2,
static void R_SkyBox(void)
{
int i;
- // FIXME: fixed function path can't properly handle r_view.colorscale > 1
- GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1);
+ // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
+ GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1);
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_CullFace(GL_NONE);
GL_DepthMask(false);
R_Mesh_ColorPointer(NULL, 0, 0);
R_Mesh_ResetTextureState();
R_Mesh_TexCoordPointer(0, 2, skyboxtexcoord2f, 0, 0);
+ R_SetupGenericShader(true);
GL_LockArrays(0, 6*4);
for (i = 0;i < 6;i++)
{
R_Mesh_TexBind(0, R_GetTexture(skyboxside[i]));
- R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
+ R_Mesh_Draw(0, 6*4, i*2, 2, NULL, skyboxelements, 0, 0);
}
if(r_refdef.fogenabled)
{
+ R_SetupGenericShader(false);
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - FogForDistance(r_refdef.fog_end));
+ GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]);
for (i = 0;i < 6;i++)
{
R_Mesh_TexBind(0, 0);
- R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
+ R_Mesh_Draw(0, 6*4, i*2, 2, NULL, skyboxelements, 0, 0);
}
}
#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 unsigned short skysphere_elements[skysphere_numtriangles * 3];
static void skyspherecalc(void)
{
- int i, j, *e;
+ int i, j;
+ unsigned short *e;
float a, b, x, ax, ay, v[3], length, *vertex3f, *texcoord2f;
float dx, dy, dz;
dx = 16;
*vertex3f++ = v[2];
}
}
- e = skysphere_element3i;
+ e = skysphere_elements;
for (j = 0;j < skygridy;j++)
{
for (i = 0;i < skygridx;i++)
// 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 = r_refdef.scene.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 = r_refdef.scene.time*r_skyscroll2.value*8.0/128.0;
speedscale -= (int)speedscale;
Matrix4x4_CreateTranslate(&scroll2matrix, speedscale, speedscale, 0);
- // FIXME: fixed function path can't properly handle r_view.colorscale > 1
- GL_Color(1 * r_view.colorscale, 1 * r_view.colorscale, 1 * r_view.colorscale, 1);
+ // FIXME: fixed function path can't properly handle r_refdef.view.colorscale > 1
+ GL_Color(1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1 * r_refdef.view.colorscale, 1);
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_CullFace(GL_NONE);
GL_DepthMask(true);
R_Mesh_VertexPointer(skysphere_vertex3f, 0, 0);
R_Mesh_ColorPointer(NULL, 0, 0);
R_Mesh_ResetTextureState();
- R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.solidskytexture));
+ R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.solidskytexture));
R_Mesh_TexCoordPointer(0, 2, skysphere_texcoord2f, 0, 0);
R_Mesh_TexMatrix(0, &scroll1matrix);
- if (r_textureunits.integer >= 2 && r_view.colorscale == 1)
+ if (r_textureunits.integer >= 2 && r_refdef.view.colorscale == 1)
{
// one pass using GL_DECAL or GL_INTERPOLATE_ARB for alpha layer
- R_Mesh_TexBind(1, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture));
- R_Mesh_TexCombine(1, gl_combine.integer ? GL_INTERPOLATE_ARB : GL_DECAL, GL_MODULATE, 1, 1);
+ R_SetupGenericTwoTextureShader(GL_DECAL);
+ R_Mesh_TexBind(1, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture));
R_Mesh_TexCoordPointer(1, 2, skysphere_texcoord2f, 0, 0);
R_Mesh_TexMatrix(1, &scroll2matrix);
GL_LockArrays(0, skysphere_numverts);
- R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+ R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
GL_LockArrays(0, 0);
R_Mesh_TexBind(1, 0);
}
else
{
// two pass
+ R_SetupGenericShader(true);
GL_LockArrays(0, skysphere_numverts);
- R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+ R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- R_Mesh_TexBind(0, R_GetTexture(r_refdef.worldmodel->brush.alphaskytexture));
+ R_Mesh_TexBind(0, R_GetTexture(r_refdef.scene.worldmodel->brush.alphaskytexture));
R_Mesh_TexMatrix(0, &scroll2matrix);
GL_LockArrays(0, skysphere_numverts);
- R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+ R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
GL_LockArrays(0, 0);
}
if(r_refdef.fogenabled)
{
+ R_SetupGenericShader(false);
R_Mesh_TexBind(0, 0);
GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - FogForDistance(r_refdef.fog_end));
+ GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], 1 - r_refdef.fogmasktable[FOGMASKTABLEWIDTH-1]);
GL_LockArrays(0, skysphere_numverts);
- R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+ R_Mesh_Draw(0, skysphere_numverts, 0, skysphere_numtriangles, NULL, skysphere_elements, 0, 0);
GL_LockArrays(0, 0);
}
}
matrix4x4_t skymatrix;
if (skyrendermasked)
{
- Matrix4x4_CreateTranslate(&skymatrix, r_view.origin[0], r_view.origin[1], r_view.origin[2]);
+ Matrix4x4_CreateTranslate(&skymatrix, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2]);
R_Mesh_Matrix(&skymatrix);
if (skyrendersphere)
{