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)
+ if (r_sky.integer && !(r_refdef.fogenabled && r_refdef.fog_alpha < 1))
{
if (skyboxside[0] || skyboxside[1] || skyboxside[2] || skyboxside[3] || skyboxside[4] || skyboxside[5])
skyrenderbox = 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 int skyboxelements[6*2*3] =
{
// skyside[3]
0, 1, 2,
R_Mesh_TexBind(0, R_GetTexture(skyboxside[i]));
R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
}
+
+ if(r_refdef.fogenabled)
+ {
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GL_Color(r_refdef.fogcolor[0], r_refdef.fogcolor[1], r_refdef.fogcolor[2], r_refdef.fog_alpha);
+ for (i = 0;i < 6;i++)
+ {
+ R_Mesh_TexBind(0, 0);
+ R_Mesh_Draw(0, 6*4, 2, skyboxelements + i * 6, 0, 0);
+ }
+ }
+
GL_LockArrays(0, 0);
}
GL_LockArrays(0, skysphere_numverts);
R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
GL_LockArrays(0, 0);
+ R_Mesh_TexBind(1, 0);
}
else
{
R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
GL_LockArrays(0, 0);
}
+
+ if(r_refdef.fogenabled)
+ {
+ 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], r_refdef.fog_alpha);
+ GL_LockArrays(0, skysphere_numverts);
+ R_Mesh_Draw(0, skysphere_numverts, skysphere_numtriangles, skysphere_element3i, 0, 0);
+ GL_LockArrays(0, 0);
+ }
}
void R_Sky(void)