From 8958f350eaa47883297cb5d2a0e7132662d7310f Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 21 Dec 2003 08:55:59 +0000 Subject: [PATCH] ScreenEvaluation cleanup --- .../Graphics/ScreenEvaluation score label.png | Bin 0 -> 3002 bytes .../Graphics/ScreenEvaluation time label.png | Bin 0 -> 1376 bytes stepmania/src/ScreenEvaluation.cpp | 16 ++++++++++++---- stepmania/src/ScreenEvaluation.h | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation score label.png create mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation time label.png diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation score label.png b/stepmania/Themes/default/Graphics/ScreenEvaluation score label.png new file mode 100644 index 0000000000000000000000000000000000000000..349c1cef7c7903a174a6395464ada71726774ac6 GIT binary patch literal 3002 zcmV;r3q|yaP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ{FiAu~RCwBA`2YVu!zdnn7$AVagsM^t46_5V4iFar z@me+ImSaHr2oN745+4ET*{`A6)(gbeKt3nbTyY?d1mcB2`9ma_c}zpK^@zGk>jWU% z6o^@XSO$n&^>jM_TU$>2Z)-J)C~Rdu;lHL@+XtZDBp?=ox=Raab}P^huw5khaW9Yt zxyb{F1(3oIWNswTymdhO1PS2=wjXHjW}q9hfNUv%078x!7A5(ncwm4&_Hv)`E+=d4 z_kz52zw&a{l7tKM*Zqu-UHZwyu;)0)0u{w(4LRwCdk!{}U!|q2{7R~s#Rcnsr6eu? zq^I3^7-*icjAZ>oZ_k+@`+E=kU$gqc|MlxG5rtQ+IRC%8YAYy$-YCd6&H$Rl2lVSS zpj$tJ>>$;T(UFTjnHu-LkdO}1G-fo5H~^!$HR#3GPiHv!FCTwc0~qOj}lI{=E9YXAWRi%XOGKPW&S6c=uw$gDZDj)Tm(3J^fBi1~lw_yZILw}B~XAJ9T_@S+8${sW7} z|4j`$P|W=J@jF@OtpwH&z_J%y93cZxk+FZ@ZG!p_9=!Aa<;%|~dbe%8_Fo^^fH-~n z5nK#p{`vDy2%C4{4!C52f$!gc{|6Oepl}2waCA3<>?hW*rNtXT=1c+zAb7<5`GY8G zK%U6YUHjh#*y;h|M+ERgTdRq8?5rnUvA3CY6^L(Gn)RR2Qg8pi8(6QvQ|Zq?|CcX2 z_a7(^!goo)w}9ro2??5q;^Eh?zx;2g+X1S}eiP7t&)H$>|LN0?p!g9~Zy6hO|38Bi zF;Aa<1P1VGLjHaNtlC zp?>!sV0@SX1Q0x8kiq54&wv%=pSTv<0x) z_x}jc^N4`_46G=Z{s*n`0hza$fc{8e%jsq) zFk-)a{t4HAVE=7!u11cShrqfFlrstV`y|l3|4ofMQQWg?<%R#iRvt#g%$R-@JC00~Sq=1utKI0w%g8Ah-N2%wJEoIZvN_`0wsI9b}FfKmfra zrX1vPP*$d>wF9h2>T0%ude~r$BVy{P95Gr%=+C5O#9X@g^gpn>0dmXpq5|?G2Grnk zb)E(?#~C1iU=gDTEFW*@X0Q2wLx$*_uu{X22un0kG2?7P0`GVf$%){IDJ3If63`=N=Z@>ZzS2aHc?v}6kBbanL@;7NozIKF)V~|(FG%zC zHU{3i`_})%2k-v>@ZlR=AE*(qZ0T8W<&R#+JbV7}{~=&qyLZnmykQA4b1ASo0ksH$ z?$rbcAoy6BvO+V1f^4I+x^ip3sZsA;XUD1k-GJH3)d@Ft0yaZIWnz8pHgGY9Xo}tk zH$_1a2hT|_KK&05UGN`h&om%rg<>{57%Z;a}qM2-Qauo7VB324U? zU|?+l(gZO`otjb$h`t0WDv-h1GmpW2BA~iM_{;u(HrV&A!qmF$M1v9FDuyuw+kNzsjI2l_CE#KJO!mF>C+Dwl~{M@K5#F%v}hwrgnW@-Lo$0@u$#^X~!#5Z0bQB>*($ z=I%NJWcWH@*8aQ|EilOe&z^n+4f}&rGsqJZfq$SJeG^ok{{yuguUvkHVoyvYIARKk zX(c{Ia?6DaPr(s`-t#9F?A&n!Jmv-vKvavE4D9& zP5TBa+TOkUO19aLfhid@TL~;e9)gOkyLaCF|MvA4$>x9t9uFP33u>_ZR+ewtsG-^l zo{~VwfB7F54elsr5{Q`Su#oxSkpdXFcJ&1~VhZxsQxuM%Mh(#Xp8x>_i4ck(igCx8(m46Gm-fS4CpkuEeb=y~1Iw)_9_WA|~I0ZMVW@Xqbm z|C^iky#t)m2(?Vqh!r6VRL_ z=o$hUpgryKG7X=IaWeupd;&(uW1w3SK-0?50QLp8nBZ#UfNFs9tw3=x0udtuR96R5 w57#RVc4Ij(F|H!bU8or7#)m-jtpEZH0EihcAF>C^5C8xG07*qoM6N<$g3j}voB#j- literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation time label.png b/stepmania/Themes/default/Graphics/ScreenEvaluation time label.png new file mode 100644 index 0000000000000000000000000000000000000000..6eb03d84b33f96a35c1ebfa9a2bba3cd6bbe1fdf GIT binary patch literal 1376 zcmV-m1)utfP)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ=)=5M`RCwBy&M^ysAP@y$r7TL_i&~2Ooh|<3T%7Eg z2?k0ve8X{fk4KzyM6H@_imC;N}&b$ zrE>~D;?ALWR-NXkaMLFHlF;Fq?KRN-?Um_RodSpf8ZiX1us{{VqlfQ_!XPtYn2=hS zxj?l-K&*}hi^9|q<4$DvB4cvZkZKRP=AdJM03s@4__)g%&YgV>3v5#$K1v0A9AqAn zxv4;W9Sin>sROx#SPW8+jLB6)sy*1uAtz!00*GM5@N$+h?AU%CITv{Rryf8yw+V-u z0GJw(JBY<-W|OUkRC}$f>Y=gJ5ec8uA-Tn2*mraU}J2a zA4(V$h9FEz4gv@uyb;sYxfh#7!9e^0ik|`TDJZ^MA7R*9H zpzuR6F>2VTU=LoqK;a3(Lj09rj4xsU0tj!!;IO~~hzp=N8HjD6I3GvEoI+9q!yvtZ zXyyt6u|F29jl~V1NQ}XP1%Oxyh<$;$6o~twxD+bJ3)PQJ4X7v$g~|~V83s`GnMh{9 z>QbPGJwO0aGh#e(IIx&V{mwY_ zJ7Q7mfpiM5tMT!;PR^Jp+sSA3*#Xh(BSG1F7f6=XX!H84L=tjVNIc5J1$7 zm`og=EF)6C8xH;UBt#4>XM6?XKSZecO=OD^gc*Uj9gDi3(1=Wf%74Y8CYg}`&5U~) zR1}-xVGj^M)Qp&N93D&~Qhyqe0YoTb?n2#ih6pvgNr)IwZh41A-6|r&;S4chfE@M! z0Ys08aU)WH83_@SghTCTAXWro4j@**(@KP?;Ughpa&Xj3#n2`_4Ci4{^M{x)c=zrb zgM?@;IP3ue2xr6y@>Y@>F(o)W=uBb6VpCg+L+vg!b^nP-;n=`2EOsu!6VdOG@K+N2 zfq`$|ehm(LfB?c8F}z&m49Ab%CpBVva5%_?Nd1La^xnpywgQJ;jYI@`4H0T~V6k%# z4z(+Rcs&wc3vJmUNexec078ivex3@3Su>82+xy*)!{G`<>fc60 z(L|^yL(UC)IMfsp5itj_*x8ChZ2=xXv6J9`6bukRU;;K=-Q2j7k};thl$5Q|z#t~& zf^ZcMyAp{QYz-qKVwPdC(-hiY!B)q#LPs9Fp*RNG2$+o}ArOTD0tigxWUT>X3J2@{ zQy4M#Nr;%)IP9_`B4Qkn)Ck~EQ;WmiE+GDe$FI+z7#ZY}6P^G8M6D52Aqpdg7l+0W_rNIR*(fhIR>%u@a@` i0tC=#zz$Lj5MTfYf?*J)YI1r20000m_PlayerOptions[PLAYER_2].m_fScrollSpeed = 2; GAMESTATE->m_iCurrentStageIndex = 2; for( float f = 0; f < 1.0f; f += .005f ) - GAMESTATE->m_CurStageStats.SetLifeRecord( PLAYER_1, fmodf(f*4+.3f,1), f ); + { + float fP1 = fmodf(f*4+.3f,1); + GAMESTATE->m_CurStageStats.SetLifeRecord( PLAYER_1, fP1, f ); + GAMESTATE->m_CurStageStats.SetLifeRecord( PLAYER_2, 1-fP1, f ); + } } LOG->Trace( "ScreenEvaluation::ScreenEvaluation()" ); @@ -375,11 +379,15 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( !GAMESTATE->IsPlayerEnabled(p) ) continue; // skip + m_sprGraphFrame[p].Load( THEME->GetPathToG(ssprintf("ScreenEvaluation graph frame p%d",p+1)) ); + m_sprGraphFrame[p].SetName( ssprintf("GraphFrameP%d",p+1) ); + SET_XY_AND_ON_COMMAND( m_sprGraphFrame[p] ); + this->AddChild( &m_sprGraphFrame[p] ); + m_Graph[p].SetName( ssprintf("GraphP%i",p+1) ); m_Graph[p].Load( THEME->GetPathToG(ssprintf("%s graph p%i",m_sName.c_str(), p+1)), GRAPH_START_HEIGHT ); m_Graph[p].LoadFromStageStats( stageStats, (PlayerNumber)p ); SET_XY_AND_ON_COMMAND( m_Graph[p] ); - this->AddChild( &m_Graph[p] ); } } @@ -598,7 +606,6 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) m_sprStatsLabel[l].Load( THEME->GetPathToG( ssprintf("ScreenEvaluation label %s", STATS_STRING[l]) ) ); m_sprStatsLabel[l]->StopAnimating(); - m_sprStatsLabel[l]->SetState( l ); m_sprStatsLabel[l]->SetName( ssprintf("%sLabel",STATS_STRING[l]) ); SET_XY_AND_ON_COMMAND( m_sprStatsLabel[l] ); this->AddChild( m_sprStatsLabel[l] ); @@ -631,7 +638,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) // if( SHOW_SCORE_AREA ) { - m_sprScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation score labels 1x2") ); + m_sprScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation score label") ); m_sprScoreLabel.SetState( 0 ); m_sprScoreLabel.StopAnimating(); m_sprScoreLabel.SetName( "ScoreLabel" ); @@ -981,6 +988,7 @@ void ScreenEvaluation::TweenOffScreen() if( !GAMESTATE->IsPlayerEnabled(p) ) continue; // skip + OFF_COMMAND( m_sprGraphFrame[p] ); OFF_COMMAND( m_Graph[p] ); } } diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index da4257aacf..acc9b72b03 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -85,6 +85,7 @@ protected: GradeDisplay m_Grades[NUM_PLAYERS]; // graph area + Sprite m_sprGraphFrame[NUM_PLAYERS]; GraphDisplay m_Graph[NUM_PLAYERS]; // combo area