Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust parameters slightly, fix atmospheric fog on translucent pass

Browse Source
This commit is contained in:
cim 2013-07-07 16:16:55 +01:00
parent 5fb04f74c3
commit 83ac586803
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Core/Entities/OOSunEntity.m
View File

@ -419,7 +419,7 @@ MA 02110-1301, USA.
{
return;
}
OO_ENTER_OPENGL();
OOSetOpenGLState(OPENGL_STATE_ADDITIVE_BLENDING);
@ -474,18 +474,23 @@ MA 02110-1301, USA.
r += width/3.0;
break;
case 1:
r += width/5.0;
r += width/15.0;
break;
}
GLfloat z = r * r / z_distance;
theta = 0.0;
for (i = 0 ; i < 360 ; i++)
{
GLfloat rm = 1.0;
if (j >= 1 && j < 4)
{
rm = 0.98 + (0.04*(pt0 * (rvalue[i]+rvalue[i+1]+rvalue[i+2]) + pt1 * (rvalue[i+360]+rvalue[i+361]+rvalue[i+362])))/3;
}
GLfloat z = r * r * rm * rm / z_distance;
si = sin(theta);
ci = cos(theta);
theta += delta;
sunVertices[k++] = si * r;
sunVertices[k++] = ci * r;
sunVertices[k++] = si * r * rm;
sunVertices[k++] = ci * r * rm;
sunVertices[k++] = -z;
}
theta += delta/2.0;
@ -511,7 +516,7 @@ MA 02110-1301, USA.
alpha = 0.1;
break;
case 2:
color = discColor;
color = outerCoronaColor;
alpha = 0.6;
break;
case 1:

2
src/Core/Universe.m
View File

@ -3857,7 +3857,7 @@ static const OOMatrix starboard_matrix =
}
// experimental - atmospheric fog
fogging = inAtmosphere;
fogging = (inAtmosphere && ![drawthing isStellarObject]);
if (fogging)
{