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

irrelevant micro optimzation removed, that was using the wrong corner

Browse Source 
iteration
This commit is contained in:
Uwe Rathmann 2023-02-14 09:29:51 +01:00
parent 31feeff9aa
commit b8f198a97a
2 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/nodes/QskBoxBasicStroker.cpp
View File

@ -283,65 +283,31 @@ static inline void qskCreateFill(
}
}
}
else if ( m_metrics.stepSymmetries )
{
auto line = lines;
if ( isHorizontal )
{
int stepCount = qMax( cn[TopLeftCorner].stepCount, cn[BottomLeftCorner].stepCount );
for ( ArcIterator it( stepCount, true ); !it.isDone(); ++it )
map.setVLine( TopLeftCorner, BottomLeftCorner, it.cos(), it.sin(), line++ );
stepCount = qMax( cn[TopRightCorner].stepCount, cn[BottomRightCorner].stepCount );
for ( ArcIterator it( stepCount, false ); !it.isDone(); ++it )
map.setVLine( TopRightCorner, BottomRightCorner, it.cos(), it.sin(), line++ );
}
else
{
int stepCount = qMax( cn[TopLeftCorner].stepCount, cn[TopRightCorner].stepCount );
for ( ArcIterator it( stepCount, false ); !it.isDone(); ++it )
map.setHLine( TopLeftCorner, TopRightCorner, it.cos(), it.sin(), line++ );
stepCount = qMax( cn[BottomLeftCorner].stepCount, cn[BottomRightCorner].stepCount );
for ( ArcIterator it( stepCount, true ); !it.isDone(); ++it )
map.setHLine( BottomLeftCorner, BottomRightCorner, it.cos(), it.sin(), line++ );
}
}
else
{
/*
This fallback code creates the same points. The cases above are
simply micro oprimization reducing the loops or calculations
to get there.
*/
auto line = lines;
int stepCount;
if ( isHorizontal )
{
int stepCount = qMax( cn[TopLeftCorner].stepCount, cn[BottomLeftCorner].stepCount );
stepCount = m_metrics.innerStepCount( TopLeftCorner, BottomLeftCorner );
for ( ArcIterator it( stepCount, true ); !it.isDone(); ++it )
map.setLine( TopLeftCorner, BottomLeftCorner, it.cos(), it.sin(), line++ );
stepCount = qMax( cn[TopRightCorner].stepCount, cn[BottomRightCorner].stepCount );
stepCount = m_metrics.innerStepCount( TopRightCorner, BottomRightCorner );
for ( ArcIterator it( stepCount, false ); !it.isDone(); ++it )
map.setLine( TopRightCorner, BottomRightCorner, it.cos(), it.sin(), line++ );
}
else
{
int stepCount = qMax( cn[TopLeftCorner].stepCount, cn[TopRightCorner].stepCount );
stepCount = m_metrics.innerStepCount( TopLeftCorner, TopRightCorner );
for ( ArcIterator it( stepCount, false ); !it.isDone(); ++it )
map.setLine( TopLeftCorner, TopRightCorner, it.cos(), it.sin(), line++ );
stepCount = qMax( cn[BottomLeftCorner].stepCount, cn[BottomRightCorner].stepCount );
stepCount = m_metrics.innerStepCount( BottomLeftCorner, BottomRightCorner );
for ( ArcIterator it( stepCount, true ); !it.isDone(); ++it )
map.setLine( BottomLeftCorner, BottomRightCorner, it.cos(), it.sin(), line++ );

7
src/nodes/QskBoxMetrics.h
View File

@ -7,6 +7,7 @@
#define QSK_BOX_METRICS_H
#include <qrect.h>
#include <qglobal.h>
#include <qnamespace.h>
class QskBoxShapeMetrics;
@ -24,6 +25,12 @@ class QskBoxMetrics
int outerStepCount() const;
int innerStepCount() const;
int innerStepCount( int corner1, int corner2 ) const
{
return qMax( corners[ corner1 ].innerStepCount(),
corners[ corner2 ].innerStepCount() );
}
struct Corner
{
inline qreal xInner( qreal cos ) const