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

Add nITG's new Confusion modifiers (#1395)

Browse Source 
* Implemented nITG's Confusion modifiers.

Modifiers added:
ConfusionOffset
ConfusionX
ConfusionXOffset
ConfusionY
ConfusionYOffset

* Documented new Confusion modifiers.

* Make ConfusionX mods apply to hold heads
This commit is contained in:
MrThatKid
2017-02-08 05:44:33 -08:00
committed by Colby Klein
parent 5e37aeaa90
commit 388d4ac8ea
7 changed files with 107 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteDisplay.cpp
+10 -12
View File
@@ -937,10 +937,10 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
{
case NCSM_Disabled:
// XXX: Actor rotations use degrees, Math uses radians. Convert here.
ae_rot.y= ArrowEffects::GetRotationY(fYOffset) * PI_180;
ae_rot.y= ArrowEffects::GetRotationY(m_pPlayerState, fYOffset) * PI_180;
break;
case NCSM_Offset:
ae_rot.y= ArrowEffects::GetRotationY(fYOffset) * PI_180;
ae_rot.y= ArrowEffects::GetRotationY(m_pPlayerState, fYOffset) * PI_180;
column_args.rot_handler->EvalForBeat(column_args.song_beat, cur_beat, sp_rot);
break;
case NCSM_Position:
@@ -1291,19 +1291,13 @@ void NoteDisplay::DrawActor(const TapNote& tn, Actor* pActor, NotePart part,
switch(column_args.rot_handler->m_spline_mode)
{
case NCSM_Disabled:
if(!bIsHoldCap)
{
ae_rot.x= ArrowEffects::GetRotationX(fYOffset);
}
ae_rot.y= ArrowEffects::GetRotationY(fYOffset);
ae_rot.x= ArrowEffects::GetRotationX(m_pPlayerState, fYOffset, bIsHoldCap);
ae_rot.y= ArrowEffects::GetRotationY(m_pPlayerState, fYOffset);
ae_rot.z= ArrowEffects::GetRotationZ(m_pPlayerState, fBeat, bIsHoldHead);
break;
case NCSM_Offset:
if(!bIsHoldCap)
{
ae_rot.x= ArrowEffects::GetRotationX(fYOffset);
}
ae_rot.y= ArrowEffects::GetRotationY(fYOffset);
ae_rot.x= ArrowEffects::GetRotationX(m_pPlayerState, fYOffset, bIsHoldCap);
ae_rot.y= ArrowEffects::GetRotationY(m_pPlayerState, fYOffset);
ae_rot.z= ArrowEffects::GetRotationZ(m_pPlayerState, fBeat, bIsHoldHead);
column_args.rot_handler->EvalForBeat(column_args.song_beat, spline_beat, sp_rot);
break;
@@ -1466,9 +1460,13 @@ void NoteColumnRenderer::UpdateReceptorGhostStuff(Actor* receptor) const
{
case NCSM_Disabled:
ae_rot.z= ArrowEffects::ReceptorGetRotationZ(player_state);
ae_rot.x= ArrowEffects::ReceptorGetRotationX(player_state);
ae_rot.y= ArrowEffects::ReceptorGetRotationY(player_state);
break;
case NCSM_Offset:
ae_rot.z= ArrowEffects::ReceptorGetRotationZ(player_state);
ae_rot.x= ArrowEffects::ReceptorGetRotationX(player_state);
ae_rot.y= ArrowEffects::ReceptorGetRotationY(player_state);
NCR_current.m_rot_handler.EvalForReceptor(song_beat, sp_rot);
break;
case NCSM_Position: