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

QskBox namespace renamed to QskBoxRenderer to avoid name clashes with

Browse Source 
QskBox from QskBox.h
This commit is contained in:
Uwe Rathmann 2023-12-17 17:18:35 +01:00
parent 5e5dd7a61c
commit 1e3e1f83de
12 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playground/gradients/GradientView.cpp
View File

@ -170,7 +170,7 @@ QSGNode* GradientView::updatePaintNode(
QskBoxShapeMetrics shape;
shape.setRadius( 80 );
if ( !QskBox::isGradientSupported( shape, m_gradient ) )
if ( !QskBoxRenderer::isGradientSupported( shape, m_gradient ) )
{
delete oldNode;
return nullptr;

9
src/nodes/QskBoxBasicStroker.cpp
View File

@ -143,7 +143,8 @@ namespace
class FillMap
{
public:
inline FillMap( const QskBoxMetrics& metrics, const QskBox::ColorMap& colorMap )
inline FillMap( const QskBoxMetrics& metrics,
const QskBoxRenderer::ColorMap& colorMap )
: m_colorMap( colorMap )
, m_corners( metrics.corners )
{
@ -183,7 +184,7 @@ namespace
m_colorMap.setLine( x1, y1, x2, y2, line );
}
const QskBox::ColorMap& m_colorMap;
const QskBoxRenderer::ColorMap& m_colorMap;
const QskBoxMetrics::Corner* m_corners;
};
}
@ -378,12 +379,12 @@ QskBoxBasicStroker::QskBoxBasicStroker( const QskBoxMetrics& metrics )
QskBoxBasicStroker::QskBoxBasicStroker( const QskBoxMetrics& metrics,
const QskBoxBorderColors& borderColors )
: QskBoxBasicStroker( metrics, borderColors, QskBox::ColorMap() )
: QskBoxBasicStroker( metrics, borderColors, QskBoxRenderer::ColorMap() )
{
}
QskBoxBasicStroker::QskBoxBasicStroker( const QskBoxMetrics& metrics,
const QskBoxBorderColors& borderColors, const QskBox::ColorMap& colorMap )
const QskBoxBorderColors& borderColors, const QskBoxRenderer::ColorMap& colorMap )
: m_metrics( metrics )
, m_borderColors( borderColors )
, m_colorMap( colorMap )

4
src/nodes/QskBoxBasicStroker.h
View File

@ -25,7 +25,7 @@ class QskBoxBasicStroker
QskBoxBasicStroker( const QskBoxMetrics& );
QskBoxBasicStroker( const QskBoxMetrics&, const QskBoxBorderColors& );
QskBoxBasicStroker( const QskBoxMetrics&,
const QskBoxBorderColors&, const QskBox::ColorMap& );
const QskBoxBorderColors&, const QskBoxRenderer::ColorMap& );
int fillCount() const;
int borderCount() const;
@ -78,7 +78,7 @@ class QskBoxBasicStroker
const QskBoxMetrics& m_metrics;
const QskBoxBorderColors m_borderColors;
const QskBox::ColorMap m_colorMap;
const QskBoxRenderer::ColorMap m_colorMap;
const GeometryLayout m_geometryLayout;
const bool m_isColored;

2
src/nodes/QskBoxClipNode.cpp
View File

