Skip to content

Commit d18dea8

Browse files
donboiedonboie
committed
IECoreUSD : use imath
+ left the color3d / color4d functions commented out as I think it's useful to document they're not supported. + added a dodgy import into the test entry file All.py as we have to import IECore *before* imath to avoid type errors as mentioned in ImageEngine#672
1 parent 7041556 commit d18dea8

File tree

4 files changed

+77
-73
lines changed

4 files changed

+77
-73
lines changed

‎contrib/IECoreUSD/src/IECoreUSD/USDScene.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -704,14 +704,16 @@ static std::map<IECore::TypeId, std::function< ValueAndType ( const IECore::Data
704704
{ IECore::Color3fVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfVec3f, Imath::Color3<float>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color3fArray); } },
705705
{ IECore::Color3fDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfVec3f, Imath::Color3<float>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color3f); } },
706706

707-
{ IECore::Color3dVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfVec3d, Imath::Color3<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color3dArray); } },
708-
{ IECore::Color3dDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfVec3d, Imath::Color3<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color3d); } },
707+
// cortex & Imath python bindings don't support C3d
708+
//{ IECore::Color3dVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfVec3d, Imath::Color3<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color3dArray); } },
709+
//{ IECore::Color3dDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfVec3d, Imath::Color3<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color3d); } },
709710

710711
{ IECore::Color4fVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfVec4f, Imath::Color4<float>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color4fArray); } },
711712
{ IECore::Color4fDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfVec4f, Imath::Color4<float>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color4f); } },
712713

713-
{ IECore::Color4dVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfVec4d, Imath::Color4<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color4dArray); } },
714-
{ IECore::Color4dDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfVec4d, Imath::Color4<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color4d); } },
714+
// cortex & Imath python bindings don't support C4d
715+
//{ IECore::Color4dVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfVec4d, Imath::Color4<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color4dArray); } },
716+
//{ IECore::Color4dDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfVec4d, Imath::Color4<double>, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Color4d); } },
715717

