1
0
forked from 0ad/0ad

Fix #543 (Replace skybox with black background), based on patch from Jayschwa

This was SVN commit r8018.
This commit is contained in:
Ykkrosh 2010-08-21 22:43:35 +00:00
parent 715a2715c9
commit 2529ae2a7b
3 changed files with 3 additions and 14 deletions

View File

@ -62,8 +62,8 @@ font.console = console
font.default = palatino12
font.misc = verdana16
; Colour of the sky (in "r g b" format). (Will be removed once there's proper sky support).
;skycolor = "255 0 0"
; Colour of the sky (in "r g b" format)
skycolor = "0 0 0"
; Maximum number of players in a session (default 6).
max_players = 8

View File

@ -196,7 +196,7 @@ void Render()
ogl_WarnIfError();
CStr skystring = "61 193 255";
CStr skystring = "255 0 255";
CFG_GET_USER_VAL("skycolor", String, skystring);
CColor skycol;
GUI<CColor>::ParseString(skystring, skycol);

View File

@ -1238,17 +1238,6 @@ void CRenderer::RenderSubmissions()
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
}
// render sky; this is done before everything so that
// (a) we can use a box around the camera instead of placing it "infinitely far away"
// (we just disable depth write so that this doesn't affect future rendering)
// (b) transparent objects properly overlap the sky
if (m_SkyManager->m_RenderSky)
{
MICROLOG(L"render sky");
m->skyManager.RenderSky();
ogl_WarnIfError();
}
// render submitted patches and models
MICROLOG(L"render patches");
RenderPatches();