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

QskGradient::Spread -> QskGradient::SpreadMode

Browse Source
This commit is contained in:
Uwe Rathmann 2022-12-22 11:45:23 +01:00
parent 6c1c04c7be
commit 3de71d1bd5
11 changed files with 86 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playground/gradients/GradientQuickShape.cpp
View File

@ -115,7 +115,7 @@ namespace
}
shapeGradient->setSpread(
static_cast< QQuickShapeGradient::SpreadMode >( gradient.spread() ) );
static_cast< QQuickShapeGradient::SpreadMode >( gradient.spreadMode() ) );
/*
QQuickGradient has been made in the early days of Qt5 for the QML

2
playground/gradients/main.cpp
View File

@ -46,7 +46,7 @@ namespace
QskGradient gradient;
gradient.setLinearDirection( 0.0, 0.0, 1.0, 1.0 );
gradient.setSpread( QskGradient::RepeatSpread );
gradient.setSpreadMode( QskGradient::RepeatSpread );
gradient.setStops( stops );
showGradient( gradient );

18
playground/shapes/Window.cpp
View File

@ -35,7 +35,7 @@ namespace
QskGradient gradient( QGradient::PhoenixStart );
gradient.setLinearDirection( 0.0, 0.0, 0.2, 0.5 );
gradient.setSpread( QskGradient::ReflectSpread );
gradient.setSpreadMode( QskGradient::ReflectSpread );
shapeItem->setGradient( gradient );
}
@ -50,7 +50,7 @@ namespace
QskGradient gradient( stops );
gradient.setLinearDirection( 0.0, 0.0, 0.05, 0.1 );
gradient.setSpread( QskGradient::RepeatSpread );
gradient.setSpreadMode( QskGradient::RepeatSpread );
shapeItem->setGradient( gradient );
}
@ -83,7 +83,7 @@ namespace
QskGradient gradient( QskRgb::LightYellow, QskRgb::MidnightBlue );
gradient.setRadialDirection( QskRadialDirection() );
gradient.setSpread( QskGradient::PadSpread );
gradient.setSpreadMode( QskGradient::PadSpread );
shapeItem->setGradient( gradient );
}
@ -107,7 +107,7 @@ namespace
QskGradient gradient( stops );
gradient.setDirection( QskGradient::Radial );
gradient.setSpread( QskGradient::PadSpread );
gradient.setSpreadMode( QskGradient::PadSpread );
shapeItem->setGradient( gradient );
}
@ -118,7 +118,7 @@ namespace
QskGradient gradient( QGradient::LilyMeadow );
gradient.setRadialDirection( 0.5, 0.7, 0.25 );
gradient.setSpread( QskGradient::RepeatSpread );
gradient.setSpreadMode( QskGradient::RepeatSpread );
shapeItem->setGradient( gradient );
}
@ -129,7 +129,7 @@ namespace
QskGradient gradient( Qt::red, Qt::blue );
gradient.setRadialDirection( 0.6, 0.4, 0.1 );
gradient.setSpread( QskGradient::ReflectSpread );
gradient.setSpreadMode( QskGradient::ReflectSpread );
shapeItem->setGradient( gradient );
}
@ -149,7 +149,7 @@ namespace
QskGradient gradient( QGradient::JuicyPeach );
gradient.setConicDirection( 0.5, 0.5, 30.0, 60.0 );
gradient.setSpread( QskGradient::ReflectSpread );
gradient.setSpreadMode( QskGradient::ReflectSpread );
shapeItem->setGradient( gradient );
}
@ -160,7 +160,7 @@ namespace
QskGradient gradient( QGradient::WinterNeva );
gradient.setConicDirection( 0.5, 0.5, 30.0, 60.0 );
gradient.setSpread( QskGradient::RepeatSpread );
gradient.setSpreadMode( QskGradient::RepeatSpread );
shapeItem->setGradient( gradient );
}
@ -179,7 +179,7 @@ namespace
QskGradient gradient( QGradient::FabledSunset );
gradient.setConicDirection( 0.5, 0.5, 45.0, 180.0 );
gradient.setSpread( QskGradient::ReflectSpread );
gradient.setSpreadMode( QskGradient::ReflectSpread );
shapeItem->setGradient( gradient );
}

16
playground/shapes/shapes.qml
View File

@ -26,7 +26,7 @@ Qsk.Window
gradient:
({
linear: { x1: 0, y1: 0, x2: 0.2, y2: 0.5 },
spread: Qsk.Gradient.ReflectSpread,
spreadMode: Qsk.Gradient.ReflectSpread,
// PhonixStart
stops: [
@ -44,7 +44,7 @@ Qsk.Window
gradient:
({
linear: { x1: 0, y1: 0, x2: 0.05, y2: 0.1 },
spread: Qsk.Gradient.RepeatSpread,
spreadMode: Qsk.Gradient.RepeatSpread,
stops: [
{ position: 0.5, color: "RoyalBlue" },
@ -85,7 +85,7 @@ Qsk.Window
gradient:
({
conic: { x: 0.5, y: 0.5, startAngle: 30, spanAngle: 60 },
spread: Qsk.Gradient.ReflectSpread,
spreadMode: Qsk.Gradient.ReflectSpread,
// JuicyPeach
stops: [
@ -103,7 +103,7 @@ Qsk.Window
gradient:
({
conic: { x: 0.5, y: 0.5, startAngle: 30, spanAngle: 60 },
spread: Qsk.Gradient.RepeatSpread,
spreadMode: Qsk.Gradient.RepeatSpread,
// WinterNeva
stops: [
@ -144,7 +144,7 @@ Qsk.Window
gradient:
({
conic: { x: 0.5, y: 0.5, startAngle: 45, spanAngle: 180 },
spread: Qsk.Gradient.ReflectSpread,
spreadMode: Qsk.Gradient.ReflectSpread,
// FabledSunset
stops: [
@ -188,7 +188,7 @@ Qsk.Window
gradient:
({
radial: { x: 0.5, y: 0.5, radius: 0.5 },
spread: Qsk.Gradient.PadSpread,
spreadMode: Qsk.Gradient.PadSpread,
stops: [
{ position: 0.0, color: "lime" },
@ -213,7 +213,7 @@ Qsk.Window
gradient:
({
radial: { x: 0.5, y: 0.7, radius: 0.25 },
spread: Qsk.Gradient.RepeatSpread,
spreadMode: Qsk.Gradient.RepeatSpread,
// LilyMeadow
stops: [
@ -232,7 +232,7 @@ Qsk.Window
gradient:
({
radial: { x: 0.6, y: 0.4, radius: 0.1 },
spread: Qsk.Gradient.ReflectSpread,
spreadMode: Qsk.Gradient.ReflectSpread,
stops: [
{ position: 0.0, color: "red" },

7
qmlexport/QskQml.cpp
View File

@ -153,11 +153,14 @@ namespace
}
else if ( v.isNumber() )
{
if ( it.name() == QStringLiteral( "spread" ) )
if ( it.name() == QStringLiteral( "spreadMode" ) )
{
const auto s = v.toNumber();
if ( s >= QskGradient::PadSpread && s <= QskGradient::RepeatSpread )
gradient.setSpread( static_cast< QskGradient::Spread >( s ) );
{
gradient.setSpreadMode(
static_cast< QskGradient::SpreadMode >( s ) );
}
}
}
}

59
src/common/QskGradient.cpp
View File

@ -129,7 +129,7 @@ QskGradient::QskGradient( const QGradient& qGradient )
}
}
m_spread = static_cast< Spread >( qGradient.spread() );
m_spreadMode = static_cast< SpreadMode >( qGradient.spread() );
setStops( qskBuildGradientStops( qGradient.stops() ) );
}
@ -138,7 +138,7 @@ QskGradient::QskGradient( const QskGradient& other ) noexcept
, m_values{ other.m_values[0], other.m_values[1],
other.m_values[2], other.m_values[3], }
, m_type( other.m_type )
, m_spread( other.m_spread )
, m_spreadMode( other.m_spreadMode )
, m_isDirty( other.m_isDirty )
, m_isValid( other.m_isValid )
, m_isMonchrome( other.m_isMonchrome )
@ -153,7 +153,7 @@ QskGradient::~QskGradient()
QskGradient& QskGradient::operator=( const QskGradient& other ) noexcept
{
m_type = other.m_type;
m_spread = other.m_spread;
m_spreadMode = other.m_spreadMode;
m_stops = other.m_stops;
m_values[0] = other.m_values[0];
@ -172,7 +172,7 @@ QskGradient& QskGradient::operator=( const QskGradient& other ) noexcept
bool QskGradient::operator==( const QskGradient& other ) const noexcept
{
return ( m_type == other.m_type )
&& ( m_spread == other.m_spread )
&& ( m_spreadMode == other.m_spreadMode )
&& ( m_values[0] == other.m_values[0] )
&& ( m_values[1] == other.m_values[1] )
&& ( m_values[2] == other.m_values[2] )
@ -346,9 +346,9 @@ void QskGradient::setAlpha( int alpha )
m_isDirty = true;
}
void QskGradient::setSpread( Spread spread )
void QskGradient::setSpreadMode( SpreadMode spreadMode )
{
m_spread = spread;
m_spreadMode = spreadMode;
}
void QskGradient::reverse()
@ -593,26 +593,20 @@ void QskGradient::resetDirection()
QGradient QskGradient::toQGradient() const
{
switch( m_type )
QGradient g;
switch( static_cast< int >( m_type ) )
{
case Linear:
{
QLinearGradient g( m_values[0], m_values[1], m_values[2], m_values[3] );
g.setCoordinateMode( QGradient::ObjectMode );
g.setSpread( static_cast< QGradient::Spread >( m_spread ) );
g.setStops( qskToQGradientStops( m_stops ) );
return g;
g = QLinearGradient( m_values[0], m_values[1], m_values[2], m_values[3] );
break;
}
case Radial:
{
QRadialGradient g( m_values[0], m_values[1], m_values[2] );
g.setCoordinateMode( QGradient::ObjectMode );
g.setSpread( static_cast< QGradient::Spread >( m_spread ) );
g.setStops( qskToQGradientStops( m_stops ) );
return g;
g = QRadialGradient( m_values[0], m_values[1], m_values[2] );
break;
}
case Conic:
@ -623,24 +617,17 @@ QGradient QskGradient::toQGradient() const
"QskGradient: spanAngle got lost, when converting to QConicalGradient";
}
QConicalGradient g( m_values[0], m_values[1], m_values[2] );
g.setCoordinateMode( QGradient::ObjectMode );
g.setSpread( static_cast< QGradient::Spread >( m_spread ) );
g.setStops( qskToQGradientStops( m_stops ) );
return g;
}
default:
{
QGradient g;
g.setCoordinateMode( QGradient::ObjectMode );
g.setSpread( static_cast< QGradient::Spread >( m_spread ) );
g.setStops( qskToQGradientStops( m_stops ) );
return g;
g = QConicalGradient( m_values[0], m_values[1], m_values[2] );
break;
}
}
g.setCoordinateMode( QGradient::ObjectMode );
g.setSpread( static_cast< QGradient::Spread >( m_spreadMode ) );
g.setStops( qskToQGradientStops( m_stops ) );
return g;
}
QGradient QskGradient::toQGradient( const QRectF& rect ) const
@ -772,7 +759,7 @@ QDebug operator<<( QDebug debug, const QskGradient& gradient )
}
}
switch( gradient.spread() )
switch( gradient.spreadMode() )
{
case QskGradient::RepeatSpread:
debug << " RP";

16
src/common/QskGradient.h
View File

@ -30,7 +30,7 @@ class QSK_EXPORT QskGradient
Q_PROPERTY( QskGradientStops stops READ stops WRITE setStops )
Q_PROPERTY( Spread spread READ spread WRITE setSpread )
Q_PROPERTY( SpreadMode spreadMode READ spreadMode WRITE setSpreadMode )
Q_PROPERTY( bool valid READ isValid )
Q_PROPERTY( bool visible READ isVisible )
@ -49,13 +49,13 @@ class QSK_EXPORT QskGradient
};
Q_ENUM( Type )
enum Spread
enum SpreadMode
{
PadSpread,
ReflectSpread,
RepeatSpread
};
Q_ENUM( Spread )
Q_ENUM( SpreadMode )
QskGradient() noexcept = default;
@ -122,8 +122,8 @@ class QSK_EXPORT QskGradient
void setAlpha( int alpha );
void setSpread( Spread );
Spread spread() const noexcept;
void setSpreadMode( SpreadMode );
SpreadMode spreadMode() const noexcept;
void reverse();
QskGradient reversed() const;
@ -160,7 +160,7 @@ class QSK_EXPORT QskGradient
qreal m_values[4] = {};
Type m_type = Stops;
Spread m_spread = PadSpread;
SpreadMode m_spreadMode = PadSpread;
mutable bool m_isDirty = false;
mutable bool m_isValid = false;
@ -234,9 +234,9 @@ inline QRgb QskGradient::rgbEnd() const
return m_stops.isEmpty() ? qRgba( 0, 0, 0, 255 ) : m_stops.last().rgb();
}
inline QskGradient::Spread QskGradient::spread() const noexcept
inline QskGradient::SpreadMode QskGradient::spreadMode() const noexcept
{
return m_spread;
return m_spreadMode;
}
#ifndef QT_NO_DEBUG_STREAM

26
src/nodes/QskColorRamp.cpp
View File

@ -18,7 +18,7 @@ namespace
class Texture : public QSGPlainTexture
{
public:
Texture( const QskGradientStops& stops, QskGradient::Spread spread )
Texture( const QskGradientStops& stops, QskGradient::SpreadMode spreadMode )
{
/*
Qt creates tables of 1024 colors, while Chrome, Firefox, and Android
@ -28,7 +28,7 @@ namespace
setImage( QskRgb::colorTable( 256, stops ) );
const auto wrapMode = this->wrapMode( spread );
const auto wrapMode = this->wrapMode( spreadMode );
setHorizontalWrapMode( wrapMode );
setVerticalWrapMode( wrapMode );
@ -37,9 +37,9 @@ namespace
};
private:
static inline QSGTexture::WrapMode wrapMode( QskGradient::Spread spread )
static inline QSGTexture::WrapMode wrapMode( QskGradient::SpreadMode spreadMode )
{
switch ( spread )
switch ( spreadMode )
{
case QskGradient::RepeatSpread:
return QSGTexture::Repeat;
@ -58,17 +58,17 @@ namespace
public:
inline bool operator==( const HashKey& other ) const
{
return rhi == other.rhi && spread == other.spread && stops == other.stops;
return rhi == other.rhi && spreadMode == other.spreadMode && stops == other.stops;
}
const void* rhi;
const QskGradientStops stops;
const QskGradient::Spread spread;
const QskGradient::SpreadMode spreadMode;
};
inline size_t qHash( const HashKey& key, size_t seed = 0 )
{
size_t values = seed + key.spread;
size_t values = seed + key.spreadMode;
for ( const auto& stop : key.stops )
values += stop.rgb();
@ -84,7 +84,7 @@ namespace
void cleanupRhi( const QRhi* );
Texture* texture( const void* rhi,
const QskGradientStops&, QskGradient::Spread );
const QskGradientStops&, QskGradient::SpreadMode );
private:
QHash< HashKey, Texture* > m_hashTable;
@ -107,14 +107,14 @@ static void qskCleanupRhi( const QRhi* rhi )
}
Texture* Cache::texture( const void* rhi,
const QskGradientStops& stops, QskGradient::Spread spread )
const QskGradientStops& stops, QskGradient::SpreadMode spreadMode )
{
const HashKey key { rhi, stops, spread };
const HashKey key { rhi, stops, spreadMode };
auto texture = m_hashTable[key];
if ( texture == nullptr )
{
texture = new Texture( stops, spread );
texture = new Texture( stops, spreadMode );
m_hashTable[ key ] = texture;
if ( rhi != nullptr )
@ -151,7 +151,7 @@ void Cache::cleanupRhi( const QRhi* rhi )
}
QSGTexture* QskColorRamp::texture( const void* rhi,
const QskGradientStops& stops, QskGradient::Spread spread )
const QskGradientStops& stops, QskGradient::SpreadMode spreadMode )
{
if ( s_cache == nullptr )
{
@ -166,5 +166,5 @@ QSGTexture* QskColorRamp::texture( const void* rhi,
qAddPostRoutine( qskCleanupCache );
}
return s_cache->texture( rhi, stops, spread );
return s_cache->texture( rhi, stops, spreadMode );
}

3
src/nodes/QskColorRamp.h
View File

@ -13,7 +13,8 @@ class QSGTexture;
namespace QskColorRamp
{
QSGTexture* texture( const void* rhi, const QskGradientStops&, QskGradient::Spread );
QSGTexture* texture( const void* rhi,
const QskGradientStops&, QskGradient::SpreadMode );
}
#endif

18
src/nodes/QskGradientMaterial.cpp
View File

@ -52,7 +52,7 @@ namespace
{
const auto mat = static_cast< const GradientMaterial* >( other );
if ( ( spread() == mat->spread() ) && ( stops() == mat->stops() ) )
if ( ( spreadMode() == mat->spreadMode() ) && ( stops() == mat->stops() ) )
return 0;
return QSGMaterial::compare( other );
@ -107,7 +107,7 @@ namespace
updateUniformValues( material );
auto texture = QskColorRamp::texture(
nullptr, material->stops(), material->spread() );
nullptr, material->stops(), material->spreadMode() );
texture->bind();
}
@ -146,7 +146,7 @@ namespace
auto material = static_cast< const GradientMaterial* >( newMaterial );
auto texture = QskColorRamp::texture(
state.rhi(), material->stops(), material->spread() );
state.rhi(), material->stops(), material->spreadMode() );
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
texture->updateRhiTexture( state.rhi(), state.resourceUpdateBatch() );
@ -186,9 +186,9 @@ namespace
the number of color ramps. TODO ...
*/
if ( gradient.spread() != spread() )
if ( gradient.spreadMode() != spreadMode() )
{
setSpread( gradient.spread() );
setSpreadMode( gradient.spreadMode() );
changed = true;
}
@ -347,9 +347,9 @@ namespace
changed = true;
}
if ( gradient.spread() != spread() )
if ( gradient.spreadMode() != spreadMode() )
{
setSpread( gradient.spread() );
setSpreadMode( gradient.spreadMode() );
changed = true;
}
@ -518,9 +518,9 @@ namespace
changed = true;
}
if ( gradient.spread() != spread() )
if ( gradient.spreadMode() != spreadMode() )
{
setSpread( gradient.spread() );
setSpreadMode( gradient.spreadMode() );
changed = true;
}

