Updated xmenudef

This commit is contained in:
njohnson 2025-09-07 23:16:07 -04:00
parent cd7c65ef4a
commit 43e925ae23
2 changed files with 96 additions and 25 deletions

View File

@ -5,15 +5,15 @@ XMenuDef::XMenuDef()
: XAsset() : XAsset()
, mWindow() , mWindow()
, mFont() , mFont()
, mFullScreen() , mFullScreen(0)
, mItemCount() , mItemCount(0)
, mFontIndex() , mFontIndex(0)
, mCursorItem() , mCursorItem(4)
, mFadeCycle() , mFadeCycle(0)
, mFadeClamp() , mFadeClamp(0.0f)
, mFadeAmount() , mFadeAmount(0.0f)
, mFadeInAmount() , mFadeInAmount(0.0f)
, mBlurRadius() , mBlurRadius(0.0f)
, mOnOpen() , mOnOpen()
, mOnClose() , mOnClose()
, mOnESC() , mOnESC()
@ -21,7 +21,7 @@ XMenuDef::XMenuDef()
, mVisibleExp() , mVisibleExp()
, mAllowedBinding() , mAllowedBinding()
, mSoundName() , mSoundName()
, mImageTrack() , mImageTrack(0)
, mFocusColor() , mFocusColor()
, mDisableColor() , mDisableColor()
, mRectXExp() , mRectXExp()
@ -44,5 +44,76 @@ void XMenuDef::Clear()
void XMenuDef::ParseData(QDataStream *aStream) void XMenuDef::ParseData(QDataStream *aStream)
{ {
mWindow.ParseData(aStream);
mFont.ParsePtr(aStream, false);
*aStream
>> mFullScreen
>> mItemCount
>> mFontIndex;
for (int i = 0; i < 4; i++)
{
*aStream >> mCursorItem[i];
}
*aStream
>> mFadeCycle
>> mFadeClamp
>> mFadeAmount
>> mFadeInAmount
>> mBlurRadius;
mOnOpen.ParsePtr(aStream, false);
mOnClose.ParsePtr(aStream, false);
mOnESC.ParsePtr(aStream, false);
mOnKey.ParsePtr(aStream, false);
mVisibleExp.ParseData(aStream);
mAllowedBinding.ParsePtr(aStream, false);
mSoundName.ParsePtr(aStream, false);
*aStream >> mImageTrack;
float focusR, focusG, focusB, focusA,
disableR, disableG, disableB, disableA;
*aStream
>> focusR
>> focusG
>> focusB
>> focusA
>> disableR
>> disableG
>> disableB
>> disableA;
mRectXExp.ParseData(aStream);
mRectYExp.ParseData(aStream);
qint32 itemsPtr;
*aStream >> itemsPtr;
mFont.ParseData(aStream);
mOnOpen.ParseData(aStream);
mOnClose.ParseData(aStream);
mOnESC.ParseData(aStream);
mOnKey.ParseData(aStream);
mVisibleExp.ParseData(aStream);
mAllowedBinding.ParseData(aStream);
mSoundName.ParseData(aStream);
mRectXExp.ParseData(aStream);
mRectYExp.ParseData(aStream);
if (itemsPtr)
{
for (int i = 0; i < mItemCount; i++)
{
XItemDef newItemDef;
newItemDef.ParsePtr(aStream);
mItems.append(newItemDef);
}
}
} }

View File

@ -13,7 +13,7 @@ class XItemDef;
class XMenuDef : public XAsset class XMenuDef : public XAsset
{ {
public: public:
XMenuDef(); explicit XMenuDef();
~XMenuDef(); ~XMenuDef();
virtual void Clear() override; virtual void Clear() override;
@ -21,29 +21,29 @@ public:
private: private:
XWindowDef mWindow; XWindowDef mWindow;
XString* mFont; XString mFont;
int mFullScreen; qint32 mFullScreen;
int mItemCount; qint32 mItemCount;
int mFontIndex; qint32 mFontIndex;
int mCursorItem[4]; QVector<qint32> mCursorItem;
int mFadeCycle; qint32 mFadeCycle;
float mFadeClamp; float mFadeClamp;
float mFadeAmount; float mFadeAmount;
float mFadeInAmount; float mFadeInAmount;
float mBlurRadius; float mBlurRadius;
XString* mOnOpen; XString mOnOpen;
XString* mOnClose; XString mOnClose;
XString* mOnESC; XString mOnESC;
XItemKeyHandler *mOnKey; XItemKeyHandler mOnKey;
XStatement mVisibleExp; XStatement mVisibleExp;
XString* mAllowedBinding; XString mAllowedBinding;
XString* mSoundName; XString mSoundName;
int mImageTrack; qint32 mImageTrack;
QColor mFocusColor; QColor mFocusColor;
QColor mDisableColor; QColor mDisableColor;
XStatement mRectXExp; XStatement mRectXExp;
XStatement mRectYExp; XStatement mRectYExp;
QVector<XItemDef*> mItems; QVector<XItemDef> mItems;
}; };
#endif // XMENUDEF_H #endif // XMENUDEF_H