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

J :

Browse Source 
* Use readbutton in the JGuiController.
This commit is contained in:
jean.chalard
2008-11-27 14:17:15 +00:00
parent b9e2980952
commit 5fec3d4a3d
1 changed files with 216 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/src/JGui.cpp
+102 -140
View File
@@ -18,25 +18,25 @@ JGE* JGuiController::mEngine = NULL;
JGuiObject::JGuiObject(int id): mId(id) JGuiObject::JGuiObject(int id): mId(id)
{ {
mEngine = JGE::GetInstance(); mEngine = JGE::GetInstance();
} }
JGuiObject::~JGuiObject() JGuiObject::~JGuiObject()
{ {
// JGERelease(); // JGERelease();
} }
bool JGuiObject::Leaving(u32 key __attribute__((unused))) bool JGuiObject::Leaving(u32 key __attribute__((unused)))
{ {
return true; return true;
} }
bool JGuiObject::ButtonPressed() bool JGuiObject::ButtonPressed()
{ {
return false; return false;
} }
@@ -48,7 +48,7 @@ void JGuiObject::Entering()
int JGuiObject::GetId() int JGuiObject::GetId()
{ {
return mId; return mId;
} }
@@ -58,189 +58,154 @@ void JGuiObject::Update(float dt __attribute__((unused)))
JGuiController::JGuiController(int id, JGuiListener* listener) : mId(id), mListener(listener) JGuiController::JGuiController(int id, JGuiListener* listener) : mId(id), mListener(listener)
{ {
mEngine = JGE::GetInstance(); mEngine = JGE::GetInstance();
mBg = NULL; mBg = NULL;
mShadingBg = NULL; mShadingBg = NULL;
mCount = 0; mCount = 0;
mCurr = 0; mCurr = 0;
mCursorX = SCREEN_WIDTH/2; mCursorX = SCREEN_WIDTH/2;
mCursorY = SCREEN_HEIGHT/2; mCursorY = SCREEN_HEIGHT/2;
mShowCursor = false; mShowCursor = false;
mActionButton = PSP_CTRL_CIRCLE; mActionButton = PSP_CTRL_CIRCLE;
mLastKey = 0;
mStyle = JGUI_STYLE_WRAPPING; mStyle = JGUI_STYLE_WRAPPING;
mActive = true; mActive = true;
} }
JGuiController::~JGuiController() JGuiController::~JGuiController()
{ {
for (int i=0;i<mCount;i++) for (int i=0;i<mCount;i++)
if (mObjects[i]!=NULL) if (mObjects[i]!=NULL)
delete mObjects[i]; delete mObjects[i];
// JGERelease(); // JGERelease();
} }
void JGuiController::Render() void JGuiController::Render()
{ {
// if (mShadingBg != NULL) // if (mShadingBg != NULL)
// jge->Gfx_BlendRect(mShadingBg, mShadingColor); // jge->Gfx_BlendRect(mShadingBg, mShadingColor);
// if (mBg != NULL) // if (mBg != NULL)
// jge->Gfx_DrawImage(mBg, mBgX, mBgY); // jge->Gfx_DrawImage(mBg, mBgX, mBgY);
for (int i=0;i<mCount;i++) for (int i=0;i<mCount;i++)
if (mObjects[i]!=NULL) if (mObjects[i]!=NULL)
mObjects[i]->Render(); mObjects[i]->Render();
} }
bool JGuiController::KeyRepeated(u32 key, float dt)
{
bool doKey = false;
if (mLastKey != key)
{
mLastKey = key;
doKey = true;
mKeyRepeatDelay = JGUI_INITIAL_DELAY;
}
else
{
mKeyRepeatDelay -= dt;
if (mKeyRepeatDelay <= 0.0f)
{
mKeyRepeatDelay = JGUI_REPEAT_DELAY;
doKey = true;
}
}
return doKey;
}
void JGuiController::Update(float dt) void JGuiController::Update(float dt)
{ {
for (int i=0;i<mCount;i++) for (int i=0;i<mCount;i++)
if (mObjects[i]!=NULL) if (mObjects[i]!=NULL)
mObjects[i]->Update(dt); mObjects[i]->Update(dt);
if (mEngine->GetButtonClick(mActionButton)) u32 key = mEngine->ReadButton();
if (key == mActionButton)
{
if (mObjects[mCurr] != NULL && mObjects[mCurr]->ButtonPressed())
{ {
if (mObjects[mCurr] != NULL && mObjects[mCurr]->ButtonPressed()) if (mListener != NULL)
{ {
if (mListener != NULL) mListener->ButtonPressed(mId, mObjects[mCurr]->GetId());
{ return;
mListener->ButtonPressed(mId, mObjects[mCurr]->GetId()); }
return; }
} }
} else if ((PSP_CTRL_LEFT == key) || (PSP_CTRL_UP == key)) // || mEngine->GetAnalogY() < 64 || mEngine->GetAnalogX() < 64)
{
int n = mCurr;
n--;
if (n<0)
{
if ((mStyle&JGUI_STYLE_WRAPPING))
n = mCount-1;
else
n = 0;
} }
if (mEngine->GetButtonState(PSP_CTRL_LEFT) || mEngine->GetButtonState(PSP_CTRL_UP) || mEngine->GetAnalogY()<64 || mEngine->GetAnalogX()<64) if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(PSP_CTRL_UP))
{ {
if (KeyRepeated(PSP_CTRL_UP, dt)) mCurr = n;
{ mObjects[mCurr]->Entering();
int n = mCurr;
n--;
if (n<0)
{
if ((mStyle&JGUI_STYLE_WRAPPING))
n = mCount-1;
else
n = 0;
}
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(PSP_CTRL_UP))
{
mCurr = n;
mObjects[mCurr]->Entering();
}
}
} }
else if (mEngine->GetButtonState(PSP_CTRL_RIGHT) || mEngine->GetButtonState(PSP_CTRL_DOWN) || mEngine->GetAnalogY()>192 || mEngine->GetAnalogX()>192) }
else if ((PSP_CTRL_RIGHT == key) || (PSP_CTRL_DOWN == key)) // || mEngine->GetAnalogY()>192 || mEngine->GetAnalogX()>192)
{
int n = mCurr;
n++;
if (n>mCount-1)
{ {
if (KeyRepeated(PSP_CTRL_DOWN, dt)) if ((mStyle&JGUI_STYLE_WRAPPING))
{ n = 0;
int n = mCurr; else
n++; n = mCount-1;
if (n>mCount-1)
{
if ((mStyle&JGUI_STYLE_WRAPPING))
n = 0;
else
n = mCount-1;
}
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(PSP_CTRL_DOWN))
{
mCurr = n;
mObjects[mCurr]->Entering();
}
}
} }
else
mLastKey = 0;
if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(PSP_CTRL_DOWN))
{
mCurr = n;
mObjects[mCurr]->Entering();
}
}
} }
void JGuiController::Add(JGuiObject* ctrl) void JGuiController::Add(JGuiObject* ctrl)
{ {
if (mCount<MAX_GUIOBJECT) if (mCount<MAX_GUIOBJECT)
{ {
mObjects[mCount++] = ctrl; mObjects[mCount++] = ctrl;
} }
} }
void JGuiController::Remove(int id) void JGuiController::Remove(int id)
{ {
for (int i=0;i<mCount;i++) for (int i=0;i<mCount;i++)
{
if (mObjects[i] != NULL && mObjects[i]->GetId()==id)
{ {
if (mObjects[i] != NULL && mObjects[i]->GetId()==id) delete mObjects[i];
{ for (int j=i;j<mCount-1;j++)
delete mObjects[i]; {
for (int j=i;j<mCount-1;j++) mObjects[j] = mObjects[j+1];
{ }
mObjects[j] = mObjects[j+1]; mObjects[mCount-1] = NULL;
} mCount--;
mObjects[mCount-1] = NULL; if (mCurr == mCount)
mCount--; mCurr = 0;
if (mCurr == mCount) return;
mCurr = 0;
return;
}
} }
}
} }
void JGuiController::Remove(JGuiObject* ctrl) void JGuiController::Remove(JGuiObject* ctrl)
{ {
for (int i=0;i<mCount;i++) for (int i=0;i<mCount;i++)
{
if (mObjects[i] != NULL && mObjects[i]==ctrl)
{ {
if (mObjects[i] != NULL && mObjects[i]==ctrl) delete mObjects[i];
{ for (int j=i;j<mCount-1;j++)
delete mObjects[i]; {
for (int j=i;j<mCount-1;j++) mObjects[j] = mObjects[j+1];
{ }
mObjects[j] = mObjects[j+1]; mObjects[mCount-1] = NULL;
} mCount--;
mObjects[mCount-1] = NULL; if (mCurr == mCount)
mCount--; mCurr = 0;
if (mCurr == mCount) return;
mCurr = 0;
return;
}
} }
}
} }
@@ -249,6 +214,3 @@ void JGuiController::SetStyle(int style) { mStyle = style; }
void JGuiController::SetCursor(JSprite* cursor) { mCursor = cursor; } void JGuiController::SetCursor(JSprite* cursor) { mCursor = cursor; }
bool JGuiController::IsActive() { return mActive; } bool JGuiController::IsActive() { return mActive; }
void JGuiController::SetActive(bool flag) { mActive = flag; } void JGuiController::SetActive(bool flag) { mActive = flag; }