• R/O
  • SSH
  • HTTPS

project200805us: Commit


Commit MetaInfo

Revision3230 (tree)
Time2017-06-23 01:52:15
Authorhogepiyo

Log Message

a

Change Summary

Incremental Difference

--- DXProject/HPLAirscapeLib/src/minerva/MinervaGUI.cpp (revision 3229)
+++ DXProject/HPLAirscapeLib/src/minerva/MinervaGUI.cpp (revision 3230)
@@ -59,9 +59,9 @@
5959 }
6060 // 横方向に拡大縮小
6161 if (nWidth >= nImageWidth) {
62- DrawExtendGraph(nX, nY,
63- (int)(nX + nWidth * fRate),
64- (int)(nY + nHeight), nImageHandle, TRUE);
62+ DrawExtendGraph(nX-1, nY-1,
63+ (int)(nX + nWidth * fRate+1),
64+ (int)(nY + nHeight+1), nImageHandle, TRUE);
6565 }
6666 else {
6767 // 元のサイズ
@@ -70,8 +70,8 @@
7070 GetGraphSize(nImageHandle, &nW, &nH);
7171 // 短い
7272 // ... 分割表示
73- DrawRectExtendGraph(nX, nY,
74- nX+(int)((nWidth*fRate + 1)), nY+nHeight,
73+ DrawRectExtendGraph(nX-1, nY-1,
74+ nX+(int)((nWidth*fRate + 1)), nY+nHeight+1,
7575 0, 0, nW, nH, nImageHandle, TRUE);
7676 //0, 0,
7777 //(int)(nWidth * fRate + 1),
@@ -91,7 +91,8 @@
9191 float fRate, int nBaseR, int nBaseG, int nBaseB,
9292 int nBarR, int nBarG, int nBarB,
9393 HPLParamBar& paramBar, int nAlpha, HPLSprite* lpSprite, bool bIsAnimation,
94- HPLDXBasic& basic, float fIconZoom)
94+ HPLDXBasic& basic, float fIconZoom, int nIconDeltaY,
95+ bool bIsIconLeftSide, int nCoverIconSeqID)
9596 {
9697 MinervaBarSeqIDSet* lpSeqIDSet = this->getMinervaBarSeqIDSet(paramBar.m_nParamBarType);
9798 int nSeqID = -1;
@@ -173,6 +174,11 @@
173174 // Icon
174175 if (nIconSeqID >= 0) {
175176 HPLSequence* lpIconSeq = lpSprite->getSequence(nIconSeqID,FaceDirection::LEFT);
177+ // 被せ
178+ HPLSequence* lpCoverSeq = NULL;
179+ if (nCoverIconSeqID >= 0) {
180+ lpSprite->getSequence(nCoverIconSeqID, FaceDirection::LEFT);
181+ }
176182 if (!lpIconSeq) {
177183 ASSERT_IT_NULL(lpIconSeq);
178184 }
@@ -183,10 +189,23 @@
183189 }
184190 else {
185191 HPLRect rSrcRect = lpInfo->srcRect;
192+ int nCenX = nX + nWidth + nThickness * 2 + (rSrcRect.getWidth() / 2)* fIconZoom;
193+ if (bIsIconLeftSide) {
194+ nCenX = nX - nThickness - rSrcRect.getWidth() / 2 * fIconZoom;
195+ }
196+ int nCenY = nY - nThickness + (rSrcRect.getHeight() / 2)*fIconZoom + nIconDeltaY;
186197 basic.m_Graphics.draw(
187- nX + nWidth + nThickness * 2 + rSrcRect.getWidth() / 2 + fIconZoom,
188- nY - nThickness + (rSrcRect.getHeight() / 2 - 5)*fIconZoom,
198+ nCenX,
199+ nCenY,
189200 lpIconSeq, FaceDirection::LEFT, 0, fIconZoom, nAlpha, DX_BLENDMODE_ALPHA);
201+
202+ // cover
203+ if (lpCoverSeq) {
204+ basic.m_Graphics.draw(
205+ nCenX,
206+ nCenY,
207+ lpCoverSeq, FaceDirection::LEFT, 0, fIconZoom, nAlpha, DX_BLENDMODE_ALPHA);
208+ }
190209 }
191210 }
192211 }
--- DXProject/HPLAirscapeLib/src/minerva/MinervaGUI.h (revision 3229)
+++ DXProject/HPLAirscapeLib/src/minerva/MinervaGUI.h (revision 3230)
@@ -250,7 +250,8 @@
250250 float fRate, int nBaseR, int nBaseG, int nBaseB,
251251 int nBarR, int nBarG, int nBarB,
252252 HPLParamBar& paramBar, int nAlpha, HPLSprite* lpSprite, bool bIsAnimation,
253- HPLDXBasic& basic, float fIconZoom);
253+ HPLDXBasic& basic, float fIconZoom, int nIconDeltaY,
254+ bool bIsIconLeftSide,int nCoverIconSeqID = -1);
254255
255256 /** SA操作メッセージを取得
256257 * @param[out] vecTexts 追加する形で設定
Show on old repository browser