Skip to content

CurvesPrimitiveEvaluator : Fix build on macOS #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaddon merged 1 commit into from
Dec 10, 2025
Merged

CurvesPrimitiveEvaluator : Fix build on macOS #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/IECoreScene/CurvesPrimitiveEvaluator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class IECORESCENE_API CurvesPrimitiveEvaluator : public PrimitiveEvaluator

typedef void (Result::*InitFunction)( unsigned curveIndex, float v, const CurvesPrimitiveEvaluator *evaluator );

template<bool linear, bool periodic>
template<bool Linear, bool Periodic>
void init( unsigned curveIndex, float v, const CurvesPrimitiveEvaluator *evaluator );

template<typename T>
Expand Down
14 changes: 7 additions & 7 deletions src/IECoreScene/CurvesPrimitiveEvaluator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ half CurvesPrimitiveEvaluator::Result::halfPrimVar( const PrimitiveVariable &pv
return primVar<half>( pv, m_coefficients.data() );
}

template<bool linear, bool periodic>
template<bool Linear, bool Periodic>
void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const CurvesPrimitiveEvaluator *evaluator )
{
m_curveIndex = curveIndex;
Expand All @@ -251,9 +251,9 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const
const CubicBasisf &basis = evaluator->m_curvesPrimitive->basis();

unsigned numSegments = 0;
if( linear )
if( Linear )
{
if( periodic )
if( Periodic )
{
numSegments = numVertices;
}
Expand All @@ -264,7 +264,7 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const
}
else
{
if( periodic )
if( Periodic )
{
numSegments = numVertices / basis.step;
}
Expand All @@ -281,14 +281,14 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const
unsigned o = evaluator->m_vertexDataOffsets[m_curveIndex];
unsigned i = segment * basis.step;

if( linear )
if( Linear )
{
m_coefficients[0] = 1.0f - m_segmentV;
m_coefficients[1] = m_segmentV;
m_derivativeCoefficients[0] = -1.0f;
m_derivativeCoefficients[1] = 1.0f;
m_vertexDataIndices[0] = m_varyingDataIndices[0] = o + i;
if( periodic )
if( Periodic )
{
m_vertexDataIndices[1] = m_varyingDataIndices[1] = o + ( ( i + 1 ) % numVertices );
}
Expand All @@ -302,7 +302,7 @@ void CurvesPrimitiveEvaluator::Result::init( unsigned curveIndex, float v, const
basis.coefficients( m_segmentV, m_coefficients.data() );
basis.derivativeCoefficients( m_segmentV, m_derivativeCoefficients.data() );

if( periodic )
if( Periodic )
{
m_vertexDataIndices[0] = o + i;
m_vertexDataIndices[1] = o + ( ( i + 1 ) % numVertices );
Expand Down