jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-06 05:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[Counters] Split counters into graphics and logic states

Browse source 
Took 22 minutes
This commit is contained in:
Lukas Brübach 2026-05-20 19:47:04 +02:00
parent 10b9a65f17
commit 2063be6fa0
17 changed files with 279 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cockatrice/src/game/board/counter_general.cpp
View file

@ -5,22 +5,15 @@
#include <QPainter>
GeneralCounter::GeneralCounter(PlayerLogic *_player,
int _id,
const QString &_name,
const QColor &_color,
int _radius,
int _value,
bool useNameForShortcut,
QGraphicsItem *parent)
: AbstractCounter(_player, _id, _name, true, _value, useNameForShortcut, parent), color(_color), radius(_radius)
GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool useNameForShortcut, QGraphicsItem *parent)
: AbstractCounter(state, player, true, useNameForShortcut, parent)
{
setCacheMode(DeviceCoordinateCache);
}
QRectF GeneralCounter::boundingRect() const
{
return QRectF(0, 0, radius * 2, radius * 2);
return QRectF(0, 0, state->getRadius() * 2, state->getRadius() * 2);
}
void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
@ -28,19 +21,19 @@ void GeneralCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /
QRectF mapRect = painter->combinedTransform().mapRect(boundingRect());
int translatedHeight = mapRect.size().height();
qreal scaleFactor = translatedHeight / boundingRect().height();
QPixmap pixmap = CounterPixmapGenerator::generatePixmap(translatedHeight, name, hovered);
QPixmap pixmap = CounterPixmapGenerator::generatePixmap(translatedHeight, state->getName(), hovered);
painter->save();
resetPainterTransform(painter);
painter->drawPixmap(QPoint(0, 0), pixmap);
if (value) {
if (state->getValue()) {
QFont f("Serif");
f.setPixelSize(qMax((int)(radius * scaleFactor), 10));
f.setPixelSize(qMax((int)(state->getRadius() * scaleFactor), 10));
f.setWeight(QFont::Bold);
painter->setPen(Qt::black);
painter->setFont(f);
painter->drawText(mapRect, Qt::AlignCenter, QString::number(value));
painter->drawText(mapRect, Qt::AlignCenter, QString::number(state->getValue()));
}
painter->restore();
}