168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QskArcRenderNode is a QskFillNode now

This commit is contained in:
Uwe Rathmann 2024-09-02 10:47:41 +02:00
parent cf33edb560
commit 5c80504c57
2 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/nodes/QskArcRenderNode.cpp
View File

@ -9,44 +9,23 @@
#include "QskArcMetrics.h"
#include "QskGradient.h"
#include "QskSGNode.h"
#include "QskFillNodePrivate.h"
QSK_QT_PRIVATE_BEGIN
#include <private/qsgnode_p.h>
QSK_QT_PRIVATE_END
#if 1
#include <qsgvertexcolormaterial.h>
#include <qglobalstatic.h>
// deriving from QskFillNode:TODO ...
Q_GLOBAL_STATIC( QSGVertexColorMaterial, qskMaterialColorVertex )
#endif
class QskArcRenderNodePrivate final : public QSGGeometryNodePrivate
class QskArcRenderNodePrivate final : public QskFillNodePrivate
{
public:
QskArcRenderNodePrivate()
: geometry( QSGGeometry::defaultAttributes_ColoredPoint2D(), 0 )
{
}
inline void resetValues() { hash = 0; }
inline void resetValues()
{
hash = 0;
}
QSGGeometry geometry;
QskHashValue hash = 0;
};
QskArcRenderNode::QskArcRenderNode()
: QSGGeometryNode( *new QskArcRenderNodePrivate )
: QskFillNode( *new QskArcRenderNodePrivate )
{
Q_D( QskArcRenderNode );
}
setGeometry( &d->geometry );
setMaterial( qskMaterialColorVertex );
setFlag( QSGNode::OwnsMaterial, false );
QskArcRenderNode::~QskArcRenderNode()
{
}
void QskArcRenderNode::updateNode( const QRectF& rect,
@ -70,18 +49,11 @@ void QskArcRenderNode::updateNode(
const auto metrics = arcMetrics.toAbsolute( rect.size() );
const auto borderMax = 0.5 * metrics.thickness();
bool visible = !( rect.isEmpty() || metrics.isNull() );
if ( visible )
{
visible = gradient.isVisible() && ( borderWidth < borderMax );
if ( !visible )
{
visible = ( borderWidth > 0.0 )
const bool hasFill = gradient.isVisible() && ( borderWidth < borderMax );
const bool hasBorder = ( borderWidth > 0.0 )
&& borderColor.isValid() && ( borderColor.alpha() > 0 );
}
}
if ( !visible )
if ( rect.isEmpty() || metrics.isNull() || !( hasFill || hasBorder ) )
{
d->resetValues();
QskSGNode::resetGeometry( this );
@ -100,14 +72,50 @@ void QskArcRenderNode::updateNode(
hash = gradient.hash( hash );
hash = qHash( radial, hash );
if ( hash != d->hash )
{
if ( hash == d->hash )
return;
d->hash = hash;
auto coloring = QskFillNode::Polychrome;
#if 0
if ( !( hasFill && hasBorder ) )
{
if ( hasBorder || ( hasFill && gradient.isMonochrome() ) )
coloring = QskFillNode::Monochrome;
}
#endif
auto& geometry = *this->geometry();
if ( coloring == QskFillNode::Polychrome )
{
setColoring( coloring );
QskArcRenderer::renderArc( rect, metrics, radial,
borderWidth, gradient, borderColor, *geometry() );
borderWidth, gradient, borderColor, geometry );
}
else
{
if ( hasFill )
{
setColoring( gradient.rgbStart() );
QskArcRenderer::renderArc( rect, metrics, radial,
borderWidth, gradient, borderColor, geometry );
}
else
{
setColoring( borderColor );
QskArcRenderer::renderArc( rect, metrics, radial,
borderWidth, gradient, borderColor, geometry );
}
}
markDirty( QSGNode::DirtyGeometry );
markDirty( QSGNode::DirtyMaterial );
}
geometry.markVertexDataDirty();
}

12
src/nodes/QskArcRenderNode.h
View File

@ -7,23 +7,25 @@
#define QSK_ARC_RENDER_NODE_H
#include "QskGlobal.h"
#include <qsgnode.h>
#include "QskFillNode.h"
class QskGradient;
class QskArcMetrics;
class QskArcRenderNodePrivate;
class QSK_EXPORT QskArcRenderNode : public QSGGeometryNode
class QSK_EXPORT QskArcRenderNode : public QskFillNode
{
using Inherited = QSGGeometryNode;
using Inherited = QskFillNode;
public:
QskArcRenderNode();
~QskArcRenderNode() override;
void updateNode( const QRectF&, const QskArcMetrics&, const QskGradient& );
void updateNode( const QRectF&, const QskArcMetrics&, qreal borderWidth,
const QColor& borderColor );
void updateNode( const QRectF&, const QskArcMetrics&,
qreal borderWidth, const QColor& borderColor );
void updateNode( const QRectF&, const QskArcMetrics&, bool radial,
qreal borderWidth, const QColor& borderColor, const QskGradient& );