IECoreUSD : Load primvars from UsdGeomPointInstancers

Author: johnhaddon

contrib/IECoreUSD/src/IECoreUSD/PointInstancerAlgo.cpp

@@ -125,6 +125,10 @@ IECore::ObjectPtr readPointInstancer( pxr::UsdGeomPointInstancer &pointInstancer
 
 	newPoints->variables["prototypeRoots"] = IECoreScene::PrimitiveVariable( IECoreScene::PrimitiveVariable::Constant, prototypeRootsData );
 
+	// Primitive variables
+
+	PrimitiveAlgo::readPrimitiveVariables( pxr::UsdGeomPrimvarsAPI( pointInstancer ), time, newPoints.get(), canceller );
+
 	return newPoints;
 }
 
@@ -140,7 +144,10 @@ bool pointInstancerMightBeTimeVarying( pxr::UsdGeomPointInstancer &instancer )
 #if USD_VERSION >= 1911
 		instancer.GetAccelerationsAttr().ValueMightBeTimeVarying() ||
 #endif
-		instancer.GetAngularVelocitiesAttr().ValueMightBeTimeVarying()
+		instancer.GetAngularVelocitiesAttr().ValueMightBeTimeVarying() ||
+		PrimitiveAlgo::primitiveVariablesMightBeTimeVarying(
+			pxr::UsdGeomPrimvarsAPI( instancer )
+		)
 	;
 }
 

contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

@@ -3106,5 +3106,36 @@ def testColor4fShaderParameterComponentConnections( self ) :
 		root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
 		self.assertEqual( root.child( "object" ).readAttribute( "ai:surface", 0 ), network )
 
+	def testPointInstancerPrimvars( self ) :
+
+		# Use the USD API to author a point instancer with primvars on it.
+
+		fileName = os.path.join( self.temporaryDirectory(), "pointInstancePrimvars.usda" )
+		stage = pxr.Usd.Stage.CreateNew( fileName )
+		points = pxr.UsdGeom.PointInstancer.Define( stage, "/points" )
+		points.CreatePositionsAttr( [ ( v, v, v ) for v in range( 0, 5 ) ] )
+
+		primvars = pxr.UsdGeom.PrimvarsAPI( points )
+		primvar = primvars.CreatePrimvar( "myColor", pxr.Sdf.ValueTypeNames.Color3fArray, "vertex" )
+		primvar.Set(
+			[ ( c, c, c ) for c in range( 1, 6 ) ]
+		)
+
+		stage.GetRootLayer().Save()
+
+		# Check we can load the primvar via a SceneInterface.
+
+		root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
+		points = root.child( "points" ).readObject( 0 )
+
+		self.assertIsInstance( points, IECoreScene.PointsPrimitive )
+		self.assertIn( "myColor", points )
+		self.assertEqual(
+			points["myColor"].data,
+			IECore.Color3fVectorData( [ imath.Color3f( c ) for c in range( 1, 6 ) ] )
+		)
+		self.assertEqual( points["myColor"].interpolation, IECoreScene.PrimitiveVariable.Interpolation.Vertex )
+		self.assertEqual( points["myColor"].indices, None )
+
 if __name__ == "__main__":
 	unittest.main()