Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved linux compilation issues

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2010-11-08 11:59:28 +00:00
parent 23937f593e
commit 7fe03d52fd
3 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/mtg/include/DeckMenuItem.h
View File

@@ -19,16 +19,12 @@ class DeckMenuItem: public JGuiObject
DeckMenu* parent;
int fontId;
string mText;
float mScale;
float mTargetScale;
public:
string imageFilename;
string desc;
DeckMetaData *meta;
DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, float x, float y, bool hasFocus = false, bool autoTranslate = false, DeckMetaData *meta = NULL, const float &scaleFactor = 1.0f);
~DeckMenuItem();
float mX;
float mY;
@@ -36,9 +32,11 @@ class DeckMenuItem: public JGuiObject
float GetWidth();
bool hasFocus();
DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, float x, float y, bool hasFocus = false, bool autoTranslate = false, DeckMetaData *meta = NULL);
~DeckMenuItem();
void RenderWithOffset(float yOffset);
virtual void Render();
virtual void Update(float dt);
virtual void Entering();
virtual bool Leaving(JButton key);

2
projects/mtg/src/DeckMenu.cpp
View File

@@ -218,7 +218,7 @@ void DeckMenu::Update(float dt){
}
void DeckMenu::Add(int id, const char * text,string desc, bool forceFocus, DeckMetaData * deckMetaData) {
DeckMenuItem * menuItem = NEW DeckMenuItem(this, id, fontId, text, 0, mY + kVerticalMargin + mCount*kLineHeight, (mCount == 0), autoTranslate, deckMetaData, 0.8f);
DeckMenuItem * menuItem = NEW DeckMenuItem(this, id, fontId, text, 0, mY + kVerticalMargin + mCount*kLineHeight, (mCount == 0), autoTranslate, deckMetaData);
menuItem->desc = deckMetaData ? deckMetaData->getDescription() : desc;
JGuiController::Add(menuItem);

25
projects/mtg/src/DeckMenuItem.cpp
View File

@@ -9,8 +9,8 @@ namespace
const float kMaxDeckNameWidth = 180; // pixel width
}
DeckMenuItem::DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, float x, float y, bool hasFocus, bool autoTranslate, DeckMetaData *deckMetaData, const float &scaleFactor)
: JGuiObject(id), parent(_parent), fontId(fontId), mX(x), mY(y), mScale(scaleFactor)
DeckMenuItem::DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, float x, float y, bool hasFocus, bool autoTranslate, DeckMetaData *deckMetaData)
: JGuiObject(id), parent(_parent), fontId(fontId), mX(x), mY(y)
{
if (autoTranslate)
mText = _(text);
@@ -18,8 +18,6 @@ DeckMenuItem::DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, f
mText = text;
mHasFocus = hasFocus;
mScale = 1.0f;
mTargetScale = 1.0f;
if (hasFocus)
Entering();
@@ -46,23 +44,6 @@ void DeckMenuItem::Render()
RenderWithOffset(0);
}
void DeckMenuItem::Update(float dt)
{
if (mScale < mTargetScale)
{
mScale += 8.0f*dt;
if (mScale > mTargetScale)
mScale = mTargetScale;
}
else if (mScale > mTargetScale)
{
mScale -= 8.0f*dt;
if (mScale < mTargetScale)
mScale = mTargetScale;
}
}
void DeckMenuItem::Entering()
{
mHasFocus = true;
@@ -104,8 +85,6 @@ ostream& DeckMenuItem::toString(ostream& out) const
return out << "DeckMenuItem ::: mHasFocus : " << mHasFocus
<< " ; parent : " << parent
<< " ; mText : " << mText
<< " ; mScale : " << mScale
<< " ; mTargetScale : " << mTargetScale
<< " ; mX,mY : " << mX << "," << mY;
}