Merge branch 'RB-10.5'

Author: ericmehl

Changes

@@ -1,7 +1,44 @@
-10.5.x.x (relative to 10.5.4.1)
+10.5.x.x (relative to 10.5.6.0)
 ========
 
+10.5.6.0 (relative to 10.5.5.0)
+========
+
+Improvements
+------------
+
+- `IECoreGL::Selector`: Added constructor overload that accepts a boolean indicating a more precise, camera-space depth sample will be used to sample depth instead of OpenGL's depth buffer.
+- `IECoreGL::ColorTexture`: Added new constructor that accepts an argument specifying the internal storage format to use.
+
+
+
+10.5.5.0 (relative to 10.5.4.2)
+========
+
+Features
+--------
+
+- PyBindConverter : Added new class providing interoperability between Boost Python bindings and PyBind11 bindings.
+
+Improvements
+------------
+
+- USDScene : Added basic loading of UsdGeomNurbsCurves, converting them to CurvesPrimitives.
+- OStreamMessageHandler : Added level prefix to every line.
+
+Fixes
+-----
+
+- CompoundObject : Fixed crashes in Python bindings caused by passing `None` as a key.
+- VDBObject : Fixed Python bindings for OpenVDB 10.1.
+
+10.5.4.2 (relative to 10.5.4.1)
+========
+
+Fixes
+-----
 
+- ExceptionAlgo : Fixed memory leak in `translatePythonException()`, which was failing to manage the reference count for exceptions bound by `IECorePython::ExceptionClass`.
 
 10.5.4.1 (relative to 10.5.4.0)
 ========

SConstruct

@@ -56,8 +56,8 @@ SConsignFile()
 
 ieCoreMilestoneVersion = 10 # for announcing major milestones - may contain all of the below
 ieCoreMajorVersion = 5 # backwards-incompatible changes
-ieCoreMinorVersion = 4 # new backwards-compatible features
-ieCorePatchVersion = 1 # bug fixes
+ieCoreMinorVersion = 6 # new backwards-compatible features
+ieCorePatchVersion = 0 # bug fixes
 ieCoreVersionSuffix = "" # used for alpha/beta releases. Example: "a1", "b2", etc.
 
 ###########################################################################################
