mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-07 18:43:26 -08:00
* [DeckList] Apply include-what-you-use to libcockatrice_deck_list * [IWYU] Apply include-what-you-use across the tree Run one whole-tree IWYU pass over the libcockatrice_* libraries, the Cockatrice client, Oracle, Servatrice and the test suite, so each translation unit includes what it uses directly and forward-declares what it does not need. IWYU only analyses real translation units, never the moc code CMake generates from Q_OBJECT headers, so it strips includes that moc output silently relies on. Where a type is passed by value (or nested in a QList/QMap) in a signal or slot signature, the generated moc code needs the complete type; those includes are kept with an explanatory `// IWYU pragma: keep`. The same holds for Q_DECLARE_METATYPE targets such as QSqlDatabase. A handful of includes are added by hand where callers brace-initialize a const-reference parameter, which also requires the complete type. Applied as a single commit on purpose: stripping includes from the libcockatrice_* headers is precisely what breaks the client, test and server translation units, and the fixes for those live in the same translation units. Splitting by component would therefore leave intermediate commits that do not compile. All 426 modified Q_OBJECT/Q_GADGET headers were verified to be moc-self-contained by compiling each generated moc_*.cpp standalone; several built only because of moc include ordering in mocs_compilation.cpp before the keep-includes were added. * [Tooling] Emit public Qt headers and fix IWYU fallout CI found Three problems the local build could not see, all because a green local build only proves the configuration it was run under. Private Qt headers. IWYU emitted private, lowercase Qt headers, and qtypes.h does not exist at all before Qt 6.9, so the Debian 12 and Ubuntu 24.04 jobs on Qt 6.4.2 failed to compile. The generator only emitted a mapping when the capital header name mirrored the private one (QAbstractAnimation for qabstractanimation.h), so qtypes.h, which is wrapped by QtTypes instead, got no mapping and kept the private spelling. Map it explicitly to <QtTypes>, which is public since Qt 5 and provides the same typedefs either way, and rewrite the 100 affected includes. Do not generalize this to "prefer any Qt* wrapper". The table is generated from whichever Qt is installed, and the wrappers are not equally old: QtLogging only appeared in Qt 6.8 and QtMinMax in 6.5, so that heuristic trades one breakage for another. Every other lowercase header still in the tree has shipped publicly since Qt 5, so those are left alone. Platform-guarded includes. IWYU only sees the preprocessor configuration it is handed, so it dropped an include that only the macOS branch of main.cpp needs, and the macOS jobs failed on an undeclared UrlSchemeEventFilter. Restore the include. Force-compiling every file that carries a platform guard under Q_OS_MAC, Q_OS_MACOS and __APPLE__ reports nothing else, so the macOS branches are covered rather than assumed. shellcheck. Drop a leftover variable and stop assigning the include-what-you-use lookup, which was only ever an existence check. * [Tooling] Map Qt 6.5+ split headers to QtGlobal for Qt 6.4 compatibility IWYU emitted QtTypes, QtPreprocessorSupport, QtVersionChecks, QtAssert, QtMinMax, QtClassHelperMacros, QtEnvironmentVariables and QtTranslation. Qt 6.5 split those declarations out of qglobal.h into separate headers, so neither the Qt* wrapper nor the q*.h private name exists on the oldest Qt we support (6.4.2), and Debian 12 / Ubuntu 24.04 fail with "No such file or directory". qtypes.h is worse still: it only appeared in Qt 6.9. QtGlobal is the one spelling that works across the whole supported range. It has been public since Qt 5, defines these declarations itself up to Qt 6.4, and includes the split headers from Qt 6.5 on, so redirect all eight private headers to it and collapse the affected includes in the tree. Curated overrides now take precedence over the name-mirroring rule, which cannot know about Qt version floors because the mapping is generated from whatever Qt is installed. That rule was mapping qtversionchecks.h to <QtVersionChecks> even with an override present, because the override was only consulted as a fallback. A curated key that matches nothing is now a hard error rather than a silent fallback, and the redirected headers are no longer advertised as the home of a symbol. Verified every Qt include in the tree resolves against the real qt6-base-dev 6.4.2 package: 15 distinct includes, 0 missing. * [Tooling] Map QOverload to QtGlobal and drop the QMetaMethodArgument include Two more headers IWYU emitted do not exist on Qt 6.4.2: QOverload was split out of qglobal.h in Qt 6.5, so on 6.4.2 it is declared in qglobal.h directly and the standalone header is a hard error. QtGlobal covers both, so map qoverload.h to it like the other 6.5+ split headers. QMetaMethodArgument is never referenced anywhere in the tree. It is a bare forwarder for qobjectdefs.h that our generator advertised as a class symbol, which is how IWYU came to add the include at all. The symbol mappings are generated from header names, so they cannot tell a forwarder that happens to be capitalised from a real class; removing the unused include is the fix, and the generic case stays a known limitation of the generator. Extending the audit to every Q* header (an earlier pass only matched headers starting with "Qt" or lowercase q*.h, so it missed all of them) against the real qt6-base-dev, qt6-multimedia-dev, qt6-declarative-dev, qt6-svg-dev and qt6-websockets-dev 6.4.2 packages: 341 distinct Qt includes, 0 missing. * [Game] Give moc the complete CardItem type in player_actions.h player_actions.h forward declares CardItem but passes QList<CardItem *> by value in actPlay/actPlayFacedown/actHide. moc instantiates the metatype for those parameters, and on Qt 6.4 that expands to sizeof(CardItem), so Ubuntu 24.04 fails with "invalid application of 'sizeof' to incomplete type 'CardItem'". Newer Qt tolerates the incomplete type, which is why only the 6.4.2 jobs failed. Include the defining header with an IWYU pragma keep, matching how the other MOC-required includes in this area are handled. * [Game] Give moc the complete ServerInfo_Card type player_logic.h, game_scene.h, view_zone.h and view_zone_widget.h forward declare ServerInfo_Card but pass QList<const ServerInfo_Card *> through signal and slot signatures. moc instantiates the metatype for those parameters, which Qt 6.4 expands to sizeof(ServerInfo_Card), so the connect in game_scene.cpp fails on Debian 12 and Ubuntu 24.04 with "invalid application of 'sizeof' to incomplete type 'const ServerInfo_Card'". Newer Qt tolerates it, so only the 6.4.2 jobs failed. Include the generated protobuf header with an IWYU pragma keep, following the pattern already used for ServerInfo_Player and ServerInfo_User in game_event_handler.h. * [Client] Complete the types Qt 6.4 needs for connect and moc Qt 6.4 expands QMetaType::fromType on the normalised argument list of a PMF connect and on moc-generated metatypes, which requires sizeof on every signal and slot parameter. Newer Qt tolerates forward declarations there, so only the Debian 12 and Ubuntu 24.04 jobs failed, with "invalid application of 'sizeof' to incomplete type" for QMouseEvent, QPrinter and GameReplay. Replace the forward declarations with the real includes: - QMouseEvent in the nine widget headers that pass it through signals - QPrinter in abstract_tab_deck_editor.cpp, for the actPrintDeck lambda - game_replay.pb.h in tab_replays.h. GameReplay is a protobuf message, so the project's game/replay.h only forward declares it and cannot supply the complete type. Found by recompiling all 1918 project TUs against the Debian Qt 6.4.2 headers, which reproduces those two CI jobs locally in one pass. * [Client] Complete Release and QMenu for Qt 6.4 moc and connect Continuing the Qt 6.4 complete-type sweep: - window_main.cpp connects ClientUpdateChecker::finishedCheck to MainWindow::checkClientUpdatesFinished, whose Release * parameter made moc 6.4 instantiate the metatype. GameReplay turned out to be a protobuf message, so Release likewise needed release_channel.h in the three headers declaring those signals: window_main.h, dlg_update.h and client_update_checker.h. - moc 6.4 also needs sizeof(QMenu) for the QList<QMenu *> carried by TabSupervisor::setMenu and MainWindow::updateTabMenu. Verified by regenerating moc output with the Debian moc 6.4.2 for all 434 Q_OBJECT/Q_GADGET classes and compiling it, plus recompiling all 1612 source TUs, against the Qt 6.4.2 headers: no remaining failures. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
280 lines
9.8 KiB
C++
280 lines
9.8 KiB
C++
#ifndef GAMESCENE_H
|
|
#define GAMESCENE_H
|
|
|
|
#include "../game/arrow_registry.h"
|
|
|
|
#include <QGraphicsScene>
|
|
#include <QHash>
|
|
#include <QList>
|
|
#include <QLoggingCategory>
|
|
#include <QMap>
|
|
#include <QMetaObject>
|
|
#include <QPointF>
|
|
#include <QPointer>
|
|
#include <QSize>
|
|
#include <QSizeF>
|
|
#include <QString>
|
|
#include <QTransform>
|
|
#include <QtGlobal>
|
|
#include <qtmetamacros.h>
|
|
|
|
// IWYU pragma: keep
|
|
// ServerInfo_Card appears inside QList<...> in signal and slot
|
|
// signatures, which the moc-generated code needs to be complete.
|
|
#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
|
|
|
|
class CardZoneLogic;
|
|
class IAnimatedItem;
|
|
class QGraphicsItem;
|
|
class QPoint;
|
|
struct ArrowData;
|
|
template <class T> class QSharedPointer;
|
|
|
|
inline Q_LOGGING_CATEGORY(GameSceneLog, "game_scene");
|
|
inline Q_LOGGING_CATEGORY(GameScenePlayerAdditionRemovalLog, "game_scene.player_addition_removal");
|
|
|
|
class PlayerLogic;
|
|
class PlayerGraphicsItem;
|
|
class ZoneViewWidget;
|
|
class CardZone;
|
|
class AbstractCardItem;
|
|
class CardItem;
|
|
class ServerInfo_Card;
|
|
class PhasesToolbar;
|
|
class QBasicTimer;
|
|
class QObject;
|
|
|
|
/**
|
|
* @class GameScene
|
|
* @ingroup GameGraphics
|
|
* @brief Manages the game board display including players, zones, cards, and animations.
|
|
*
|
|
* GameScene handles:
|
|
* - Dynamic arrangement of players in columns/rows.
|
|
* - Player rotation adjustments.
|
|
* - Zone views for cards (e.g., graveyard, library, revealed zones).
|
|
* - Hover and animation handling for cards.
|
|
* - Scene resizing and responsive layout.
|
|
*/
|
|
class GameScene : public QGraphicsScene
|
|
{
|
|
Q_OBJECT
|
|
private:
|
|
static const int playerAreaSpacing = 5; ///< Space between player areas
|
|
|
|
PhasesToolbar *phasesToolbar; ///< Toolbar showing game phases
|
|
QMap<int, PlayerGraphicsItem *> playerViews; ///< ID lookup for player graphics items
|
|
QList<QList<PlayerGraphicsItem *>> playersByColumn; ///< Players organized by column
|
|
ArrowRegistry arrowRegistry; ///< ID registry for arrow graphics items
|
|
QList<ZoneViewWidget *> zoneViews; ///< Active zone view widgets
|
|
QSize viewSize; ///< Current view size
|
|
QPointer<CardItem> hoveredCard; ///< Currently hovered card
|
|
QBasicTimer *animationTimer; ///< Timer for scene animations
|
|
QHash<QObject *, IAnimatedItem *> animatedItems; ///< Items currently animating
|
|
QHash<QObject *, QMetaObject::Connection>
|
|
animationItemConnections; ///< destroyed->removeAnimatedItem handles per animated item
|
|
int playerRotation; ///< Rotation offset for player layout
|
|
bool rearranging = false; ///< Guard against re-entrant rearrange
|
|
bool needsReArrange = false; ///< Pending rearrange requested during a pass
|
|
|
|
/**
|
|
* @brief Updates which card is currently hovered based on scene coordinates.
|
|
* @param scenePos Scene position of the cursor.
|
|
*/
|
|
void updateHover(const QPointF &scenePos);
|
|
|
|
/**
|
|
* @brief Activates hover state and escapes the card from its clip container
|
|
* so hover scaling is visible beyond zone bounds.
|
|
*/
|
|
void beginCardHover(CardItem *card);
|
|
/** @brief Deactivates hover state and restores the card to its clip container. */
|
|
void endCardHover(CardItem *card);
|
|
|
|
public:
|
|
/**
|
|
* @brief Constructs the GameScene.
|
|
* @param _phasesToolbar Toolbar widget for phases.
|
|
* @param parent Optional parent QObject.
|
|
*/
|
|
explicit GameScene(PhasesToolbar *_phasesToolbar, QObject *parent = nullptr);
|
|
|
|
/** @brief Destructor, cleans up timer and zone views. */
|
|
~GameScene() override;
|
|
|
|
/** @brief Updates UI text for all zone views. */
|
|
void retranslateUi();
|
|
|
|
/** @brief Gets all selected CardItems. */
|
|
QList<CardItem *> selectedCards() const;
|
|
|
|
/**
|
|
* @brief Adds a player to the scene and stores their graphics item.
|
|
* @param player Player to add.
|
|
*/
|
|
void addPlayer(PlayerLogic *player);
|
|
|
|
/**
|
|
* @brief Removes a player from the scene.
|
|
* @param player Player to remove.
|
|
*/
|
|
void removePlayer(PlayerLogic *player);
|
|
|
|
QMap<int, PlayerGraphicsItem *> getPlayers() const
|
|
{
|
|
return playerViews;
|
|
}
|
|
|
|
PlayerGraphicsItem *viewForPlayer(int playerId)
|
|
{
|
|
return playerViews.value(playerId);
|
|
}
|
|
|
|
/**
|
|
* @brief Adjusts the global rotation offset for player layout.
|
|
* @param rotationAdjustment Number of positions to rotate.
|
|
*/
|
|
void adjustPlayerRotation(int rotationAdjustment);
|
|
|
|
/** @brief Recomputes the layout of players and the scene size. */
|
|
void rearrange();
|
|
|
|
/**
|
|
* @brief Handles view resize and redistributes player positions.
|
|
* @param newSize New view size.
|
|
*/
|
|
void processViewSizeChange(const QSize &newSize);
|
|
|
|
/**
|
|
* @brief Collects all active (non-conceded) players.
|
|
* @param firstPlayerIndex Output index of first local player.
|
|
* @return List of active players.
|
|
*/
|
|
QList<PlayerLogic *> collectActivePlayers(int &firstPlayerIndex) const;
|
|
|
|
/**
|
|
* @brief Rotates the list of players for layout.
|
|
* @param players Original list of players.
|
|
* @param firstPlayerIndex Index of first local player.
|
|
* @return Rotated list.
|
|
*/
|
|
QList<PlayerLogic *> rotatePlayers(const QList<PlayerLogic *> &players, int firstPlayerIndex) const;
|
|
|
|
/**
|
|
* @brief Determines the number of columns to display players in.
|
|
* @param playerCount Total number of active players.
|
|
* @return Number of columns (1 or 2).
|
|
*/
|
|
static int determineColumnCount(int playerCount);
|
|
|
|
/**
|
|
* @brief Computes layout positions and scene size based on players and columns.
|
|
* @param playersPlaying List of active players.
|
|
* @param columns Number of columns to split into.
|
|
* @return Calculated scene size.
|
|
*/
|
|
QSizeF computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &playersPlaying, int columns);
|
|
|
|
/**
|
|
* @brief Computes the minimum width for each column based on player minimum widths.
|
|
* @return List of minimum widths per column.
|
|
*/
|
|
QList<qreal> calculateMinWidthByColumn() const;
|
|
|
|
/**
|
|
* @brief Calculates new scene width considering window aspect ratio.
|
|
* @param newSize View size.
|
|
* @param minWidth Minimum width needed to fit all players.
|
|
* @return Scene width respecting window and content.
|
|
*/
|
|
qreal calculateNewSceneWidth(const QSize &newSize, qreal minWidth) const;
|
|
|
|
/**
|
|
* @brief Resizes columns and distributes extra width to players.
|
|
* @param minWidthByColumn Minimum widths per column.
|
|
* @param newWidth Total scene width.
|
|
*/
|
|
void resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qreal newWidth);
|
|
|
|
/** @brief Finds the topmost card zone under the cursor. */
|
|
static CardZone *findTopmostZone(const QList<QGraphicsItem *> &items);
|
|
|
|
/** @brief Finds the topmost card in a given zone, considering attachments and Z-order. */
|
|
static CardItem *findTopmostCardInZone(const QList<QGraphicsItem *> &items, CardZone *zone);
|
|
|
|
/** @brief Updates hovered card highlighting. */
|
|
void updateHoveredCard(CardItem *newCard);
|
|
|
|
/**
|
|
* @brief Registers an item for animation updates with the shared scene timer.
|
|
*
|
|
* The item must inherit QObject; it is unregistered automatically when it is
|
|
* destroyed, so it may be deleted mid-animation without a dangling pointer.
|
|
*/
|
|
void registerAnimationItem(IAnimatedItem *item);
|
|
|
|
/** @brief Unregisters an item from animation updates. */
|
|
void unregisterAnimationItem(IAnimatedItem *item);
|
|
void startRubberBand(const QPointF &selectionOrigin);
|
|
void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
|
|
void stopRubberBand();
|
|
|
|
private slots:
|
|
/** @brief Removes a destroyed item from the animation set. */
|
|
void removeAnimatedItem(QObject *item);
|
|
|
|
public slots:
|
|
void onCardSelectionChanged(AbstractCardItem *card, bool selected);
|
|
void onCardRightClicked(AbstractCardItem *card, QPoint screenPos);
|
|
void playSelected(AbstractCardItem *card);
|
|
void playSelectedFaceDown(AbstractCardItem *card);
|
|
void hideSelected(AbstractCardItem *card);
|
|
/** @brief Toggles a zone view for a player. */
|
|
void toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed = false);
|
|
|
|
/** @brief Adds a revealed zone view (for shown cards). */
|
|
void addRevealedZoneView(PlayerLogic *player,
|
|
CardZoneLogic *zone,
|
|
const QList<const ServerInfo_Card *> &cardList,
|
|
bool withWritePermission);
|
|
|
|
/** @brief Removes a zone view widget from the scene. */
|
|
void removeZoneView(ZoneViewWidget *item);
|
|
|
|
/** @brief Closes all zone views. */
|
|
void clearViews();
|
|
|
|
/** @brief Empties the contents of all non-reveal zone views. Used for replay rewinding */
|
|
void emptyActiveViews();
|
|
|
|
/** @brief Closes the most recently added zone view. */
|
|
void closeMostRecentZoneView();
|
|
QTransform getViewTransform() const;
|
|
QTransform getViewportTransform() const;
|
|
|
|
/// Directly modifies the scene
|
|
void addArrow(QSharedPointer<ArrowData> data);
|
|
void deleteArrow(int playerId, int arrowId);
|
|
void clearArrowsForPlayer(int playerId);
|
|
void clearArrowsForPlayerLocally(int playerId);
|
|
|
|
/// Queues up arrow deletion but doesn't directly modify the scene
|
|
void requestArrowDeletion(int playerId, int arrowId);
|
|
|
|
void onCardZoneChanged(CardItem *card, bool sameZone);
|
|
|
|
protected:
|
|
/** @brief Handles hover updates. */
|
|
bool event(QEvent *event) override;
|
|
|
|
/** @brief Handles animation timer updates. */
|
|
void timerEvent(QTimerEvent *event) override;
|
|
|
|
signals:
|
|
void sigStartRubberBand(const QPointF &selectionOrigin);
|
|
void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount);
|
|
void sigStopRubberBand();
|
|
void arrowDeletionRequested(int creatorId, int arrowId);
|
|
};
|
|
|
|
#endif
|