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

[Game][Arrow] Refactor: Rename arrow methods in GameScene (#6949)

Browse source 
* [Game][Arrow] Rename methods in GameScene

* move stuff around and docs
This commit is contained in:
RickyRister 2026-05-28 02:32:40 -07:00 • committed by GitHub
parent c4f4cece01
commit 43c3bf5966
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

42
cockatrice/src/game/game_scene.cpp
View file

@ -88,16 +88,16 @@ void GameScene::addPlayer(PlayerLogic *player)
connect(player, &PlayerLogic::concededChanged, this, [this](int id, bool conceded) { connect(player, &PlayerLogic::concededChanged, this, [this](int id, bool conceded) {
if (conceded) { if (conceded) {
clearArrowsForPlayer(id); requestClearArrowsForPlayer(id);
} }
rearrange(); rearrange();
}); });
connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::onArrowDeleted); connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::deleteArrow);
connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::onArrowCreateRequested); connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::addArrow);
connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::onArrowDeleteRequested); connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::requestArrowDeletion);
connect(player, &PlayerLogic::arrowsCleared, this, connect(player, &PlayerLogic::arrowsCleared, this,
[this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayer(id); }); [this, id = player->getPlayerInfo()->getId()]() { requestClearArrowsForPlayer(id); });
connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged); connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged);
@ -114,7 +114,7 @@ void GameScene::removePlayer(PlayerLogic *player)
{ {
qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::removePlayer name=" << player->getPlayerInfo()->getName(); qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::removePlayer name=" << player->getPlayerInfo()->getName();
clearArrowsForPlayer(player->getPlayerInfo()->getId()); requestClearArrowsForPlayer(player->getPlayerInfo()->getId());
for (ZoneViewWidget *zone : zoneViews) { for (ZoneViewWidget *zone : zoneViews) {
if (zone->getPlayer() == player) { if (zone->getPlayer() == player) {
@ -367,7 +367,7 @@ void GameScene::resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qr
} }
} }
void GameScene::onArrowCreateRequested(const ArrowData &data) void GameScene::addArrow(const ArrowData &data)
{ {
auto *startView = playerViews.value(data.startPlayerId); auto *startView = playerViews.value(data.startPlayerId);
auto *targetView = playerViews.value(data.targetPlayerId); auto *targetView = playerViews.value(data.targetPlayerId);
@ -402,20 +402,29 @@ void GameScene::onArrowCreateRequested(const ArrowData &data)
auto *arrow = new ArrowItem(startView->getPlayer(), data.id, startCard, targetItem, data.color); auto *arrow = new ArrowItem(startView->getPlayer(), data.id, startCard, targetItem, data.color);
addItem(arrow); addItem(arrow);
arrowRegistry.insert(data.id, arrow); arrowRegistry.insert(data.id, arrow);
connect(arrow, &ArrowItem::requestDeletion, this, &GameScene::onArrowDeleteRequested); connect(arrow, &ArrowItem::requestDeletion, this, &GameScene::requestArrowDeletion);
} }
void GameScene::onArrowDeleted(int arrowId) void GameScene::deleteArrow(int arrowId)
{ {
if (arrowRegistry.contains(arrowId)) { if (arrowRegistry.contains(arrowId)) {
arrowRegistry.take(arrowId)->delArrow(); arrowRegistry.take(arrowId)->delArrow();
} }
} }
void GameScene::onArrowDeleteRequested(int arrowId) void GameScene::requestArrowDeletion(int arrowId)
{ {
if (arrowRegistry.contains(arrowId)) { if (arrowRegistry.contains(arrowId)) {
emit requestArrowDeletion(arrowId); emit arrowDeletionRequested(arrowId);
}
}
void GameScene::requestClearArrowsForPlayer(int playerId)
{
for (auto *arrow : arrowRegistry.values()) {
if (arrow->getPlayer()->getPlayerInfo()->getId() == playerId) {
emit requestArrowDeletion(arrow->getId());
}
} }
} }
@ -432,16 +441,7 @@ void GameScene::onCardZoneChanged(CardItem *card, bool sameZone)
} }
} }
for (auto *arrow : toDelete) { for (auto *arrow : toDelete) {
onArrowDeleted(arrow->getId()); deleteArrow(arrow->getId());
}
}
void GameScene::clearArrowsForPlayer(int playerId)
{
for (auto *arrow : arrowRegistry.values()) {
if (arrow->getPlayer()->getPlayerInfo()->getId() == playerId) {
emit requestArrowDeletion(arrow->getId());
}
} }
} }

14
cockatrice/src/game/game_scene.h
View file

@ -201,11 +201,15 @@ public slots:
QTransform getViewTransform() const; QTransform getViewTransform() const;
QTransform getViewportTransform() const; QTransform getViewportTransform() const;
void onArrowCreateRequested(const ArrowData &data); /// Directly modifies the scene
void onArrowDeleted(int arrowId); void addArrow(const ArrowData &data);
void onArrowDeleteRequested(int arrowId); void deleteArrow(int arrowId);
/// Queues up arrow deletion but doesn't directly modify the scene
void requestArrowDeletion(int arrowId);
void requestClearArrowsForPlayer(int playerId);
void onCardZoneChanged(CardItem *card, bool sameZone); void onCardZoneChanged(CardItem *card, bool sameZone);
void clearArrowsForPlayer(int playerId);
protected: protected:
/** @brief Handles hover updates. */ /** @brief Handles hover updates. */
@ -218,7 +222,7 @@ signals:
void sigStartRubberBand(const QPointF &selectionOrigin); void sigStartRubberBand(const QPointF &selectionOrigin);
void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount); void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount);
void sigStopRubberBand(); void sigStopRubberBand();
void requestArrowDeletion(int arrowId); void arrowDeletionRequested(int arrowId);
}; };
#endif #endif

6
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -608,7 +608,7 @@ void TabGame::actRemoveLocalArrows()
{ {
auto *local = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer()); auto *local = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
if (local) { if (local) {
scene->clearArrowsForPlayer(local->getPlayerInfo()->getId()); scene->requestClearArrowsForPlayer(local->getPlayerInfo()->getId());
} }
} }
@ -1150,9 +1150,9 @@ void TabGame::createPlayAreaWidget(bool bReplay)
scene = new GameScene(phasesToolbar, this); scene = new GameScene(phasesToolbar, this);
connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange); connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange);
connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange); connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange);
connect(scene, &GameScene::requestArrowDeletion, game->getGameEventHandler(), connect(scene, &GameScene::arrowDeletionRequested, game->getGameEventHandler(),
&GameEventHandler::handleArrowDeletion); &GameEventHandler::handleArrowDeletion);
connect(game->getGameEventHandler(), &GameEventHandler::arrowDeleted, scene, &GameScene::onArrowDeleted); connect(game->getGameEventHandler(), &GameEventHandler::arrowDeleted, scene, &GameScene::deleteArrow);
gameView = new GameView(scene); gameView = new GameView(scene);
auto gamePlayAreaVBox = new QVBoxLayout; auto gamePlayAreaVBox = new QVBoxLayout;