J :

* New menu style - step one.
  More improvements are to come, but this should be stable and have a good
  portion of what is to be done.

projects/mtg/src/ActionLayer.cpp

@@ -164,7 +164,7 @@ void ActionLayer::setMenuObject(Targetable * object){
   SAFE_DELETE(abilitiesMenu);
 
   JLBFont * mFont = GameApp::CommonRes->GetJLBFont(MAIN_FONT);
-  abilitiesMenu = NEW SimpleMenu(10, this, mFont, 100, 100, 200);
+  abilitiesMenu = NEW SimpleMenu(10, this, mFont, 100, 100);
 
   for (int i=0;i<mCount;i++){
     ActionElement * currentAction = (ActionElement *)mObjects[i];

projects/mtg/src/GameApp.cpp

@@ -1,4 +1,3 @@
-
 #include "../include/config.h"
 #include <JGE.h>
 #include <JRenderer.h>
@@ -97,6 +96,9 @@ void GameApp::Create()
   CommonRes->CreateQuad("particles", "graphics/particles.png", 0, 0, 32, 32);
   CommonRes->GetQuad("particles")->SetHotSpot(16,16);
 
+  CommonRes->CreateQuad("stars", "graphics/particles.png", 64, 0, 32, 32);
+  CommonRes->GetQuad("stars")->SetHotSpot(16,16);
+
   CommonRes->LoadJLBFont("graphics/f3",16);
   CommonRes->LoadJLBFont("graphics/magic",16);
 
@@ -121,7 +123,6 @@ void GameApp::Create()
   mGameStates[GAME_STATE_MENU] = NEW GameStateMenu(this);
   mGameStates[GAME_STATE_MENU]->Create();
 
-
   mGameStates[GAME_STATE_DUEL] = NEW GameStateDuel(this);
   mGameStates[GAME_STATE_DUEL]->Create();
 
@@ -131,15 +132,10 @@ void GameApp::Create()
   mGameStates[GAME_STATE_OPTIONS] = NEW GameStateOptions(this);
   mGameStates[GAME_STATE_OPTIONS]->Create();
 
-
-
   //mGameStates[GAME_STATE_GAME] = NEW GameStateGAME(this);
 
   mCurrentState = NULL;
   mNextState = mGameStates[GAME_STATE_MENU];
-
-
-
 }
 
 

projects/mtg/src/GameStateDuel.cpp

@@ -50,7 +50,7 @@ void GameStateDuel::Start()
   opponentMenuFont = NEW JLBFont("graphics/f3",16);
 
 
-  menu = NEW SimpleMenu(11,this,mFont,SCREEN_WIDTH/2-100,20,200);
+  menu = NEW SimpleMenu(11,this,mFont,SCREEN_WIDTH/2-100,20);
   menu->Add(12,"Back to main menu");
   menu->Add(13, "Cancel");
 
@@ -61,7 +61,7 @@ void GameStateDuel::Start()
     if (mParent->players[i] ==  PLAYER_TYPE_HUMAN){
       if (!deckmenu){
 	decksneeded = 1;
-	deckmenu = NEW SimpleMenu(1,this,mFont, 10 , 10, 100, "Choose a Deck");
+	deckmenu = NEW SimpleMenu(1,this,mFont, 10 , 10, "Choose a Deck");
 	char buffer[100];
 	for (int j=1; j<6; j++){
 	  sprintf(buffer, RESPATH"/player/deck%i.txt",j);
@@ -196,7 +196,7 @@ void GameStateDuel::Update(float dt)
       else{
 	if (mParent->players[0] ==  PLAYER_TYPE_HUMAN){
 	  if (!opponentMenu){
-	    opponentMenu = NEW SimpleMenu(13,this,opponentMenuFont,10,10,SCREEN_WIDTH/2,"choose Opponent");
+	    opponentMenu = NEW SimpleMenu(13,this,opponentMenuFont,10,10,"Choose Opponent");
 	    opponentMenu->Add(0,"Random");
 	    nbAIDecks = 0;
 	    int found = 1;

projects/mtg/src/GameStateOptions.cpp

@@ -27,7 +27,7 @@ void GameStateOptions::Start()
   if (GameApp::HasMusic) optionsList->Add(NEW OptionItem(OPTIONS_MUSICVOLUME, "Music volume", 100, 10));
   optionsList->Add(NEW OptionItem(OPTIONS_SFXVOLUME, "SFX volume", 100, 10));
   JLBFont * mFont = GameApp::CommonRes->GetJLBFont("graphics/f3");
-  optionsMenu = NEW SimpleMenu(102, this,mFont, 50,170,SCREEN_WIDTH-120);
+  optionsMenu = NEW SimpleMenu(102, this,mFont, 50,170);
   optionsMenu->Add(1, "Save & Back to Main Menu");
   optionsMenu->Add(2, "Back to Main Menu");
   optionsMenu->Add(3, "Cancel");

projects/mtg/src/GameStateShop.cpp

@@ -92,7 +92,7 @@ void GameStateShop::Update(float dt)
     if (menu){
       menu->Update(dt);
     }else{
-      menu = NEW SimpleMenu(11,this,mFont,SCREEN_WIDTH/2-100,20,200);
+      menu = NEW SimpleMenu(11,this,mFont,SCREEN_WIDTH/2-100,20);
       menu->Add(12,"Save & Back to main menu");
       menu->Add(13, "Cancel");
     }

projects/mtg/src/MTGGuiPlay.cpp

@@ -356,13 +356,6 @@ void MTGGuiPlay::Render(){
   RenderPlayerInfo(0);
   RenderPlayerInfo(1);
 
-  if (mCount && mObjects[mCurr] != NULL){
-    mObjects[mCurr]->Render();
-    if (hasFocus && mCurr >= offset && showBigCards){
-        ((CardGui *)mObjects[mCurr])->RenderBig(-1,-1,showBigCards-1);
-    }
-  }
-
   if (mGlitterAlpha < 0){
     mGlitterAlpha = 510;
     int position = rand() % 2;
@@ -378,6 +371,12 @@ void MTGGuiPlay::Render(){
   renderer->RenderQuad(mGlitter,mGlitterX,mGlitterY, (float)(mGlitterAlpha)/(float)255, 1.2*float(mGlitterAlpha)/float(255),1.2*float(mGlitterAlpha)/float(255));
   mGlitterAlpha-=10;
 
+  if (mCount && mObjects[mCurr] != NULL){
+    mObjects[mCurr]->Render();
+    if (hasFocus && mCurr >= offset && showBigCards){
+        ((CardGui *)mObjects[mCurr])->RenderBig(-1,-1,showBigCards-1);
+    }
+  }
 }
 
 MTGGuiPlay::~MTGGuiPlay(){

projects/mtg/src/MenuItem.cpp

@@ -35,9 +35,9 @@ void MenuItem::Render()
 
   if (mHasFocus)
     {
-      if (!updatedSinceLastRender){
+      /*      if (!updatedSinceLastRender){
 	mParticleSys->Update(lastDt);
-      }
+	}*/
       // set additive blending
       renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE);
       mParticleSys->Render();
@@ -75,10 +75,7 @@ void MenuItem::Update(float dt)
 	mScale = mTargetScale;
     }
 
-  if (mHasFocus){
     mParticleSys->Update(dt);
-  }
-
 }
 
 

projects/mtg/src/ShopItem.cpp

@@ -162,7 +162,7 @@ void ShopItems::Update(float dt){
       char buffer[4096];
       sprintf(buffer,"%s : %i credits",item->getText(),price);
       if(!dialog){
-	dialog = NEW SimpleMenu(1,this,mFont,SCREEN_WIDTH-300,SCREEN_HEIGHT/2,270,buffer);
+	dialog = NEW SimpleMenu(1,this,mFont,SCREEN_WIDTH-300,SCREEN_HEIGHT/2,buffer);
 	dialog->Add(1,"Yes");
 	dialog->Add(2,"No");
       }

projects/mtg/src/SimpleMenu.cpp

@@ -1,37 +1,125 @@
 #include "../include/config.h"
 #include "../include/SimpleMenu.h"
 #include "../include/SimpleMenuItem.h"
+#include "JTypes.h"
+#include "../include/GameApp.h"
 
-SimpleMenu::SimpleMenu(int id, JGuiListener* listener, JLBFont* font, int x, int y, int width, const char * _title, int _maxItems): JGuiController(id, listener){
-  mHeight = 0;
-  mWidth = width;
+const unsigned SimpleMenu::SIDE_SIZE = 7;
+const unsigned SimpleMenu::VMARGIN = 8;
+const unsigned SimpleMenu::HMARGIN = 27;
+const unsigned SimpleMenu::LINE_HEIGHT = 20;
+const char* SimpleMenu::spadeLPath = "graphics/spade_ul.png";
+const char* SimpleMenu::spadeRPath = "graphics/spade_ur.png";
+const char* SimpleMenu::jewelPath = "graphics/jewel.png";
+const char* SimpleMenu::sidePath = "graphics/menuside.png";
+const char* SimpleMenu::titleFontPath = "graphics/smallface";
+
+
+JQuad* SimpleMenu::spadeR = NULL;
+JQuad* SimpleMenu::spadeL = NULL;
+JQuad* SimpleMenu::jewel = NULL;
+JQuad* SimpleMenu::side = NULL;
+JLBFont* SimpleMenu::titleFont = NULL;
+
+SimpleMenu::SimpleMenu(int id, JGuiListener* listener, JLBFont* font, int x, int y, const char * _title, int _maxItems): JGuiController(id, listener){
+  mHeight = 2 * VMARGIN;
+  mWidth = 0;
   mX = x;
   mY = y;
   mFont = font;
-  if (_title){
-    displaytitle = 1;
-    title = _title;
-    mHeight = 20;
-  }else{
-    displaytitle = 0;
-  }
+  title = _title;
   startId = 0;
   maxItems = _maxItems;
+  side = NULL;
+  selectionT = 0;
+  timeOpen = 0;
+  closed = false;
+
+  JRenderer* renderer = JRenderer::GetInstance();
+  static JTexture* spadeLTex = renderer->LoadTexture(spadeLPath, TEX_TYPE_USE_VRAM);
+  static JTexture* spadeRTex = renderer->LoadTexture(spadeRPath, TEX_TYPE_USE_VRAM);
+  static JTexture* jewelTex  = renderer->LoadTexture(jewelPath, TEX_TYPE_USE_VRAM);
+  static JTexture* sideTex   = renderer->LoadTexture(sidePath, TEX_TYPE_USE_VRAM);
+  if (NULL == spadeL) spadeL = NEW JQuad(spadeLTex, 2, 1, 16, 13);
+  if (NULL == spadeR) spadeR = NEW JQuad(spadeRTex, 2, 1, 16, 13);
+  if (NULL == jewel)  jewel  = NEW JQuad(jewelTex, 0, 0, 3, 3);
+  if (NULL == side)   side   = NEW JQuad(sideTex, 0, 1, 1, 7);
+  if (NULL == titleFont)
+    {
+      GameApp::CommonRes->LoadJLBFont(titleFontPath, 7);
+      titleFont = GameApp::CommonRes->GetJLBFont(titleFontPath);
+    }
+
+  stars = NEW hgeParticleSystem("graphics/stars.psi", GameApp::CommonRes->GetQuad("stars"));
+  stars->MoveTo(mX, mY);
+}
+
+void SimpleMenu::drawHorzPole(int x, int y, int width)
+{
+  JRenderer* renderer = JRenderer::GetInstance();
+
+  renderer->RenderQuad(side, x + 5, y - SIDE_SIZE / 2, 0, width - 10);
+  spadeR->SetHFlip(true);
+  spadeL->SetHFlip(false);
+  renderer->RenderQuad(spadeR, x - 9, y - 6);
+  renderer->RenderQuad(spadeL, x + width - 5, y - 6);
+
+  renderer->RenderQuad(jewel, x - 1, y - 1);
+  renderer->RenderQuad(jewel, x + width - 1, y - 1);
+}
+void SimpleMenu::drawVertPole(int x, int y, int height)
+{
+  JRenderer* renderer = JRenderer::GetInstance();
+
+  renderer->RenderQuad(side, x - SIDE_SIZE / 2, y + height - 5, -M_PI/2, height - 10);
+  spadeR->SetHFlip(false);
+  spadeL->SetHFlip(true);
+  renderer->RenderQuad(spadeR, x - 6, y + 7, -M_PI/2);
+  renderer->RenderQuad(spadeL, x - 6, y + height + 11, -M_PI/2);
+
+  renderer->RenderQuad(jewel, x - 1, y - 1);
+  renderer->RenderQuad(jewel, x - 1, y + height - 1);
 }
 
 void SimpleMenu::Render(){
+  if (0 == mWidth)
+    {
+      for (int i = startId; i < startId + mCount; ++i)
+	{
+	  int width = (static_cast<SimpleMenuItem*>(mObjects[i]))->GetWidth();
+	  if (mWidth < width) mWidth = width;
+	}
+      mWidth += 2*HMARGIN;
+      for (int i = startId; i < startId + mCount; ++i)
+	static_cast<SimpleMenuItem*>(mObjects[i])->Relocate(mX + mWidth / 2, mY + VMARGIN + i * LINE_HEIGHT);
+      stars->Fire();
+      selectionTargetY = selectionY = mY + VMARGIN;
+      timeOpen = 0;
+    }
   mFont->SetColor(ARGB(255,255,255,255));
   JRenderer * renderer = JRenderer::GetInstance();
-  renderer->FillRect(0,0,SCREEN_WIDTH,SCREEN_HEIGHT,ARGB(70,0,0,0));
-  renderer->FillRoundRect(mX,mY,mWidth,mHeight,10,ARGB(255,17,17,17));
-  renderer->FillRoundRect(mX+2,mY+2,mWidth - 4,mHeight-4,10,ARGB(255,62,62,62));
-  if (displaytitle){
-    mFont->DrawString(title.c_str(), mX+10, mY+10);
-  }
+
+  float height = mHeight;
+  if (timeOpen < 1)
+    height *= timeOpen > 0 ? timeOpen : -timeOpen;
+
+  renderer->FillRect(mX, mY, mWidth, height, ARGB(180,0,0,0));
+
+  drawVertPole(mX, mY - 16, height + 32);
+  drawVertPole(mX + mWidth, mY - 16, height + 32);
+  drawHorzPole(mX - 16, mY, mWidth + 32);
+  if (!title.empty())
+    titleFont->DrawString(title.c_str(), mX+mWidth/2, mY - 3, JGETEXT_CENTER);
   for (int i = startId; i < startId + maxItems ; i++){
     if (i > mCount-1) break;
-    ((SimpleMenuItem * )mObjects[i])->RenderWithOffset(-20*startId);
+    if ((static_cast<SimpleMenuItem*>(mObjects[i]))->mY - LINE_HEIGHT * startId < mY + height - LINE_HEIGHT + 7)
+      (static_cast<SimpleMenuItem*>(mObjects[i]))->RenderWithOffset(-LINE_HEIGHT*startId);
   }
+  renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_DST_ALPHA);
+  stars->Render();
+  renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA);
+
+  drawHorzPole(mX - 25, mY + height, mWidth + 50);
 }
 
 void SimpleMenu::Update(float dt){
@@ -41,13 +129,27 @@ void SimpleMenu::Update(float dt){
   }else if (mCurr < startId){
     startId = mCurr;
   }
+  stars->Update(dt);
+  selectionT += 3*dt;
+  selectionY += (selectionTargetY - selectionY) * 8 * dt;
+  stars->MoveTo(mX + HMARGIN + ((mWidth-2*HMARGIN)*(1+cos(selectionT))/2), selectionY + 5 * cos(selectionT*2.35) + LINE_HEIGHT / 2 - LINE_HEIGHT * startId);
+  if (timeOpen < 0)
+    {
+      timeOpen += dt * 10;
+      if (timeOpen >= 0) { timeOpen = 0; closed = true; }
+    }
+  else
+    {
+      timeOpen += dt * 10;
+    }
 }
 
 void SimpleMenu::Add(int id, const char * text){
-  int y = mCount*20;
-  if (displaytitle) y+=20;
-  JGuiController::Add(NEW SimpleMenuItem(id, mFont, text, mWidth/2 + mX + 10, mY + 10 + y, (mCount == 0)));
-  if (mCount <= maxItems) mHeight += 20;
+  JGuiController::Add(NEW SimpleMenuItem(this, id, mFont, text, 0, mY + VMARGIN + mCount*LINE_HEIGHT, (mCount == 0)));
+  if (mCount <= maxItems) mHeight += LINE_HEIGHT;
 }
 
-
+void SimpleMenu::Close()
+{
+  timeOpen = -1.0;
+}

projects/mtg/src/SimpleMenuItem.cpp

@@ -2,41 +2,31 @@
 #include "../include/SimpleMenuItem.h"
 
 
-SimpleMenuItem::SimpleMenuItem(int id, JLBFont *font, const char* text, int x, int y, bool hasFocus): JGuiObject(id), mFont(font), mX(x), mY(y)
+SimpleMenuItem::SimpleMenuItem(SimpleMenu* _parent, int id, JLBFont *font, const char* text, int x, int y, bool hasFocus): JGuiObject(id), parent(_parent), mFont(font), mX(x), mY(y)
 {
-
   mText = text;
   mHasFocus = hasFocus;
 
   mScale = 1.0f;
   mTargetScale = 1.0f;
 
-
-
   if (hasFocus)
     Entering();
   mFont->SetScale(1.2f);
-
 }
 
 
 void SimpleMenuItem::RenderWithOffset(float yOffset)
 {
-
   mFont->SetScale(mScale);
   mFont->SetColor(ARGB(255,255,255,255));
-  if (mHasFocus)
-    {
-      mFont->SetColor(ARGB(255,255,255,0));
-    }
   mFont->DrawString(mText.c_str(), mX, mY + yOffset, JGETEXT_CENTER);
   mFont->SetScale(1.0f);
 }
 
 void SimpleMenuItem::Render()
 {
-
- RenderWithOffset(0);
+  RenderWithOffset(0);
 }
 
 void SimpleMenuItem::Update(float dt)
@@ -56,20 +46,16 @@ void SimpleMenuItem::Update(float dt)
 }
 
 
-
-
 void SimpleMenuItem::Entering()
 {
-
   mHasFocus = true;
-  mTargetScale = 1.2f;
+  parent->selectionTargetY = mY;
 }
 
 
 bool SimpleMenuItem::Leaving(u32 key)
 {
   mHasFocus = false;
-  mTargetScale = 1.0f;
   return true;
 }
 
@@ -79,3 +65,13 @@ bool SimpleMenuItem::ButtonPressed()
   return true;
 }
 
+void SimpleMenuItem::Relocate(int x, int y)
+{
+  mX = x;
+  mY = y;
+}
+
+int SimpleMenuItem::GetWidth()
+{
+  return mFont->GetStringWidth(mText.c_str());
+}

projects/mtg/src/Subtypes.cpp

@@ -14,7 +14,7 @@ Subtypes::Subtypes(){
 int Subtypes::Add(string value){
   int result = find(value);
   if (result) return result;
-#if defined (WIN32) || defined (LINUX)
+#if defined (WIN32)
   char buf[4096];
   sprintf(buf, "Adding new type: *%s*\n",value.c_str());
   OutputDebugString(buf);