716718
{ IECore::QuatfVectorDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSDArray<pxr::GfQuatf, Imath::Quatf, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->QuatfArray); } },
717719
{ IECore::QuatfDataTypeId, [] ( const IECore::Data *data ) -> ValueAndType { return std::make_pair ( ToUSD<pxr::GfQuatf, Imath::Quatf, IECore::TypedData> ().doConversion(data) , pxr::SdfValueTypeNames->Quatf); } },
@@ -750,19 +752,19 @@ static std::map<pxr::TfToken, std::function<IECore::DataPtr ( const pxr::VtValue
750752

751753
{ pxr::TfToken( "color3h" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color3h"); } },
752754
{ pxr::TfToken( "color3f" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedScalarConverter<Imath::Color3f, pxr::GfVec3f, IECore::TypedData>().doConversion( value ); } },
753-
{ pxr::TfToken( "color3d" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedScalarConverter<Imath::Color3<double>, pxr::GfVec3d, IECore::TypedData>().doConversion( value ); } },
755+
{ pxr::TfToken( "color3d" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color3d"); } },
754756

755757
{ pxr::TfToken( "color3h[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color3h[]"); } },
756758
{ pxr::TfToken( "color3f[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedArrayConverter<Imath::Color3f, pxr::GfVec3f, IECore::TypedData>().doConversion( value ); } },
757-
{ pxr::TfToken( "color3d[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedArrayConverter<Imath::Color3<double>, pxr::GfVec3d, IECore::TypedData>().doConversion( value ); } },
759+
{ pxr::TfToken( "color3d[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color3d[]"); } },
758760

759761
{ pxr::TfToken( "color4h" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color4h");} } ,
760762
{ pxr::TfToken( "color4f" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedScalarConverter<Imath::Color4f, pxr::GfVec4f, IECore::TypedData>().doConversion( value ); } },
761-
{ pxr::TfToken( "color4d" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedScalarConverter<Imath::Color4<double>, pxr::GfVec4d, IECore::TypedData>().doConversion( value ); } },
763+
{ pxr::TfToken( "color4d" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color4d"); } },
762764

763765
{ pxr::TfToken( "color4h[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color4h[]"); } },
764766
{ pxr::TfToken( "color4f[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedArrayConverter<Imath::Color4f, pxr::GfVec4f, IECore::TypedData>().doConversion( value ); } },
765-
{ pxr::TfToken( "color4d[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedArrayConverter<Imath::Color4<double>, pxr::GfVec4d, IECore::TypedData>().doConversion( value ); } },
767+
{ pxr::TfToken( "color4d[]" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("color4d[]"); } },
766768

767769
{ pxr::TfToken( "half" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { return TypedScalarConverter<half, pxr::GfHalf, IECore::TypedData >().doConversion( value ); } },
768770
{ pxr::TfToken( "half2" ), []( const pxr::VtValue& value ) -> IECore::DataPtr { throw IECore::NotImplementedException("half2"); } },

‎contrib/IECoreUSD/test/IECoreUSD/All.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import unittest
3636
import sys
3737

38+
import IECore
39+
3840
from USDSceneTest import USDSceneTest
3941
from USDSceneWriterTest import USDSceneWriterTest
4042

41-
import IECore
42-
4343
unittest.TestProgram(
4444
testRunner = unittest.TextTestRunner(
4545
stream = IECore.CompoundStream(

‎contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -203,24 +203,24 @@ def testPrimVarTypes ( self ) :
203203

204204
expected = {
205205
'test_Bool_Scalar_constant' : IECore.BoolData( 0 ),
206-
'test_Double2_Array_constant' : IECore.V2dVectorData( [IECore.V2d( 1.1, 1.2 ), IECore.V2d( 2.1, 2.2 ), IECore.V2d( 3.1, 3.2 )] ),
207-
'test_Double2_Scalar_constant' : IECore.V2dData( IECore.V2d( 0.1, 0.2 ) ),
208-
'test_Double3_Array_constant' : IECore.V3dVectorData( [IECore.V3d( 1.1, 1.2, 1.3 ), IECore.V3d( 2.1, 2.2, 2.3 ), IECore.V3d( 3.1, 3.2, 3.3 )] ),
209-
'test_Double3_Scalar_constant' : IECore.V3dData( IECore.V3d( 0.1, 0.2, 0.3 ) ),
206+
'test_Double2_Array_constant' : IECore.V2dVectorData( [imath.V2d( 1.1, 1.2 ), imath.V2d( 2.1, 2.2 ), imath.V2d( 3.1, 3.2 )] ),
207+
'test_Double2_Scalar_constant' : IECore.V2dData( imath.V2d( 0.1, 0.2 ) ),
208+
'test_Double3_Array_constant' : IECore.V3dVectorData( [imath.V3d( 1.1, 1.2, 1.3 ), imath.V3d( 2.1, 2.2, 2.3 ), imath.V3d( 3.1, 3.2, 3.3 )] ),
209+
'test_Double3_Scalar_constant' : IECore.V3dData( imath.V3d( 0.1, 0.2, 0.3 ) ),
210210
'test_Double_Array_constant' : IECore.DoubleVectorData([1.2, 1.3, 1.4]),
211211
'test_Double_Scalar_constant' : IECore.DoubleData( 1.1 ),
212-
'test_Float2_Array_constant' : IECore.V2fVectorData( [IECore.V2f( 1.1, 1.2 ), IECore.V2f( 2.1, 2.2 ), IECore.V2f( 3.1, 3.2 )] ),
213-
'test_Float2_Scalar_constant' : IECore.V2fData( IECore.V2f( 0.1, 0.2 ) ),
214-
'test_Float3_Array_constant' : IECore.V3fVectorData( [IECore.V3f( 1.1, 1.2, 1.3 ), IECore.V3f( 2.1, 2.2, 2.3 ), IECore.V3f( 3.1, 3.2, 3.3 )] ),
215-
'test_Float3_Scalar_constant' : IECore.V3fData( IECore.V3f( 0.1, 0.2, 0.3 ) ),
212+
'test_Float2_Array_constant' : IECore.V2fVectorData( [imath.V2f( 1.1, 1.2 ), imath.V2f( 2.1, 2.2 ), imath.V2f( 3.1, 3.2 )] ),
213+
'test_Float2_Scalar_constant' : IECore.V2fData( imath.V2f( 0.1, 0.2 ) ),
214+
'test_Float3_Array_constant' : IECore.V3fVectorData( [imath.V3f( 1.1, 1.2, 1.3 ), imath.V3f( 2.1, 2.2, 2.3 ), imath.V3f( 3.1, 3.2, 3.3 )] ),
215+
'test_Float3_Scalar_constant' : IECore.V3fData( imath.V3f( 0.1, 0.2, 0.3 ) ),
216216
'test_Float_Array_constant' : IECore.FloatVectorData( [0.7, 0.8, 0.9] ),
217217
'test_Float_Scalar_constant' : IECore.FloatData( 0.6 ),
218218
'test_Half_Array_constant' : IECore.HalfVectorData( [0.0999756, 0.199951, 0.300049] ),
219219
'test_Half_Scalar_constant' : IECore.HalfData( 0.5 ),
220-
'test_Int2_Array_constant' : IECore.V2iVectorData( [IECore.V2i( 3, 4 ), IECore.V2i( 5, 6 ), IECore.V2i( 7, 8 )] ),
221-
'test_Int2_Scalar_constant' : IECore.V2iData( IECore.V2i( 1, 2 ) ),
222-
'test_Int3_Array_constant' : IECore.V3iVectorData([IECore.V3i(3, 4, 5), IECore.V3i(5, 6, 7), IECore.V3i(7, 8, 9)]),
223-
'test_Int3_Scalar_constant' : IECore.V3iData(IECore.V3i(1, 2, 3)),
220+
'test_Int2_Array_constant' : IECore.V2iVectorData( [imath.V2i( 3, 4 ), imath.V2i( 5, 6 ), imath.V2i( 7, 8 )] ),
221+
'test_Int2_Scalar_constant' : IECore.V2iData( imath.V2i( 1, 2 ) ),
222+
'test_Int3_Array_constant' : IECore.V3iVectorData([imath.V3i(3, 4, 5), imath.V3i(5, 6, 7), imath.V3i(7, 8, 9)]),
223+
'test_Int3_Scalar_constant' : IECore.V3iData(imath.V3i(1, 2, 3)),
224224
'test_Int64_Array_constant' : IECore.Int64VectorData([9223372036854775805, 9223372036854775806, 9223372036854775807]),
225225
'test_Int64_Scalar_constant' : IECore.Int64Data(-9223372036854775808),
226226
'test_Int_Array_constant' : IECore.IntVectorData([0, -1, -2]),
@@ -235,46 +235,46 @@ def testPrimVarTypes ( self ) :
235235
'test_UInt64_Scalar_constant' : IECore.UInt64Data(18446744073709551615),
236236
'test_UInt_Array_constant' : IECore.UIntVectorData([4294967293, 4294967294, 4294967295]),
237237
'test_UInt_Scalar_constant' : IECore.UIntData(4294967295),
238-
'test_color3d_Array_constant' : IECore.Color3dVectorData([IECore.Color3d(1.1, 1.2, 1.3), IECore.Color3d(2.1, 2.2, 2.3), IECore.Color3d(3.1, 3.2, 3.3)]),
239-
'test_color3d_Scalar_constant' : IECore.Color3dData(IECore.Color3d(0.1, 0.2, 0.3)),
240-
'test_color3f_Array_constant' : IECore.Color3fVectorData([IECore.Color3f(1.1, 1.2, 1.3), IECore.Color3f(2.1, 2.2, 2.3), IECore.Color3f(3.1, 3.2, 3.3)]),
241-
'test_color3f_Scalar_constant' : IECore.Color3fData(IECore.Color3f(0.1, 0.2, 0.3)),
242-
'test_color4d_Array_constant' : IECore.Color4dVectorData([IECore.Color4d(1.1, 1.2, 1.3, 1.4), IECore.Color4d(2.1, 2.2, 2.3, 2.4), IECore.Color4d(3.1, 3.2, 3.3, 3.4)]),
243-
'test_color4d_Scalar_constant' : IECore.Color4dData(IECore.Color4d(0.1, 0.2, 0.3, 0.4)),
244-
'test_color4f_Array_constant' : IECore.Color4fVectorData([IECore.Color4f(1.1, 1.2, 1.3, 1.4), IECore.Color4f(2.1, 2.2, 2.3, 2.4), IECore.Color4f(3.1, 3.2, 3.3, 3.4)]),
245-
'test_color4f_Scalar_constant' : IECore.Color4fData(IECore.Color4f(0.1, 0.2, 0.3, 0.4)),
238+
#'test_color3d_Array_constant' : IECore.Color3dVectorData([IECore.Color3d(1.1, 1.2, 1.3), IECore.Color3d(2.1, 2.2, 2.3), IECore.Color3d(3.1, 3.2, 3.3)]),
239+
#'test_color3d_Scalar_constant' : IECore.Color3dData(IECore.Color3d(0.1, 0.2, 0.3)),
240+
'test_color3f_Array_constant' : IECore.Color3fVectorData([imath.Color3f(1.1, 1.2, 1.3), imath.Color3f(2.1, 2.2, 2.3), imath.Color3f(3.1, 3.2, 3.3)]),
241+
'test_color3f_Scalar_constant' : IECore.Color3fData(imath.Color3f(0.1, 0.2, 0.3)),
242+
#'test_color4d_Array_constant' : IECore.Color4dVectorData([IECore.Color4d(1.1, 1.2, 1.3, 1.4), IECore.Color4d(2.1, 2.2, 2.3, 2.4), IECore.Color4d(3.1, 3.2, 3.3, 3.4)]),
243+
#'test_color4d_Scalar_constant' : IECore.Color4dData(IECore.Color4d(0.1, 0.2, 0.3, 0.4)),
244+
'test_color4f_Array_constant' : IECore.Color4fVectorData([imath.Color4f(1.1, 1.2, 1.3, 1.4), imath.Color4f(2.1, 2.2, 2.3, 2.4), imath.Color4f(3.1, 3.2, 3.3, 3.4)]),
245+
'test_color4f_Scalar_constant' : IECore.Color4fData(imath.Color4f(0.1, 0.2, 0.3, 0.4)),
246246
'test_matrix3d_Array_constant' : IECore.M33dVectorData(
247247
[
248-
IECore.M33d(0, 0, 0, 0, 1, 0,0, 0, 0),
249-
IECore.M33d(0, 0, 0, 0, 0, 0,0, 0, 2),
250-
IECore.M33d(0, 0, 4, 0, 0, 0,0, 0, 0)
248+
imath.M33d(0, 0, 0, 0, 1, 0,0, 0, 0),
249+
imath.M33d(0, 0, 0, 0, 0, 0,0, 0, 2),
250+
imath.M33d(0, 0, 4, 0, 0, 0,0, 0, 0)
251251
]
252252
),
253-
'test_matrix3d_Scalar_constant' : IECore.M33dData(IECore.M33d(0, 0, 0, 0, 0, 0, 0, 0, 0)),
253+
'test_matrix3d_Scalar_constant' : IECore.M33dData(imath.M33d(0, 0, 0, 0, 0, 0, 0, 0, 0)),
254254
'test_matrix4d_Array_constant' : IECore.M44dVectorData(
255255
[
256-
IECore.M44d(1, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0),
257-
IECore.M44d(1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
258-
IECore.M44d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0)
256+
imath.M44d(1, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0),
257+
imath.M44d(1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
258+
imath.M44d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0)
259259
]
260260
),
261-
'test_matrix4d_Scalar_constant' : IECore.M44dData(IECore.M44d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)),
262-
'test_normal3d_Array_constant' : IECore.V3dVectorData([IECore.V3d( 1.1, 1.2, 1.3 ), IECore.V3d( 2.1, 2.2, 2.3 ), IECore.V3d( 3.1, 3.2, 3.3 )]),
263-
'test_normal3d_Scalar_constant' : IECore.V3dData (IECore.V3d( 0.1, 0.2, 0.3 )),
264-
'test_normal3f_Array_constant': IECore.V3fVectorData([IECore.V3f( 1.1, 1.2, 1.3 ), IECore.V3f( 2.1, 2.2, 2.3 ), IECore.V3f( 3.1, 3.2, 3.3 )]),
265-
'test_normal3f_Scalar_constant' : IECore.V3fData (IECore.V3f( 0.1, 0.2, 0.3 )),
266-
'test_point3d_Array_constant' : IECore.V3dVectorData([IECore.V3d( 1.1, 1.2, 1.3 ), IECore.V3d( 2.1, 2.2, 2.3 ), IECore.V3d( 3.1, 3.2, 3.3 )]),
267-
'test_point3d_Scalar_constant' : IECore.V3dData (IECore.V3d( 0.1, 0.2, 0.3 )),
268-
'test_point3f_Array_constant' : IECore.V3fVectorData([IECore.V3f( 1.1, 1.2, 1.3 ), IECore.V3f( 2.1, 2.2, 2.3 ), IECore.V3f( 3.1, 3.2, 3.3 )]),
269-
'test_point3f_Scalar_constant' : IECore.V3fData(IECore.V3f(0.1, 0.2, 0.3)),
270-
'test_quatd_Array_constant' : IECore.QuatdVectorData([IECore.Quatd(1, 0, 0, 0), IECore.Quatd(0, 1, 0, 0), IECore.Quatd(0, 0, 1, 0)]),
271-
'test_quatd_Scalar_constant' : IECore.QuatdData(IECore.Quatd(0, 0, 0, 1)),
272-
'test_quatf_Array_constant' : IECore.QuatfVectorData([IECore.Quatf(1, 0, 0, 0), IECore.Quatf(0, 1, 0, 0), IECore.Quatf(0, 0, 1, 0)]),
273-
'test_quatf_Scalar_constant' : IECore.QuatfData(IECore.Quatf(0, 0, 0, 1)),
274-
'test_vector3d_Array_constant' : IECore.V3dVectorData([IECore.V3d( 1.1, 1.2, 1.3 ), IECore.V3d( 2.1, 2.2, 2.3 ), IECore.V3d( 3.1, 3.2, 3.3 )]),
275-
'test_vector3d_Scalar_constant' : IECore.V3dData (IECore.V3d( 0.1, 0.2, 0.3 )),
276-
'test_vector3f_Array_constant' : IECore.V3fVectorData([IECore.V3f( 1.1, 1.2, 1.3 ), IECore.V3f( 2.1, 2.2, 2.3 ), IECore.V3f( 3.1, 3.2, 3.3 )]),
277-
'test_vector3f_Scalar_constant' : IECore.V3fData (IECore.V3f( 0.1, 0.2, 0.3 )),
261+
'test_matrix4d_Scalar_constant' : IECore.M44dData(imath.M44d(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)),
262+
'test_normal3d_Array_constant' : IECore.V3dVectorData([imath.V3d( 1.1, 1.2, 1.3 ), imath.V3d( 2.1, 2.2, 2.3 ), imath.V3d( 3.1, 3.2, 3.3 )]),
263+
'test_normal3d_Scalar_constant' : IECore.V3dData (imath.V3d( 0.1, 0.2, 0.3 )),
264+
'test_normal3f_Array_constant': IECore.V3fVectorData([imath.V3f( 1.1, 1.2, 1.3 ), imath.V3f( 2.1, 2.2, 2.3 ), imath.V3f( 3.1, 3.2, 3.3 )]),
265+
'test_normal3f_Scalar_constant' : IECore.V3fData (imath.V3f( 0.1, 0.2, 0.3 )),
266+
'test_point3d_Array_constant' : IECore.V3dVectorData([imath.V3d( 1.1, 1.2, 1.3 ), imath.V3d( 2.1, 2.2, 2.3 ), imath.V3d( 3.1, 3.2, 3.3 )]),
267+
'test_point3d_Scalar_constant' : IECore.V3dData (imath.V3d( 0.1, 0.2, 0.3 )),
268+
'test_point3f_Array_constant' : IECore.V3fVectorData([imath.V3f( 1.1, 1.2, 1.3 ), imath.V3f( 2.1, 2.2, 2.3 ), imath.V3f( 3.1, 3.2, 3.3 )]),
269+
'test_point3f_Scalar_constant' : IECore.V3fData(imath.V3f(0.1, 0.2, 0.3)),
270+
'test_quatd_Array_constant' : IECore.QuatdVectorData([imath.Quatd(1, 0, 0, 0), imath.Quatd(0, 1, 0, 0), imath.Quatd(0, 0, 1, 0)]),
271+
'test_quatd_Scalar_constant' : IECore.QuatdData(imath.Quatd(0, 0, 0, 1)),
272+
'test_quatf_Array_constant' : IECore.QuatfVectorData([imath.Quatf(1, 0, 0, 0), imath.Quatf(0, 1, 0, 0), imath.Quatf(0, 0, 1, 0)]),
273+
'test_quatf_Scalar_constant' : IECore.QuatfData(imath.Quatf(0, 0, 0, 1)),
274+
'test_vector3d_Array_constant' : IECore.V3dVectorData([imath.V3d( 1.1, 1.2, 1.3 ), imath.V3d( 2.1, 2.2, 2.3 ), imath.V3d( 3.1, 3.2, 3.3 )]),
275+
'test_vector3d_Scalar_constant' : IECore.V3dData (imath.V3d( 0.1, 0.2, 0.3 )),
276+
'test_vector3f_Array_constant' : IECore.V3fVectorData([imath.V3f( 1.1, 1.2, 1.3 ), imath.V3f( 2.1, 2.2, 2.3 ), imath.V3f( 3.1, 3.2, 3.3 )]),
277+
'test_vector3f_Scalar_constant' : IECore.V3fData (imath.V3f( 0.1, 0.2, 0.3 )),
278278
}
279279

280280

0 commit comments

Comments
 (0)