actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bdedc09: fix EFFECT_BOUNCE, give particles a start position uniformly distributed across the screen [Chris Danford]

Browse Source 
70651fe: change flip effects to use degrees, not radians [Chris Danford]
+ changelog
This commit is contained in:
AJ Kelly
2010-08-11 03:39:07 -05:00
parent 50a62f11c4
commit d316e9f215
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+8 -1
View File
@@ -15,7 +15,14 @@ sm-ssc v1.0 Release Candidate 2 | 201008xx
20100811 20100811
-------- --------
* [Player] Implement a hack for miniholds until a proper solution can be found. sm-ssc:
* [Player] Implement a hack for miniholds until a proper solution can be found.
* [ActorSound] Fix Play() so that stop and pause are usable. [Daisuke Master]
sm4.0:
* r28455: fix EFFECT_BOUNCE, give particles a start position uniformly
distributed across the screen [Chris Danford]
* r28456: change flip effects to use degrees, not radians [Chris Danford]
20100810 20100810
-------- --------
src/BGAnimationLayer.cpp
+15 -4
View File
@@ -235,8 +235,17 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
this->AddChild( pSprite ); this->AddChild( pSprite );
pSprite->Load( sPath ); pSprite->Load( sPath );
pSprite->SetZoom( 0.7f + 0.6f*i/(float)iNumParticles ); pSprite->SetZoom( 0.7f + 0.6f*i/(float)iNumParticles );
pSprite->SetX( randomf( GetGuardRailLeft(pSprite), GetGuardRailRight(pSprite) ) ); switch( effect )
pSprite->SetY( randomf( GetGuardRailTop(pSprite), GetGuardRailBottom(pSprite) ) ); {
case EFFECT_PARTICLES_BOUNCE:
pSprite->SetX( randomf( GetGuardRailLeft(pSprite), GetGuardRailRight(pSprite) ) );
pSprite->SetY( randomf( GetGuardRailTop(pSprite), GetGuardRailBottom(pSprite) ) );
break;
default:
pSprite->SetX( randomf( GetOffScreenLeft(pSprite), GetOffScreenRight(pSprite) ) );
pSprite->SetY( randomf( GetOffScreenTop(pSprite), GetOffScreenBottom(pSprite) ) );
break;
}
switch( effect ) switch( effect )
{ {
@@ -259,6 +268,8 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
pSprite->SetZoom( 1 ); pSprite->SetZoom( 1 );
m_vParticleVelocity.push_back( RageVector3( randomf(), randomf(), 0 ) ); m_vParticleVelocity.push_back( RageVector3( randomf(), randomf(), 0 ) );
RageVec3Normalize( &m_vParticleVelocity[i], &m_vParticleVelocity[i] ); RageVec3Normalize( &m_vParticleVelocity[i], &m_vParticleVelocity[i] );
m_vParticleVelocity[i].x *= PARTICLE_SPEED;
m_vParticleVelocity[i].y *= PARTICLE_SPEED;
break; break;
default: default:
ASSERT(0); ASSERT(0);
@@ -314,10 +325,10 @@ void BGAnimationLayer::LoadFromAniLayerFile( const RString& sPath )
m_fTileVelocityY = +PARTICLE_SPEED; m_fTileVelocityY = +PARTICLE_SPEED;
break; break;
case EFFECT_TILE_FLIP_X: case EFFECT_TILE_FLIP_X:
pSprite->SetEffectSpin( RageVector3(2,0,0) ); pSprite->SetEffectSpin( RageVector3(180,0,0) );
break; break;
case EFFECT_TILE_FLIP_Y: case EFFECT_TILE_FLIP_Y:
pSprite->SetEffectSpin( RageVector3(0,2,0) ); pSprite->SetEffectSpin( RageVector3(0,180,0) );
break; break;
case EFFECT_TILE_PULSE: case EFFECT_TILE_PULSE:
pSprite->SetEffectPulse( 1, 0.3f, 1.f ); pSprite->SetEffectPulse( 1, 0.3f, 1.f );