jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 19:43:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Refactor] Move AbstractGraphicsItem and GraphicsItemType to game_graphics/board (#6342)

Browse source 
* [Refactor] Move AbstractGraphicsItem and GraphicsItemType to game_graphics/board folder.

Took 3 minutes

* Update CMakeLists.txt

Took 12 minutes

* Update CMakeLists.txt

Took 12 minutes

Took 2 minutes


Took 16 seconds

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-11-20 12:52:14 +01:00 • committed by GitHub
parent 8788a7aada
commit 9957cb20e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/board/abstract_card_item.h
View file

@ -7,8 +7,8 @@
#ifndef ABSTRACTCARDITEM_H
#define ABSTRACTCARDITEM_H
#include "../../game_graphics/board/graphics_item_type.h"
#include "arrow_target.h"
#include "graphics_item_type.h"
#include <libcockatrice/card/printing/exact_card.h>
#include <libcockatrice/utility/card_ref.h>

65
cockatrice/src/game/board/abstract_graphics_item.cpp
View file

@ -1,65 +0,0 @@
#include "abstract_graphics_item.h"
#include <QPainter>
void AbstractGraphicsItem::paintNumberEllipse(int number,
int fontSize,
const QColor &color,
int position,
int count,
QPainter *painter)
{
painter->save();
QString numStr = QString::number(number);
QFont font("Serif");
font.setPixelSize(fontSize);
font.setWeight(QFont::Bold);
QFontMetrics fm(font);
double w = 1.3 *
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
fm.horizontalAdvance(numStr);
#else
fm.width(numStr);
#endif
double h = fm.height() * 1.3;
if (w < h)
w = h;
painter->setPen(QColor(255, 255, 255, 0));
painter->setBrush(QBrush(QColor(color)));
QRectF textRect;
if (position == -1)
textRect = QRectF((boundingRect().width() - w) / 2.0, (boundingRect().height() - h) / 2.0, w, h);
else {
qreal xOffset = 10;
qreal yOffset = 20;
qreal spacing = 2;
if (position < 2)
textRect = QRectF(count == 1 ? ((boundingRect().width() - w) / 2.0)
: (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)),
yOffset, w, h);
else
textRect = QRectF(count == 3 ? ((boundingRect().width() - w) / 2.0)
: (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)),
yOffset + (spacing + h) * (position / 2), w, h);
}
painter->drawEllipse(textRect);
painter->setPen(Qt::black);
painter->setFont(font);
painter->drawText(textRect, Qt::AlignCenter, numStr);
painter->restore();
}
int resetPainterTransform(QPainter *painter)
{
painter->resetTransform();
auto tx = painter->deviceTransform().inverted();
painter->setTransform(tx);
return tx.isScaling() ? 1.0 / tx.m11() : 1;
}

30
cockatrice/src/game/board/abstract_graphics_item.h
View file

@ -1,30 +0,0 @@
/**
* @file abstract_graphics_item.h
* @ingroup GameGraphics
* @brief TODO: Document this.
*/
#ifndef ABSTRACTGRAPHICSITEM_H
#define ABSTRACTGRAPHICSITEM_H
#include <QGraphicsItem>
/**
* Parent class of all objects that appear in a game.
*/
class AbstractGraphicsItem : public QGraphicsObject
{
Q_OBJECT
protected:
void paintNumberEllipse(int number, int radius, const QColor &color, int position, int count, QPainter *painter);
public:
explicit AbstractGraphicsItem(QGraphicsItem *parent = nullptr) : QGraphicsObject(parent)
{
}
};
int resetPainterTransform(QPainter *painter);
#endif

2
cockatrice/src/game/board/arrow_target.h
View file

@ -7,7 +7,7 @@
#ifndef ARROWTARGET_H
#define ARROWTARGET_H
#include "abstract_graphics_item.h"
#include "../../game_graphics/board/abstract_graphics_item.h"
#include <QList>

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

@ -1,7 +1,7 @@
#include "counter_general.h"
#include "../../game_graphics/board/abstract_graphics_item.h"
#include "../../interface/pixel_map_generator.h"
#include "abstract_graphics_item.h"
#include <QPainter>

22
cockatrice/src/game/board/graphics_item_type.h
View file

@ -1,22 +0,0 @@
/**
* @file graphics_item_type.h
* @ingroup GameGraphics
* @brief TODO: Document this.
*/
#ifndef COCKATRICE_GRAPHICS_ITEM_TYPE_H
#define COCKATRICE_GRAPHICS_ITEM_TYPE_H
#include <QGraphicsItem>
enum GraphicsItemType
{
typeCard = QGraphicsItem::UserType + 1,
typeCardDrag = QGraphicsItem::UserType + 2,
typeZone = QGraphicsItem::UserType + 3,
typePlayerTarget = QGraphicsItem::UserType + 4,
typeDeckViewCardContainer = QGraphicsItem::UserType + 5,
typeOther = QGraphicsItem::UserType + 6
};
#endif // COCKATRICE_GRAPHICS_ITEM_TYPE_H

4
cockatrice/src/game/hand_counter.h
View file

@ -7,8 +7,8 @@
#ifndef HANDCOUNTER_H
#define HANDCOUNTER_H
#include "board/abstract_graphics_item.h"
#include "board/graphics_item_type.h"
#include "../game_graphics/board/abstract_graphics_item.h"
#include "../game_graphics/board/graphics_item_type.h"
#include <QString>

2
cockatrice/src/game/phases_toolbar.h
View file

@ -8,7 +8,7 @@
#ifndef PHASESTOOLBAR_H
#define PHASESTOOLBAR_H
#include "board/abstract_graphics_item.h"
#include "../game_graphics/board/abstract_graphics_item.h"
#include <QFrame>
#include <QGraphicsObject>

2
cockatrice/src/game/player/player.h
View file

@ -7,8 +7,8 @@
#ifndef PLAYER_H
#define PLAYER_H
#include "../../game_graphics/board/abstract_graphics_item.h"
#include "../../interface/widgets/menus/tearoff_menu.h"
#include "../board/abstract_graphics_item.h"
#include "../dialogs/dlg_create_token.h"
#include "menu/player_menu.h"
#include "player_actions.h"

2
cockatrice/src/game/player/player_area.h
View file

@ -7,7 +7,7 @@
#ifndef COCKATRICE_PLAYER_AREA_H
#define COCKATRICE_PLAYER_AREA_H
#include "../board/graphics_item_type.h"
#include "../../game_graphics/board/graphics_item_type.h"
#include "QGraphicsItem"
/**

2
cockatrice/src/game/player/player_target.h
View file

@ -7,9 +7,9 @@
#ifndef PLAYERTARGET_H
#define PLAYERTARGET_H
#include "../../game_graphics/board/graphics_item_type.h"
#include "../board/abstract_counter.h"
#include "../board/arrow_target.h"
#include "../board/graphics_item_type.h"
#include <QFont>
#include <QPixmap>

4
cockatrice/src/game/zones/card_zone.h
View file

@ -7,8 +7,8 @@
#ifndef CARDZONE_H
#define CARDZONE_H
#include "../board/abstract_graphics_item.h"
#include "../board/graphics_item_type.h"
#include "../../game_graphics/board/abstract_graphics_item.h"
#include "../../game_graphics/board/graphics_item_type.h"
#include "logic/card_zone_logic.h"
#include <QLoggingCategory>