jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-29 09:22:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't draw tip/shaft outline

Browse source 
Took 12 minutes
This commit is contained in:
Lukas Brübach 2026-08-14 10:13:20 +02:00
parent 52b769a98e
commit 3304e5ab6c
2 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cockatrice/src/game_graphics/board/arrow_item.cpp
View file

@ -119,6 +119,7 @@ void ArrowItem::updatePath(const QPointF &endPoint)
path = QPainterPath(); path = QPainterPath();
bodyPath = QPainterPath(); bodyPath = QPainterPath();
headPath = QPainterPath(); headPath = QPainterPath();
shaftOutlinePath = QPainterPath();
centerLine = QPainterPath(); centerLine = QPainterPath();
headBaseFraction = 1.0; headBaseFraction = 1.0;
} else { } else {
@ -164,6 +165,12 @@ void ArrowItem::updatePath(const QPointF &endPoint)
headPath.lineTo(QPointF(lineLength, 0)); headPath.lineTo(QPointF(lineLength, 0));
headPath.lineTo(point2); headPath.lineTo(point2);
headPath.lineTo(endPoint2); headPath.lineTo(endPoint2);
shaftOutlinePath = QPainterPath(start1);
shaftOutlinePath.quadTo(c, endPoint1);
shaftOutlinePath.moveTo(endPoint2);
shaftOutlinePath.quadTo(c, start2);
shaftOutlinePath.lineTo(start1);
} }
setPos(startPoint); setPos(startPoint);
@ -228,8 +235,18 @@ void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*opti
} }
painter->save(); painter->save();
const QPen outlinePen = painter->pen();
painter->setBrush(paintColor); painter->setBrush(paintColor);
const auto drawShaft = [this, painter, &outlinePen, paintColor]() {
painter->setPen(Qt::NoPen);
painter->drawPath(bodyPath);
painter->setPen(outlinePen);
painter->setBrush(Qt::NoBrush);
painter->drawPath(shaftOutlinePath);
painter->setBrush(paintColor);
};
if (drawProgress >= 1.0 || path.isEmpty()) { if (drawProgress >= 1.0 || path.isEmpty()) {
painter->drawPath(path); painter->drawPath(path);
} else if (drawProgress < headBaseFraction) { } else if (drawProgress < headBaseFraction) {
@ -240,15 +257,20 @@ void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*opti
clip.addRect(QRectF(-glowExtent, path.boundingRect().top() - glowExtent, revealX + glowExtent, clip.addRect(QRectF(-glowExtent, path.boundingRect().top() - glowExtent, revealX + glowExtent,
path.boundingRect().height() + 2 * glowExtent)); path.boundingRect().height() + 2 * glowExtent));
painter->setClipPath(clip); painter->setClipPath(clip);
painter->drawPath(bodyPath); drawShaft();
} else { } else {
// Once the reveal reaches the head base, pop the whole head in with a fade // Once the reveal reaches the head base, pop the whole head in with a fade
// instead of slicing the triangle into a growing stub. // instead of slicing the triangle into a growing stub.
painter->drawPath(bodyPath); drawShaft();
const qreal headFadeIn = (drawProgress - headBaseFraction) / (1.0 - headBaseFraction); const qreal headFadeIn = (drawProgress - headBaseFraction) / (1.0 - headBaseFraction);
painter->setOpacity(headFadeIn); painter->setOpacity(headFadeIn);
painter->setPen(Qt::NoPen);
painter->drawPath(headPath);
painter->setPen(outlinePen);
painter->setBrush(Qt::NoBrush);
painter->drawPath(headPath); painter->drawPath(headPath);
painter->setOpacity(1.0); painter->setOpacity(1.0);
painter->setBrush(paintColor);
} }
if (glowAlpha > 0.0 && !centerLine.isEmpty()) { if (glowAlpha > 0.0 && !centerLine.isEmpty()) {

1
cockatrice/src/game_graphics/board/arrow_item.h
View file

@ -26,6 +26,7 @@ private:
QPainterPath path; QPainterPath path;
QPainterPath bodyPath; QPainterPath bodyPath;
QPainterPath headPath; QPainterPath headPath;
QPainterPath shaftOutlinePath;
QPainterPath centerLine; QPainterPath centerLine;
qreal headBaseFraction = 1.0; qreal headBaseFraction = 1.0;
QElapsedTimer animationClock; QElapsedTimer animationClock;