3Delight multipart render support

Changes.md

@@ -1,3 +1,8 @@
+1.x.x.x (relative to 1.4.x.x)
+=======
+
+
+
 1.4.x.x (relative to 1.4.2.0)
 =======
 

SConstruct

@@ -62,8 +62,8 @@ if codecs.lookup( locale.getpreferredencoding() ).name != "utf-8" :
 ###############################################################################################
 
 gafferMilestoneVersion = 1 # for announcing major milestones - may contain all of the below
-gafferMajorVersion = 4 # backwards-incompatible changes
-gafferMinorVersion = 2 # new backwards-compatible features
+gafferMajorVersion = 5 # backwards-incompatible changes
+gafferMinorVersion = 0 # new backwards-compatible features
 gafferPatchVersion = 0 # bug fixes
 gafferVersionSuffix = "" # used for alpha/beta releases : "a1", "b2", etc.
 
@@ -833,38 +833,6 @@ if ( int( baseLibEnv["BOOST_MAJOR_VERSION"] ), int( baseLibEnv["BOOST_MINOR_VERS
 	# the reams of warnings triggered by that.
 	baseLibEnv.Append( CPPDEFINES = [ "BOOST_BIND_GLOBAL_PLACEHOLDERS" ] )
 
-# Determine Imath version. The transition between 2 and 3 is a bit of a mess.
-# Imath 3 provides `Imath/ImathConfig.h` for determining version, but that isn't
-# provided by Imath 2, which comes with `OpenEXR/IlmBaseConfig.h` instead. The
-# one thing we can rely on existing all the time is the conceptually unrelated
-# `OpenEXR/OpenEXRConfig.h`, so we use that, even though we don't directly
-# depend on OpenEXR ourselves.
-
-exrVersionHeader = baseLibEnv.FindFile(
-	"OpenEXR/OpenEXRConfig.h",
-	[ "$BUILD_DIR/include" ] +
-	baseLibEnv["LOCATE_DEPENDENCY_SYSTEMPATH"] +
-	baseLibEnv["LOCATE_DEPENDENCY_CPPPATH"]
-)
-
-if not exrVersionHeader :
-	sys.stderr.write( "ERROR : unable to find \"OpenEXR/OpenEXRConfig.h\".\n" )
-	Exit( 1 )
-
-for line in open( str( exrVersionHeader ) ) :
-	m = re.match( r'^#define OPENEXR_VERSION_STRING "(\d+)\.(\d+)\.(\d+)"$', line )
-	if m :
-		baseLibEnv["IMATH_MAJOR_VERSION"] = int( m.group( 1 ) )
-
-if baseLibEnv.get( "IMATH_MAJOR_VERSION", None ) is None :
-	sys.stderr.write( "ERROR : unable to determine version from \"{}\".\n".format( exrVersionHeader ) )
-	Exit( 1 )
-
-# Imath 2 came with a separate `Half` library but in Imath 3 everything is in
-# the `Imath` library.
-
-baseLibEnv["HALF_LIBRARY"] = "Half" if baseLibEnv["IMATH_MAJOR_VERSION"] < 3 else ""
-
 ###############################################################################################
 # The basic environment for building python modules
 ###############################################################################################
@@ -1042,11 +1010,7 @@ cyclesDefines = [
 
 libraries = {
 
-	"Gaffer" : {
-		"envAppends" : {
-			"LIBS" : [ "$HALF_LIBRARY" ],
-		},
-	},
+	"Gaffer" : {},
 
 	"GafferTest" : {
 		"envAppends" : {
@@ -1127,7 +1091,7 @@ libraries = {
 
 	"GafferScene" : {
 		"envAppends" : {
-			"LIBS" : [ "Gaffer", "Iex$IMATH_LIB_SUFFIX", "IECoreGL$CORTEX_LIB_SUFFIX", "IECoreImage$CORTEX_LIB_SUFFIX",  "IECoreScene$CORTEX_LIB_SUFFIX", "GafferImage", "GafferDispatch", "$HALF_LIBRARY", "osdCPU" ],
+			"LIBS" : [ "Gaffer", "Iex$IMATH_LIB_SUFFIX", "IECoreGL$CORTEX_LIB_SUFFIX", "IECoreImage$CORTEX_LIB_SUFFIX",  "IECoreScene$CORTEX_LIB_SUFFIX", "GafferImage", "GafferDispatch", "osdCPU" ],
 		},
 		"pythonEnvAppends" : {
 			"LIBS" : [ "GafferBindings", "GafferScene", "GafferDispatch", "GafferImage", "IECoreScene$CORTEX_LIB_SUFFIX", "IECoreGL$CORTEX_LIB_SUFFIX" ],

include/Gaffer/BoxPlug.h

@@ -43,12 +43,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathBox.h"
-#else
 #include "Imath/ImathBox.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace Gaffer

include/Gaffer/CompoundNumericPlug.h

@@ -43,14 +43,8 @@
 #include "IECore/GeometricTypedData.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathColor.h"
-#include "OpenEXR/ImathVec.h"
-#else
 #include "Imath/ImathColor.h"
 #include "Imath/ImathVec.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace Gaffer

include/Gaffer/MetadataAlgo.h

@@ -43,12 +43,7 @@
 #include "IECore/StringAlgo.h"
 #include "IECore/TypeIds.h"
 
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathColor.h"
-#else
 #include "Imath/ImathColor.h"
-#endif
 
 #include <vector>
 

include/GafferImage/BufferAlgo.h

@@ -39,12 +39,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathBox.h"
-#else
 #include "Imath/ImathBox.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace GafferImage

include/GafferImage/FilterAlgo.h

@@ -43,12 +43,7 @@
 #include "OpenImageIO/filter.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathVec.h"
-#else
 #include "Imath/ImathVec.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace GafferImage

include/GafferImage/Format.h

@@ -42,12 +42,7 @@
 #include "IECore/MurmurHash.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathBox.h"
-#else
 #include "Imath/ImathBox.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 #include <string>

include/GafferImage/ImageAlgo.h

@@ -46,12 +46,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathBox.h"
-#else
 #include "Imath/ImathBox.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 #include <vector>

include/GafferScene/SceneAlgo.h

@@ -48,12 +48,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathVec.h"
-#else
 #include "Imath/ImathVec.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 #include <unordered_set>

include/GafferSceneUI/RotateTool.h

@@ -41,12 +41,7 @@
 #include "GafferUI/Style.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathEuler.h"
-#else
 #include "Imath/ImathEuler.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace GafferSceneUI

include/GafferUI/Gadget.h

@@ -52,12 +52,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathBox.h"
-#else
 #include "Imath/ImathBox.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 #include <functional>

include/GafferUI/GraphLayout.h

@@ -44,12 +44,7 @@
 #include "IECore/RunTimeTyped.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathVec.h"
-#else
 #include "Imath/ImathVec.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace Gaffer

include/GafferUI/KeyEvent.h

@@ -41,12 +41,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathVec.h"
-#else
 #include "Imath/ImathVec.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace GafferUI

include/GafferUI/NoduleLayout.h

@@ -42,9 +42,8 @@
 
 #include "IECore/StringAlgo.h"
 
-#include "boost/variant.hpp"
-
 #include <functional>
+#include <variant>
 
 namespace Gaffer
 {
@@ -112,7 +111,7 @@ class GAFFERUI_API NoduleLayout : public Gadget
 			GadgetPtr gadget;
 		};
 		// Either a plug or the name of a custom widget
-		using GadgetKey = boost::variant<const Gaffer::Plug *, IECore::InternedString>;
+		using GadgetKey = std::variant<const Gaffer::Plug *, IECore::InternedString>;
 		// Map from plugs and custom gadget names to the gadgets
 		// that represent them.
 		using GadgetMap = std::map<GadgetKey, TypeAndGadget>;

include/GafferUI/RotateHandle.h

@@ -39,12 +39,7 @@
 #include "GafferUI/Handle.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathEuler.h"
-#else
 #include "Imath/ImathEuler.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace GafferUI

include/GafferUI/StandardStyle.h

@@ -42,12 +42,7 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathColor.h"
-#else
 #include "Imath/ImathColor.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 #include <array>

include/GafferUI/Style.h

@@ -49,12 +49,7 @@
 #include "IECore/RunTimeTyped.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathBox.h"
-#else
 #include "Imath/ImathBox.h"
-#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 namespace IECoreGL

python/GafferSceneUI/CropWindowToolUI.py

@@ -50,7 +50,7 @@
 	masked area which can be adjusted using drag and drop.
 
 	Note that the view must be locked to a render camera for this tool to be used.
-	Additionally, an upstream node much be capable of setting the crop window so
+	Additionally, an upstream node must be capable of setting the crop window so
 	that there is something to adjust - typically this will be a StandardOptions
 	node. The name of the plug being manipulated is displayed underneath the
 	cropped area - it can be used to verify that the expected node is being adjusted.

python/IECoreDelightTest/RendererTest.py

@@ -50,6 +50,7 @@
 import IECoreScene
 import IECoreDelight
 import IECoreVDB
+import IECoreImage
 
 import GafferTest
 import GafferScene
@@ -101,6 +102,43 @@ def testOutput( self ) :
 
 		self.assertTrue( ( self.temporaryDirectory() / "beauty.exr" ).exists() )
 
+	def testOutputMultipart( self ) :
+
+		r = GafferScene.Private.IECoreScenePreview.Renderer.create(
+			"3Delight",
+			GafferScene.Private.IECoreScenePreview.Renderer.RenderType.Batch
+		)
+
+		r.output(
+			"layer_a",
+			IECoreScene.Output(
+				str( self.temporaryDirectory() / "multipart.exr" ),
+				"exr",
+				"rgba"
+			)
+		)
+
+		r.output(
+			"layer_b",
+			IECoreScene.Output(
+				str( self.temporaryDirectory() / "multipart.exr" ),
+				"exr",
+				"color shader:diffuse"
+			)
+		)
+
+		r.render()
+		del r
+
+		self.assertTrue( ( self.temporaryDirectory() / "multipart.exr" ).exists() )
+
+		i = IECoreImage.ImageReader( os.path.join( self.temporaryDirectory(), "multipart.exr" ) )
+		h = i.readHeader()
+		subimages = h['oiio:subimages']
+		del i
+
+		self.assertEqual( subimages, IECore.IntData( 2 ) )
+
 	def testAOVs( self ) :
 
 		for data, expected in {

src/Gaffer/Animation.cpp

@@ -40,12 +40,7 @@
 #include "Gaffer/Context.h"
 #include "Gaffer/Private/ScopedAssignment.h"
 
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathFun.h"
-#else
 #include "Imath/ImathFun.h"
-#endif
 
 #include <algorithm>
 #include <cassert>

src/Gaffer/NumericPlug.cpp

@@ -39,12 +39,7 @@
 
 #include "Gaffer/TypedPlug.h"
 
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathFun.h"
-#else
 #include "Imath/ImathFun.h"
-#endif
 
 using namespace IECore;
 using namespace Gaffer;

src/Gaffer/Random.cpp

@@ -40,14 +40,8 @@
 #include "Gaffer/Context.h"
 #include "Gaffer/StringPlug.h"
 
-#include "OpenEXR/OpenEXRConfig.h"
-#if OPENEXR_VERSION_MAJOR < 3
-#include "OpenEXR/ImathColorAlgo.h"
-#include "OpenEXR/ImathRandom.h"
-#else
 #include "Imath/ImathColorAlgo.h"
 #include "Imath/ImathRandom.h"
-#endif
 
 #include "boost/functional/hash.hpp"