14
src/nodes/QskGradientMaterial.h
View File

@ -19,19 +19,19 @@ class QSK_EXPORT QskGradientMaterial : public QSGMaterial
QskGradient::Type gradientType() const;
const QskGradientStops& stops() const;
QskGradient::Spread spread() const;
QskGradient::SpreadMode spreadMode() const;
protected:
QskGradientMaterial( QskGradient::Type );
void setStops( const QskGradientStops& );
void setSpread( QskGradient::Spread );
void setSpreadMode( QskGradient::SpreadMode );
private:
const QskGradient::Type m_gradientType;
QskGradientStops m_stops;
QskGradient::Spread m_spread = QskGradient::PadSpread;
QskGradient::SpreadMode m_spreadMode = QskGradient::PadSpread;
};
inline QskGradient::Type QskGradientMaterial::gradientType() const
@ -44,9 +44,9 @@ inline void QskGradientMaterial::setStops( const QskGradientStops& stops )
m_stops = stops;
}
inline void QskGradientMaterial::setSpread( QskGradient::Spread spread )
inline void QskGradientMaterial::setSpreadMode( QskGradient::SpreadMode spreadMode )
{
m_spread = spread;
m_spreadMode = spreadMode;
}
inline const QskGradientStops& QskGradientMaterial::stops() const
@ -54,9 +54,9 @@ inline const QskGradientStops& QskGradientMaterial::stops() const
return m_stops;
}
inline QskGradient::Spread QskGradientMaterial::spread() const
inline QskGradient::SpreadMode QskGradientMaterial::spreadMode() const
{
return m_spread;
return m_spreadMode;
}
#endif