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

- Replaced static parts by per-instance parts of of several classes when they were not threadsafe (AIMomirPlayer, SimpleMenu, Trash, AIAction, MTGCardInstance, ATutorialMessage, MTGRules). The direct consequence is that we could consumme more memory. So, tell me if you have problems with low memory devices (PSP), there are some threadsafe optimizations that could be implemented if needed.

Browse Source 
- Reworked the testsuite to be able to work multithreaded. This is deactivated by default everywhere except in QT_CONFIG as one testcase still refuses to pass in multithreaded mode. On my 4 cores linux desktop, the 650 tests passes now in 4 seconds (1 fails).
- Replaced usage of CardSelectorSingleton by a card selector per game observer.
- Modified the resource manager to be optionnal and per game observer instance instead of being a singleton. Two reasons here : threading AND Open Gl access. I only updated the crashing parts called from the game observer, so most of the code is still using the single instance. Beware of copy-paste concerning resources ...
- Cleaned up the game observer constructors
- Fixed several problems in action logging code while testing proliferate decks
- Cleaned up Threading implementation based on QThread
This commit is contained in:
Xawotihs
2011-11-06 17:31:44 +00:00
parent b0cb955c53
commit e50fdba648
38 changed files with 509 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
projects/mtg/src/CardGui.cpp
View File

@@ -130,7 +130,7 @@ void CardGui::DrawCard(MTGCard* inCard, const Pos& inPosition, int inMode)
void CardGui::Render()
{
WFont * mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
WFont * mFont = card->getObserver()->getResourceManager()->GetWFont(Fonts::MAIN_FONT);
JRenderer * renderer = JRenderer::GetInstance();
GameObserver * game = card->getObserver();
@@ -140,7 +140,7 @@ void CardGui::Render()
tc = game->getCurrentTargetChooser();
bool alternate = true;
JQuadPtr quad = WResourceManager::Instance()->RetrieveCard(card, CACHE_THUMB);
JQuadPtr quad = card->getObserver()->getResourceManager()->RetrieveCard(card, CACHE_THUMB);
if (quad.get())
alternate = false;
@@ -153,7 +153,7 @@ void CardGui::Render()
JQuadPtr shadow;
if (actZ > 1)
{
shadow = WResourceManager::Instance()->GetQuad("shadow");
shadow = card->getObserver()->getResourceManager()->GetQuad("shadow");
shadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,255,255,255));
renderer->RenderQuad(shadow.get(), actX + (actZ - 1) * 15, actY + (actZ - 1) * 15, actT, 28 * actZ / 16, 40 * actZ / 16);
}
@@ -161,7 +161,7 @@ void CardGui::Render()
JQuadPtr extracostshadow;
if (card->isExtraCostTarget)
{
extracostshadow = WResourceManager::Instance()->GetQuad("extracostshadow");
extracostshadow = card->getObserver()->getResourceManager()->GetQuad("extracostshadow");
extracostshadow->SetColor(ARGB(static_cast<unsigned char>(actA)/2,100,0,0));
renderer->RenderQuad(extracostshadow.get(), actX + (actZ - 1) * 15, actY + (actZ - 1) * 15, actT, 28 * actZ / 16, 40 * actZ / 16);
}
@@ -185,7 +185,7 @@ void CardGui::Render()
}
if (isActiveConnectedParent)
{
JQuadPtr white = WResourceManager::Instance()->GetQuad("white");
JQuadPtr white = card->getObserver()->getResourceManager()->GetQuad("white");
if(white)
{
white->SetColor(ARGB(255,230,50,50));
@@ -212,7 +212,7 @@ void CardGui::Render()
}
if (isActiveConnectedChild)
{
JQuadPtr white = WResourceManager::Instance()->GetQuad("white");
JQuadPtr white = card->getObserver()->getResourceManager()->GetQuad("white");
if(white)
{
white->SetColor(ARGB(255,0,0,255));
@@ -235,15 +235,15 @@ void CardGui::Render()
JQuadPtr icon;
if (card->hasSubtype("plains"))
icon = WResourceManager::Instance()->GetQuad("c_white");
icon = card->getObserver()->getResourceManager()->GetQuad("c_white");
else if (card->hasSubtype("swamp"))
icon = WResourceManager::Instance()->GetQuad("c_black");
icon = card->getObserver()->getResourceManager()->GetQuad("c_black");
else if (card->hasSubtype("forest"))
icon = WResourceManager::Instance()->GetQuad("c_green");
icon = card->getObserver()->getResourceManager()->GetQuad("c_green");
else if (card->hasSubtype("mountain"))
icon = WResourceManager::Instance()->GetQuad("c_red");
icon = card->getObserver()->getResourceManager()->GetQuad("c_red");
else if (card->hasSubtype("island"))
icon = WResourceManager::Instance()->GetQuad("c_blue");
icon = card->getObserver()->getResourceManager()->GetQuad("c_blue");
if (icon.get())
{
@@ -256,7 +256,7 @@ void CardGui::Render()
JQuadPtr mor;
if(card->isMorphed && !alternate)
{
mor = WResourceManager::Instance()->GetQuad("morph");
mor = card->getObserver()->getResourceManager()->GetQuad("morph");
mor->SetColor(ARGB(255,255,255,255));
renderer->RenderQuad(mor.get(), actX, actY, actT,scale, scale);
}
@@ -299,7 +299,7 @@ void CardGui::Render()
if (tc && !tc->canTarget(card))
{
if (!shadow)
shadow = WResourceManager::Instance()->GetQuad("shadow");
shadow = card->getObserver()->getResourceManager()->GetQuad("shadow");
shadow->SetColor(ARGB(200,255,255,255));
renderer->RenderQuad(shadow.get(), actX, actY, actT, (28 * actZ + 1) / 16, 40 * actZ / 16);
}