Skip to content

Commit da0b7d7

Browse files
committed
CurvesPrimitiveEvaluatorTest : Remove reliance on IECoreGL
Tests shouldn't have dependencies on other modules. We also weren't actually passing `visualTest = True` anywhere anyway, so the code was unused.
1 parent b3d358b commit da0b7d7

File tree

1 file changed

+11
-39
lines changed

1 file changed

+11
-39
lines changed

test/IECoreScene/CurvesPrimitiveEvaluatorTest.py

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
class CurvesPrimitiveEvaluatorTest( unittest.TestCase ) :
5151

52-
def runPointAtVTest( self, curvesPrimitive, expectedPositions=None, expectedLengths=None, visualTest=False, printPoints=False ) :
52+
def runPointAtVTest( self, curvesPrimitive, expectedPositions=None, expectedLengths=None, printPoints=False ) :
5353

5454
e = IECoreScene.CurvesPrimitiveEvaluator( curvesPrimitive )
5555
r = e.createResult()
@@ -84,34 +84,6 @@ def runPointAtVTest( self, curvesPrimitive, expectedPositions=None, expectedLeng
8484

8585
print( repr( p ).replace( "),", "),\n" ) )
8686

87-
if visualTest :
88-
89-
import IECoreGL
90-
IECoreGL.init( False )
91-
92-
r = IECoreGL.Renderer()
93-
r.setOption( "gl:mode", IECore.StringData( "deferred" ) )
94-
95-
pointsPrimitive = IECoreScene.PointsPrimitive( p )
96-
pointsPrimitive["constantwidth"] = IECoreScene.PrimitiveVariable( IECoreScene.PrimitiveVariable.Interpolation.Constant, IECore.FloatData( 0.1 ) )
97-
98-
with IECoreScene.WorldBlock( r ) :
99-
100-
w = IECoreGL.SceneViewer( "scene", r.scene() )
101-
102-
with IECoreScene.AttributeBlock( r ) :
103-
104-
r.shader( "surface", "red", { "gl:fragmentSource" : IECore.StringData( "void main() { gl_FragColor = vec4( 1, 0, 0, 1 ); }" ) } )
105-
r.setAttribute( "gl:curvesPrimitive:useGLLines", IECore.BoolData( True ) )
106-
curvesPrimitive.render( r )
107-
108-
with IECoreScene.AttributeBlock( r ) :
109-
110-
r.shader( "surface", "blue", { "gl:fragmentSource" : IECore.StringData( "void main() { gl_FragColor = vec4( 0, 0, 1, 1 ); }" ) } )
111-
pointsPrimitive.render( r )
112-
113-
w.start()
114-
11587
def testLinearSubsetLength( self ) :
11688

11789
pts = IECore.V3fVectorData()
@@ -267,7 +239,7 @@ def test3SegmentBSpline( self ) :
267239

268240
lengths = IECore.FloatVectorData( [ 2.2106194496154785 ] )
269241

270-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
242+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
271243

272244
def test3SegmentBSplineDoubledEndpoints( self ) :
273245

@@ -345,7 +317,7 @@ def test3SegmentBSplineDoubledEndpoints( self ) :
345317

346318
lengths = IECore.FloatVectorData( [ 3.61808 ] )
347319

348-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
320+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
349321

350322
def test2Curve3SegmentBSpline( self ) :
351323

@@ -478,7 +450,7 @@ def test2Curve3SegmentBSpline( self ) :
478450

479451
lengths = IECore.FloatVectorData( [ 2.2106194496154785, 2.2106194496154785 ] )
480452

481-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
453+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
482454

483455
def testPeriodicBSpline( self ) :
484456

@@ -553,7 +525,7 @@ def testPeriodicBSpline( self ) :
553525

554526
lengths = IECore.FloatVectorData( [ 2.917539119 ] )
555527

556-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
528+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
557529

558530
def test2CurvePeriodicBSpline( self ) :
559531

@@ -682,7 +654,7 @@ def test2CurvePeriodicBSpline( self ) :
682654

683655
lengths = IECore.FloatVectorData( [ 2.917539119, 2.917539119 ] )
684656

685-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
657+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
686658

687659
def test3SegmentLinear( self ) :
688660

@@ -757,7 +729,7 @@ def test3SegmentLinear( self ) :
757729

758730
lengths = IECore.FloatVectorData( [ 5.0 ] )
759731

760-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
732+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
761733

762734
def test3SegmentLinearDoubledEndpoints( self ) :
763735

@@ -835,7 +807,7 @@ def test3SegmentLinearDoubledEndpoints( self ) :
835807

836808
lengths = IECore.FloatVectorData( [ 5.0 ] )
837809

838-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
810+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
839811

840812
def test2Curve3SegmentLinear( self ) :
841813

@@ -967,7 +939,7 @@ def test2Curve3SegmentLinear( self ) :
967939

968940
lengths = IECore.FloatVectorData( [ 5.0, 5.0 ] )
969941

970-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
942+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
971943

972944
def test3SegmentPeriodicLinear( self ) :
973945

@@ -1042,7 +1014,7 @@ def test3SegmentPeriodicLinear( self ) :
10421014

10431015
lengths = IECore.FloatVectorData( [ 7.23606777 ] )
10441016

1045-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
1017+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
10461018

10471019
def test2Curve3SegmentPeriodicLinear( self ) :
10481020

@@ -1173,7 +1145,7 @@ def test2Curve3SegmentPeriodicLinear( self ) :
11731145

11741146
lengths = IECore.FloatVectorData( [ 7.23606777, 7.23606777 ] )
11751147

1176-
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, visualTest=False, printPoints=False )
1148+
self.runPointAtVTest( c, expectedPositions=expected, expectedLengths=lengths, printPoints=False )
11771149

11781150
def testClosestPoint( self ) :
11791151

0 commit comments

Comments
 (0)