@ -67,7 +67,7 @@ void QskBoxClipNode::setBox( const QRectF& rect,
else
{
setIsRectangular( false );
QskBox::renderFillGeometry( rect, shape, border, m_geometry );
QskBoxRenderer::renderFillGeometry( rect, shape, border, m_geometry );
}
/*

2
src/nodes/QskBoxColorMap.h
View File

@ -10,7 +10,7 @@
#include <QskGradientDirection.h>
#include <QskVertex.h>
namespace QskBox
namespace QskBoxRenderer
{
class ColorMap
{

3
src/nodes/QskBoxFillNode.cpp
View File

@ -73,7 +73,8 @@ void QskBoxFillNode::updateNode(
if ( dirtyMetrics )
{
QskBox::renderFillGeometry( rect, shapeMetrics, borderMetrics, *geometry() );
QskBoxRenderer::renderFillGeometry(
rect, shapeMetrics, borderMetrics, *geometry() );
markDirty( QSGNode::DirtyGeometry );
geometry()->markVertexDataDirty();

6
src/nodes/QskBoxGradientStroker.cpp
View File

@ -172,7 +172,7 @@ namespace
qreal m_t0, m_dt;
const QskBoxMetrics::Corner* m_c1, * m_c2, * m_c3;
QskBox::GradientIterator m_gradientIterator;
QskBoxRenderer::GradientIterator m_gradientIterator;
};
}
@ -528,7 +528,7 @@ namespace
int setLines( const QskGradient& gradient, ColoredLine* lines )
{
ContourIterator it( m_metrics, gradient.linearDirection() );
QskBox::GradientIterator gradientIt( gradient.stops() );
QskBoxRenderer::GradientIterator gradientIt( gradient.stops() );
ColoredLine* l = lines;
@ -584,7 +584,7 @@ namespace
const qreal y1 = m_metrics.innerRect.top();
const qreal y2 = m_metrics.innerRect.bottom();
QskBox::GradientIterator it( gradient.stops() );
QskBoxRenderer::GradientIterator it( gradient.stops() );
ColoredLine* l = lines;
const auto dir = gradient.linearDirection();

2
src/nodes/QskBoxNode.cpp
View File

@ -85,7 +85,7 @@ void QskBoxNode::updateNode( const QRectF& rect,
However the border is always done with a QskBoxRectangleNode
*/
if ( QskBox::isGradientSupported( shape, gradient ) )
if ( QskBoxRenderer::isGradientSupported( shape, gradient ) )
{
rectNode = qskNode< QskBoxRectangleNode >( this, BoxRole );
rectNode->updateNode( rect, shape, borderMetrics, borderColors, gradient );

6
src/nodes/QskBoxRectangleNode.cpp
View File

@ -171,7 +171,7 @@ void QskBoxRectangleNode::updateNode( const QRectF& rect,
{
setColoring( coloring );
QskBox::renderBox( d->rect, shape, borderMetrics,
QskBoxRenderer::renderBox( d->rect, shape, borderMetrics,
borderColors, fillGradient, geometry );
}
else
@ -179,13 +179,13 @@ void QskBoxRectangleNode::updateNode( const QRectF& rect,
if ( hasFill )
{
setColoring( fillGradient.rgbStart() );
QskBox::renderFillGeometry(
QskBoxRenderer::renderFillGeometry(
d->rect, shape, QskBoxBorderMetrics(), geometry );
}
else
{
setColoring( borderColors.left().rgbStart() );
QskBox::renderBorderGeometry(
QskBoxRenderer::renderBorderGeometry(
d->rect, shape, borderMetrics, geometry );
}
}

16
src/nodes/QskBoxRenderer.cpp
View File

@ -67,7 +67,7 @@ static inline bool qskMaybeSpreading( const QskGradient& gradient )
return true;
}
bool QskBox::isGradientSupported(
bool QskBoxRenderer::isGradientSupported(
const QskBoxShapeMetrics&, const QskGradient& gradient )
{
if ( !gradient.isVisible() || gradient.isMonochrome() )
@ -107,7 +107,7 @@ bool QskBox::isGradientSupported(
return false;
}
void QskBox::renderBorderGeometry(
void QskBoxRenderer::renderBorderGeometry(
const QRectF& rect, const QskBoxShapeMetrics& shape,
const QskBoxBorderMetrics& border, QSGGeometry& geometry )
{
@ -121,13 +121,13 @@ void QskBox::renderBorderGeometry(
stroker.setBorderLines( lines );
}
void QskBox::renderFillGeometry(
void QskBoxRenderer::renderFillGeometry(
const QRectF& rect, const QskBoxShapeMetrics& shape, QSGGeometry& geometry )
{
renderFillGeometry( rect, shape, QskBoxBorderMetrics(), geometry );
}
void QskBox::renderFillGeometry(
void QskBoxRenderer::renderFillGeometry(
const QRectF& rect, const QskBoxShapeMetrics& shape,
const QskBoxBorderMetrics& border, QSGGeometry& geometry )
{
@ -140,7 +140,7 @@ void QskBox::renderFillGeometry(
stroker.setFillLines( lines );
}
void QskBox::renderBox( const QRectF& rect,
void QskBoxRenderer::renderBox( const QRectF& rect,
const QskBoxShapeMetrics& shape, const QskGradient& gradient,
QSGGeometry& geometry )
{
@ -148,7 +148,7 @@ void QskBox::renderBox( const QRectF& rect,
QskBoxBorderColors(), gradient, geometry );
}
void QskBox::renderBox( const QRectF& rect,
void QskBoxRenderer::renderBox( const QRectF& rect,
const QskBoxShapeMetrics& shape, const QskBoxBorderMetrics& border,
const QskBoxBorderColors& borderColors, const QskGradient& gradient,
QSGGeometry& geometry )
@ -159,10 +159,10 @@ void QskBox::renderBox( const QRectF& rect,
const auto effectiveGradient = qskEffectiveGradient( metrics.innerRect, gradient );
if ( metrics.innerRect.isEmpty() ||
QskBox::ColorMap::isGradientSupported( effectiveGradient, metrics.innerRect ) )
QskBoxRenderer::ColorMap::isGradientSupported( effectiveGradient, metrics.innerRect ) )
{
/*
The gradient can be translated to a QskBox::ColorMap and we can do all
The gradient can be translated to a QskBoxRenderer::ColorMap and we can do all
coloring by adding a color info to points of the contour lines.
The orientation of contour lines does not depend on the direction
of the gradient vector.

2
src/nodes/QskBoxRenderer.h
View File

@ -16,7 +16,7 @@ class QskGradient;
class QSGGeometry;
class QRectF;
namespace QskBox
namespace QskBoxRenderer
{
/*
Filling the geometry without any color information:

6
src/nodes/QskRectangleNode.cpp
View File

@ -72,7 +72,7 @@ void QskRectangleNode::updateNode(
d->rect = rect;
d->shape = effectiveShape;
if ( QskBox::isGradientSupported( effectiveShape, effectiveGradient ) )
if ( QskBoxRenderer::isGradientSupported( effectiveShape, effectiveGradient ) )
{
setColoring( Polychrome );
@ -82,7 +82,7 @@ void QskRectangleNode::updateNode(
*/
if ( dirtyMetrics || dirtyColors )
{
QskBox::renderBox( rect,
QskBoxRenderer::renderBox( rect,
effectiveShape, effectiveGradient, *geometry() );
geometry()->markVertexDataDirty();
@ -96,7 +96,7 @@ void QskRectangleNode::updateNode(
if ( dirtyMetrics )
{
QskBox::renderFillGeometry( rect, effectiveShape, *geometry() );
QskBoxRenderer::renderFillGeometry( rect, effectiveShape, *geometry() );
geometry()->markVertexDataDirty();
markDirty( QSGNode::DirtyGeometry );