e50fdba648
- 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
72 lines
2.0 KiB
C++
72 lines
2.0 KiB
C++
#include "PrecompiledHeader.h"
|
|
|
|
#include "GameApp.h"
|
|
#include "GuiFrame.h"
|
|
|
|
GuiFrame::GuiFrame(GameObserver* observer)
|
|
: GuiLayer(observer)
|
|
{
|
|
if (observer->getResourceManager())
|
|
{
|
|
if (observer->getResourceManager()->GetTexture("wood.png"))
|
|
wood = observer->getResourceManager()->RetrieveQuad("wood.png", 0, 0, SCREEN_WIDTH, 28);
|
|
else
|
|
{
|
|
GameApp::systemError += "Can't load wood texture : " __FILE__ "\n";
|
|
}
|
|
|
|
if (observer->getResourceManager()->GetTexture("gold.png"))
|
|
{
|
|
gold1 = observer->getResourceManager()->RetrieveQuad("gold.png", 0, 0, SCREEN_WIDTH, 6, "gold1");
|
|
gold2 = observer->getResourceManager()->RetrieveQuad("gold.png", 0, 6, SCREEN_WIDTH, 6, "gold2");
|
|
if (observer->getResourceManager()->GetTexture("goldglow.png"))
|
|
goldGlow = observer->getResourceManager()->RetrieveQuad("goldglow.png", 1, 1, SCREEN_WIDTH - 2, 18);
|
|
if (gold2)
|
|
{
|
|
gold2->SetColor(ARGB(127, 255, 255, 255));
|
|
gold2->SetHFlip(true);
|
|
}
|
|
}
|
|
}
|
|
step = 0.0;
|
|
|
|
}
|
|
|
|
GuiFrame::~GuiFrame()
|
|
{
|
|
}
|
|
|
|
void GuiFrame::Render()
|
|
{
|
|
JRenderer* renderer = JRenderer::GetInstance();
|
|
float sized = step / 4;
|
|
if (sized > SCREEN_WIDTH)
|
|
sized -= SCREEN_WIDTH;
|
|
renderer->RenderQuad(wood.get(), 0, 0);
|
|
if (gold1.get())
|
|
{
|
|
renderer->RenderQuad(gold1.get(), -sized, 16);
|
|
renderer->RenderQuad(gold1.get(), -sized + 479, 16);
|
|
|
|
if (goldGlow.get())
|
|
{
|
|
goldGlow->SetColor(ARGB((100+(rand()%50)), 255, 255, 255));
|
|
renderer->RenderQuad(goldGlow.get(), -sized, 9);
|
|
renderer->RenderQuad(goldGlow.get(), -sized + 480, 9);
|
|
}
|
|
|
|
if (gold2.get())
|
|
{
|
|
renderer->RenderQuad(gold2.get(), step / 2, 16);
|
|
renderer->RenderQuad(gold2.get(), step / 2 - 479, 16);
|
|
}
|
|
}
|
|
}
|
|
|
|
void GuiFrame::Update(float dt)
|
|
{
|
|
step += dt * 5;
|
|
if (step > 2 * SCREEN_WIDTH)
|
|
step -= 2 * SCREEN_WIDTH;
|
|
}
|