using QskLinesNode in the dials example

playground/dials/DialSkinlet.cpp

@@ -11,73 +11,14 @@
 #include <QskBoxShapeMetrics.h>
 #include <QskTextColors.h>
 #include <QskTextOptions.h>
+#include <QskLinesNode.h>
 #include <QskFunctions.h>
+#include <QskSGNode.h>
 
 #include <QFontMetrics>
 #include <QLineF>
-#include <QSGFlatColorMaterial>
-#include <QSGGeometryNode>
 #include <QtMath>
 
-namespace
-{
-    class LinesNode : public QSGGeometryNode
-    {
-      public:
-        LinesNode( int lineCount = 0 )
-            : m_geometry( QSGGeometry::defaultAttributes_Point2D(), 2 * lineCount )
-        {
-            m_geometry.setDrawingMode( QSGGeometry::DrawLines );
-            m_geometry.setVertexDataPattern( QSGGeometry::StaticPattern );
-
-            setGeometry( &m_geometry );
-            setMaterial( &m_material );
-        }
-
-        void setColor( const QColor& color )
-        {
-            if ( color != m_material.color() )
-            {
-                m_material.setColor( color );
-                markDirty( QSGNode::DirtyMaterial );
-            }
-        }
-
-      private:
-        QSGFlatColorMaterial m_material;
-        QSGGeometry m_geometry;
-    };
-
-    class TicksNode : public LinesNode
-    {
-      public:
-        TicksNode()
-        {
-        }
-    };
-
-    class NeedleNode : public LinesNode
-    {
-      public:
-        NeedleNode()
-            : LinesNode( 1 )
-        {
-        }
-
-        void setData( const QLineF& line, qreal width )
-        {
-            auto vertexData = geometry()->vertexDataAsPoint2D();
-            vertexData[ 0 ].set( line.x1(), line.y1() );
-            vertexData[ 1 ].set( line.x2(), line.y2() );
-
-            geometry()->setLineWidth( width );
-            geometry()->markVertexDataDirty();
-
-            markDirty( QSGNode::DirtyGeometry );
-        }
-    };
-}
-
 DialSkinlet::DialSkinlet( QskSkin* skin )
     : QskSkinlet( skin )
 {
@@ -141,22 +82,14 @@ QSGNode* DialSkinlet::updateLabelsNode(
     if ( labels.count() <= 1 )
         return nullptr;
 
-    auto ticksNode = static_cast< TicksNode* >( node );
+    auto ticksNode = QskSGNode::ensureNode< QskLinesNode >( node );
-    if ( ticksNode == nullptr )
-        ticksNode = new TicksNode();
 
     const auto color = dial->color( Q::TickLabels );
-    ticksNode->setColor( color );
 
     const auto startAngle = dial->minimum();
     const auto endAngle = dial->maximum();
     const auto step = ( endAngle - startAngle ) / ( labels.count() - 1 );
 
-    auto geometry = ticksNode->geometry();
-    geometry->allocate( labels.count() * 2 );
-
-    auto vertexData = geometry->vertexDataAsPoint2D();
-
     auto scaleRect = this->scaleRect( dial );
 
     const auto center = scaleRect.center();
@@ -175,6 +108,7 @@ QSGNode* DialSkinlet::updateLabelsNode(
     // Create a series of tickmarks from minimum to maximum
 
     auto labelNode = ticksNode->firstChild();
+    QVector< QLineF > ticks;
 
     for ( int i = 0; i < labels.count(); ++i, angle += step )
     {
@@ -187,10 +121,7 @@ QSGNode* DialSkinlet::updateLabelsNode(
         const auto xEnd = center.x() + needleRadius * cos;
         const auto yEnd = center.y() + needleRadius * sin;
 
-        vertexData[ 0 ].set( xStart, yStart );
+        ticks += QLineF( xStart, yStart, xEnd, yEnd );
-        vertexData[ 1 ].set( xEnd, yEnd );
-
-        vertexData += 2;
 
         const auto& text = labels.at( i );
 
@@ -220,10 +151,7 @@ QSGNode* DialSkinlet::updateLabelsNode(
         }
     }
 
-    geometry->setLineWidth( tickSize.width() );
+    ticksNode->updateLines( color, tickSize.width(), ticks );
-    geometry->markVertexDataDirty();
-
-    ticksNode->markDirty( QSGNode::DirtyGeometry );
 
     return ticksNode;
 }
@@ -233,15 +161,13 @@ QSGNode* DialSkinlet::updateNeedleNode(
 {
     using Q = Dial;
 
-    auto needleNode = static_cast< NeedleNode* >( node );
+    const auto color = dial->color( Q::Needle );
-    if ( needleNode == nullptr )
-        needleNode = new NeedleNode();
-
-    const auto line = needlePoints( dial );
     const auto width = dial->metric( Q::Needle | QskAspect::Size );
 
-    needleNode->setData( line, width * 2 );
+    const auto line = needlePoints( dial );
-    needleNode->setColor( dial->color( Q::Needle ) );
+
+    auto needleNode = QskSGNode::ensureNode< QskLinesNode >( node );
+    needleNode->updateLine( color, width * 2, line.p1(), line.p2() );
 
     return needleNode;
 }

src/nodes/QskLinesNode.cpp

@@ -233,6 +233,12 @@ void QskLinesNode::updateRect( const QColor& color,
         rect, { rect.left(), rect.right() }, { rect.top(), rect.bottom() } );
 }
 
+void QskLinesNode::updateLine( const QColor& color,
+    qreal lineWidth, const QPointF& p1, const QPointF& p2 )
+{
+    updateLine( color, lineWidth, QskStippleMetrics(), QTransform(), p1, p2 );
+}
+
 void QskLinesNode::updateLine( const QColor& color,
     qreal lineWidth, const QskStippleMetrics& stippleMetrics,
     const QTransform& transform, const QPointF& p1, const QPointF& p2 )
@@ -248,6 +254,13 @@ void QskLinesNode::updateLine( const QColor& color,
     }
 }
 
+void QskLinesNode::updateLines( const QColor& color,
+    qreal lineWidth, const QVector< QLineF >& lines )
+{
+    updateLines( color, lineWidth, QskStippleMetrics(),
+        QTransform(), lines.count(), lines.constData() );
+}
+
 void QskLinesNode::updateLines( const QColor& color,
     qreal lineWidth, const QskStippleMetrics& stippleMetrics,
     const QTransform& transform, const QVector< QLineF >& lines )

src/nodes/QskLinesNode.h

@@ -41,10 +41,15 @@ class QSK_EXPORT QskLinesNode : public QSGGeometryNode
     void updateRect( const QColor&, qreal lineWidth,
         const QskStippleMetrics&, const QTransform&, const QRectF& );
 
+    void updateLine( const QColor&, qreal lineWidth,
+        const QPointF&, const QPointF& );
+
     void updateLine( const QColor&, qreal lineWidth,
         const QskStippleMetrics&, const QTransform&,
         const QPointF&, const QPointF& );
 
+    void updateLines( const QColor&, qreal lineWidth, const QVector< QLineF >& );
+
     void updateLines( const QColor&, qreal lineWidth,
         const QskStippleMetrics&, const QTransform&, const QVector< QLineF >& );