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

Reimplemented distance culling for sparks and flashers, and added distance attenuation (i.e., they fade out instead of popping).

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2544 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2009-09-20 15:04:49 +00:00
parent 7fa48675ab
commit ed6f588046
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Entities/OOFlasherEntity.m
View File

@ -152,7 +152,7 @@ MA 02110-1301, USA.
- (double)findCollisionRadius
{
NSSize size = [self size];
return fmax(size.width, size.height);
return fmaxf(size.width, size.height);
}
@end

16
src/Core/Entities/OOLightParticleEntity.m
View File

@ -52,6 +52,9 @@ static OOTexture *sBlobTexture = nil;
if ((self = [super init]))
{
_size = size;
double radius = fmax(size.width, size.height);
no_draw_distance = radius * radius * NO_DRAW_DISTANCE_FACTOR * NO_DRAW_DISTANCE_FACTOR * 0.5;
_colorComponents[0] = 1.0f;
_colorComponents[1] = 1.0f;
_colorComponents[2] = 1.0f;
@ -68,6 +71,8 @@ static OOTexture *sBlobTexture = nil;
{
return _size;
}
- (void) setColor:(OOColor *)color
{
[color getGLRed:&_colorComponents[0] green:&_colorComponents[1] blue:&_colorComponents[2] alpha:&_colorComponents[3]];
@ -84,8 +89,8 @@ static OOTexture *sBlobTexture = nil;
- (void) drawSubEntity:(BOOL)immediate :(BOOL)translucent
{
if (!translucent) return;
// FIXME: check distance.
zero_distance = [[self owner] zeroDistance];
if (no_draw_distance <= zero_distance) return;
OO_ENTER_OPENGL();
@ -116,8 +121,7 @@ static OOTexture *sBlobTexture = nil;
- (void) drawEntity:(BOOL)immediate :(BOOL)translucent
{
if (!translucent || [UNIVERSE breakPatternHide]) return;
// FIXME: check distance.
if (no_draw_distance <= zero_distance) return;
OO_ENTER_OPENGL();
@ -126,7 +130,9 @@ static OOTexture *sBlobTexture = nil;
OOGL(glBlendFunc(GL_SRC_ALPHA, GL_ONE));
OOGL(glEnable(GL_TEXTURE_2D));
OOGL(glColor4fv(_colorComponents));
GLfloat distanceAttenuation = 1.0f - zero_distance / no_draw_distance;
GLfloat components[4] = { _colorComponents[0], _colorComponents[1], _colorComponents[2], _colorComponents[3] * distanceAttenuation };
OOGL(glColor4fv(components));
OOGL(glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, _colorComponents));
OOGL(glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND));
[[self texture] apply];

3
src/Core/Entities/ShipEntity.m
View File

@ -1463,6 +1463,9 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
// are we burning due to low energy
if ((energy < maxEnergy * 0.20)&&(energy_recharge_rate > 0.0)) // prevents asteroid etc. from burning
throw_sparks = YES;
// FIXME temp debug code
if (self == [UNIVERSE station]) throw_sparks = YES;
// burning effects
if (throw_sparks)