@@ -967,6 +967,7 @@ o.Add(
 ###########################################################################################
 
 env = Environment(
+	MSVC_VERSION = "14.2",
 	options = o
 )
 

contrib/IECoreAlembic/test/IECoreAlembic/AlembicSceneTest.py

@@ -1929,7 +1929,7 @@ def backgroundRun():
 		startTime = time.time()
 		thread.start()
 
-		time.sleep( 0.05 )
+		time.sleep( 0.01 )
 		canceller.cancel()
 		thread.join()
 

contrib/IECoreUSD/src/IECoreUSD/CurvesAlgo.cpp

@@ -42,6 +42,7 @@
 
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "pxr/usd/usdGeom/basisCurves.h"
+#include "pxr/usd/usdGeom/nurbsCurves.h"
 IECORE_POP_DEFAULT_VISIBILITY
 
 using namespace IECore;
@@ -55,13 +56,37 @@ using namespace IECoreUSD;
 namespace
 {
 
-IECore::ObjectPtr readCurves( pxr::UsdGeomBasisCurves &curves, pxr::UsdTimeCode time, const Canceller *canceller )
+IECore::ObjectPtr readCurves( pxr::UsdGeomCurves &curves, pxr::UsdTimeCode time, const IECore::CubicBasisf &basis, bool periodic, const Canceller *canceller )
 {
 	Canceller::check( canceller );
 	pxr::VtIntArray vertexCountsArray;
 	curves.GetCurveVertexCountsAttr().Get( &vertexCountsArray, time );
 	IECore::IntVectorDataPtr countData = DataAlgo::fromUSD( vertexCountsArray );
 
+	Canceller::check( canceller );
+	IECoreScene::CurvesPrimitivePtr newCurves = new IECoreScene::CurvesPrimitive( countData, basis, periodic );
+	PrimitiveAlgo::readPrimitiveVariables( curves, time, newCurves.get(), canceller );
+
+	Canceller::check( canceller );
+	PrimitiveAlgo::readPrimitiveVariable(
+		curves.GetWidthsAttr(), time, newCurves.get(), "width", PrimitiveAlgo::fromUSD( curves.GetWidthsInterpolation() )
+	);
+
+	return newCurves;
+}
+
+bool curvesMightBeTimeVarying( pxr::UsdGeomCurves &curves )
+{
+	return
+		curves.GetCurveVertexCountsAttr().ValueMightBeTimeVarying() ||
+		curves.GetWidthsAttr().ValueMightBeTimeVarying() ||
+		PrimitiveAlgo::primitiveVariablesMightBeTimeVarying( curves )
+	;
+}
+
+IECore::ObjectPtr readBasisCurves( pxr::UsdGeomBasisCurves &curves, pxr::UsdTimeCode time, const Canceller *canceller )
+{
+
 	// Basis
 	Canceller::check( canceller );
 	IECore::CubicBasisf basis = CubicBasisf::linear();
@@ -103,32 +128,44 @@ IECore::ObjectPtr readCurves( pxr::UsdGeomBasisCurves &curves, pxr::UsdTimeCode
 		IECore::msg( IECore::Msg::Warning, "USDScene", boost::format( "Unsupported wrap \"%1%\"" ) % wrap );
 	}
 
-	// Curves and primvars
+	return readCurves( curves, time, basis, periodic, canceller );
+}
 
-	IECoreScene::CurvesPrimitivePtr newCurves = new IECoreScene::CurvesPrimitive( countData, basis, periodic );
-	PrimitiveAlgo::readPrimitiveVariables( curves, time, newCurves.get(), canceller );
+bool basisCurvesMightBeTimeVarying( pxr::UsdGeomBasisCurves &curves )
+{
+	return
+		curvesMightBeTimeVarying( curves ) ||
+		curves.GetTypeAttr().ValueMightBeTimeVarying() ||
+		curves.GetBasisAttr().ValueMightBeTimeVarying() ||
+		curves.GetWrapAttr().ValueMightBeTimeVarying()
+	;
+}
+
+IECore::ObjectPtr readNurbsCurves( pxr::UsdGeomNurbsCurves &curves, pxr::UsdTimeCode time, const Canceller *canceller )
+{
+	IECore::CubicBasisf basis = IECore::CubicBasisf::linear();
 
 	Canceller::check( canceller );
-	PrimitiveAlgo::readPrimitiveVariable(
-		curves.GetWidthsAttr(), time, newCurves.get(), "width", PrimitiveAlgo::fromUSD( curves.GetWidthsInterpolation() )
-	);
+	pxr::VtIntArray order;
+	curves.GetOrderAttr().Get( &order, time );
+	if( std::all_of( order.begin(), order.end(), [] ( int o ) { return o == 4; } ) )
+	{
+		basis = CubicBasisf::bSpline();
+	}
 
-	return newCurves;
+	return readCurves( curves, time, basis, false, canceller );
 }
 
-bool curvesMightBeTimeVarying( pxr::UsdGeomBasisCurves &curves )
+bool nurbsCurvesMightBeTimeVarying( pxr::UsdGeomNurbsCurves &curves )
 {
 	return
-		curves.GetCurveVertexCountsAttr().ValueMightBeTimeVarying() ||
-		curves.GetTypeAttr().ValueMightBeTimeVarying() ||
-		curves.GetBasisAttr().ValueMightBeTimeVarying() ||
-		curves.GetWrapAttr().ValueMightBeTimeVarying() ||
-		curves.GetWidthsAttr().ValueMightBeTimeVarying() ||
-		PrimitiveAlgo::primitiveVariablesMightBeTimeVarying( curves )
+		curvesMightBeTimeVarying( curves ) ||
+		curves.GetOrderAttr().ValueMightBeTimeVarying()
 	;
 }
 
-ObjectAlgo::ReaderDescription<pxr::UsdGeomBasisCurves> g_curvesReaderDescription( pxr::TfToken( "BasisCurves" ), readCurves, curvesMightBeTimeVarying );
+ObjectAlgo::ReaderDescription<pxr::UsdGeomBasisCurves> g_curvesReaderDescription( pxr::TfToken( "BasisCurves" ), readBasisCurves, basisCurvesMightBeTimeVarying );
+ObjectAlgo::ReaderDescription<pxr::UsdGeomNurbsCurves> g_nurbsCurvesReaderDescription( pxr::TfToken( "NurbsCurves" ), readNurbsCurves, nurbsCurvesMightBeTimeVarying );
 
 } // namespace
 

contrib/IECoreUSD/test/IECoreUSD/USDSceneTest.py

@@ -1655,6 +1655,58 @@ def testCurveBasisAndWrap( self ) :
 				self.assertEqual( curves2, curves )
 				del root
 
+	def testReadNurbsCurves( self ) :
+
+		# Write USD file
+
+		fileName = os.path.join( self.temporaryDirectory(), "nurbs.usda" )
+		stage = pxr.Usd.Stage.CreateNew( fileName )
+
+		curves = pxr.UsdGeom.NurbsCurves.Define( stage, "/cubic" )
+		curves.CreateCurveVertexCountsAttr().Set( [ 4 ] )
+		curves.CreatePointsAttr().Set( [ ( x, x, x ) for x in range( 0, 4 ) ] )
+		curves.CreateOrderAttr().Set( [ 4 ] )
+		curves.CreateKnotsAttr().Set( [ 0, 0, 0, 0.333, 0.666, 1, 1, 1 ] )
+
+		curves = pxr.UsdGeom.NurbsCurves.Define( stage, "/nonCubic" )
+		curves.CreateCurveVertexCountsAttr().Set( [ 4 ] )
+		curves.CreatePointsAttr().Set( [ ( x, x, x ) for x in range( 0, 4 ) ] )
+		curves.CreateOrderAttr().Set( [ 3 ] )
+		curves.CreateKnotsAttr().Set( [ 0, 0, 0, 0.5, 1, 1, 1 ] )
+
+		stage.GetRootLayer().Save()
+		del stage
+
+		# Load and check
+
+		root = IECoreScene.SceneInterface.create( fileName, IECore.IndexedIO.OpenMode.Read )
+
+		cubic = root.child( "cubic" ).readObject( 0.0 )
+		self.assertIsInstance( cubic, IECoreScene.CurvesPrimitive )
+		self.assertEqual( cubic.verticesPerCurve(), IECore.IntVectorData( [ 4 ] ) )
+		self.assertEqual( cubic.basis(), IECore.CubicBasisf.bSpline() )
+		self.assertEqual( cubic.periodic(), False )
+		self.assertEqual(
+			cubic["P"].data,
+			IECore.V3fVectorData(
+				[ imath.V3f( x ) for x in range( 0, 4 ) ],
+				IECore.GeometricData.Interpretation.Point
+			)
+		)
+
+		nonCubic = root.child( "nonCubic" ).readObject( 0.0 )
+		self.assertIsInstance( nonCubic, IECoreScene.CurvesPrimitive )
+		self.assertEqual( nonCubic.verticesPerCurve(), IECore.IntVectorData( [ 4 ] ) )
+		self.assertEqual( nonCubic.basis(), IECore.CubicBasisf.linear() )
+		self.assertEqual( nonCubic.periodic(), False )
+		self.assertEqual(
+			cubic["P"].data,
+			IECore.V3fVectorData(
+				[ imath.V3f( x ) for x in range( 0, 4 ) ],
+				IECore.GeometricData.Interpretation.Point
+			)
+		)
+
 	def testIndexedWidths( self ) :
 
 		# Write USD file from points with indexed widths

include/IECoreGL/ColorTexture.h

@@ -51,8 +51,11 @@ class IECOREGL_API ColorTexture : public Texture
 
 		IE_CORE_DECLARERUNTIMETYPEDEXTENSION( IECoreGL::ColorTexture, ColorTextureTypeId, Texture );
 
-		/// Constructs an empty texture of the specified dimensions.
+		/// \todo Remove this constructor when client code has transitioned to the one
+		/// specifying the internal storage format.
 		ColorTexture( unsigned int width, unsigned int height );
+		/// Constructs an empty texture of the specified dimensions and internal storage format.
+		ColorTexture( unsigned int width, unsigned int height, const GLint internalFormat );
 		/// Constructs a new ColorTexture. All channels must be of the same type, and must
 		/// be some form of numeric VectorData.
 		ColorTexture( unsigned int width, unsigned int height, const IECore::Data *r,

include/IECoreGL/Selector.h

@@ -99,6 +99,13 @@ class IECOREGL_API Selector : boost::noncopyable
 		/// responsibility to keep the hits vector alive for the lifetime
 		/// of the Selector.
 		Selector( const Imath::Box2f &region, Mode mode, std::vector<HitRecord> &hits );
+		/// Same as above, and if `useCameraDepth` is `true`, the depth
+		/// values in `hits` will be taken from the camera-space Z coordinate
+		/// instead of the less precise OpenGL depth buffer.
+
+		/// \todo Remove when client code has migrated and use the more
+		/// precise alternative exclusively.
+		Selector( const Imath::Box2f &region, Mode mode, std::vector<HitRecord> &hits, bool useCameraDepth );
 		/// Completes the selection operation, filling in the vector
 		/// of hits that was passed to the constructor.
 		virtual ~Selector();

include/IECorePython/PyBindConverter.h

@@ -0,0 +1,102 @@
+
+//////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) 2024, Cinesite VFX Ltd. All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without
+//  modification, are permitted provided that the following conditions are
+//  met:
+//
+//      * Redistributions of source code must retain the above
+//        copyright notice, this list of conditions and the following
+//        disclaimer.
+//
+//      * Redistributions in binary form must reproduce the above
+//        copyright notice, this list of conditions and the following
+//        disclaimer in the documentation and/or other materials provided with
+//        the distribution.
+//
+//      * Neither the name of John Haddon nor the names of
+//        any other contributors to this software may be used to endorse or
+//        promote products derived from this software without specific prior
+//        written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+//  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+//  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+//  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+//  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+//  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+//  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+//  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+//  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+//  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+//  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+//////////////////////////////////////////////////////////////////////////
+
+#ifndef IECOREPYTHON_PYBINDCONVERTER_H
+#define IECOREPYTHON_PYBINDCONVERTER_H
+
+#include "boost/python.hpp"
+
+#include "pybind11/pybind11.h"
+
+namespace IECorePython
+{
+
+// Registers `boost::python` converters for types
+// wrapped using PyBind11.
+template<typename T>
+struct PyBindConverter
+{
+
+	static void registerConverters()
+	{
+		boost::python::to_python_converter<T, ToPyBind>();
+		boost::python::converter::registry::push_back(
+			&FromPyBind::convertible,
+			&FromPyBind::construct,
+			boost::python::type_id<T>()
+		);
+	}
+
+	private :
+
+		struct ToPyBind
+		{
+			static PyObject *convert( const T &t )
+			{
+				pybind11::object o = pybind11::cast( t );
+				Py_INCREF( o.ptr() );
+				return o.ptr();
+			}
+		};
+
+		struct FromPyBind
+		{
+
+			static void *convertible( PyObject *object )
+			{
+				pybind11::handle handle( object );
+				return handle.cast<T>() ? object : nullptr;
+			}
+
+			static void construct( PyObject *object, boost::python::converter::rvalue_from_python_stage1_data *data )
+			{
+				void *storage = ( ( boost::python::converter::rvalue_from_python_storage<T> * ) data )->storage.bytes;
+				T *t = new( storage ) T;
+				data->convertible = storage;
+
+				pybind11::handle handle( object );
+				*t = handle.cast<T>();
+			}
+
+		};
+
+};
+
+} // namespace IECorePython
+
+#endif // IECOREPYTHON_PYBINDCONVERTER_H
+

src/IECore/OStreamMessageHandler.cpp

@@ -67,7 +67,24 @@ OStreamMessageHandler::~OStreamMessageHandler()
 
 void OStreamMessageHandler::handle( Level level, const std::string &context, const std::string &message )
 {
-	*m_stream << levelAsString( level ) << " : " << context << " : " << message << endl;
+	const string levelString = levelAsString( level );
+	// Output the message a line at a time.
+	for( size_t lineBegin = 0; lineBegin < message.size(); )
+	{
+		// Find span to the next newline.
+		const size_t f = message.find( '\n', lineBegin );
+		const size_t lineEnd = f == string::npos ? message.size() : f;
+		// Prefix every line with the level
+		*m_stream << levelString << " : ";
+		// Only prefix the first line with the context
+		if( lineBegin == 0 )
+		{
+			*m_stream << context << " : ";
+		}
+		// Output line and set up for next one.
+		*m_stream << std::string_view( message.data() + lineBegin, lineEnd - lineBegin ) << endl;
+		lineBegin = lineEnd + 1;
+	}
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////