Merge branch 'RB-10.3' into 'RB-10.4'

Changes

@@ -1,11 +1,24 @@
 10.4.x.x (relative to 10.4.2.1)
 ========
 
+Features
+--------
+
+- IECoreNuke : Add LiveScene support for Nuke (#1310).
+  - LiveSceneKnob : Knob to interface with LiveScene from Python.
+  - LiveSceneHolder : Node to hold LiveSceneKnob to provide a Python interface with LiveScene.
+- IECoreMaya : Add non-drawable `ieSceneShapeProxy` subclassed from `ieSceneShape` (#1311).
+
 Improvements
 ------------
 
 - Added string constructor and static `fromString` function to `IECore.MurmurHash`.
 
+Fixes
+-----
+
+- IECoreUSD : Fixed error in `pluginfo.json` preventing USD on Windows from loading `IECoreUSD.dll`.
+
 Build
 -----
 
@@ -121,6 +134,22 @@ Build
 
 - Updated IE options file to support Nuke 13.x custom dependencies (#1263).
 
+10.3.8.0 (relative to 10.3.7.2)
+========
+
+Features
+--------
+
+- IECoreNuke : Add LiveScene support for Nuke (#1310).
+  - LiveSceneKnob : Knob to interface with LiveScene from Python.
+  - LiveSceneHolder : Node to hold LiveSceneKnob to provide a Python interface with LiveScene.
+- IECoreMaya : Add non-drawable `ieSceneShapeProxy` subclassed from `ieSceneShape` (#1311).
+
+Fixes
+-----
+
+- IECoreUSD : Fixed error in `pluginfo.json` preventing USD on Windows from loading `IECoreUSD.dll`.
+
 10.3.7.2 (relative to 10.3.7.1)
 ========
 

SConstruct

@@ -2691,7 +2691,7 @@ if doConfigure :
 				nukePythonSources = sorted( glob.glob( "src/IECoreNuke/bindings/*.cpp" ) )
 				nukePythonScripts = glob.glob( "python/IECoreNuke/*.py" )
 				nukePluginSources = sorted( glob.glob( "src/IECoreNuke/plugin/*.cpp" ) )
-				nukeNodeNames = [ "ieObject", "ieOp", "ieDrawable", "ieDisplay" ]
+				nukeNodeNames = [ "ieObject", "ieOp", "ieDrawable", "ieDisplay", "ieLiveScene", "sccWriter" ]
 
 				# nuke library
 				nukeLibrary = nukeEnv.SharedLibrary( "lib/" + os.path.basename( nukeEnv.subst( "$INSTALL_NUKELIB_NAME" ) ), nukeSources )
@@ -2751,7 +2751,12 @@ if doConfigure :
 				for nodeName in nukeNodeNames :
 
 					nukeStubEnv = nukePluginEnv.Clone( IECORE_NAME=nodeName )
-					nukeStubName = "plugins/nuke/" + os.path.basename( nukeStubEnv.subst( "$INSTALL_NUKEPLUGIN_NAME" ) ) + ".tcl"
+					# In order to have our custom file format (scc) displayed in the file_type knob of the WriteGeo node, we need to install
+					# a dummy library with "[fileExtension]Writer"
+					if nodeName == "sccWriter":
+						nukeStubName = "plugins/nuke/" + os.path.basename( nukeStubEnv.subst( "$INSTALL_NUKEPLUGIN_NAME$SHLIBSUFFIX" ) )
+					else:
+						nukeStubName = "plugins/nuke/" + os.path.basename( nukeStubEnv.subst( "$INSTALL_NUKEPLUGIN_NAME" ) ) + ".tcl"
 					nukeStub = nukePluginEnv.Command( nukeStubName, nukePlugin, "echo 'load ieCore' > $TARGET" )
 					nukeStubInstall = nukeStubEnv.Install( os.path.dirname( nukeStubEnv.subst( "$INSTALL_NUKEPLUGIN_NAME" ) ), nukeStub )
 					nukeStubEnv.Alias( "install", nukeStubInstall )
@@ -3130,7 +3135,7 @@ if doConfigure :
 				"!IECOREUSD_RELATIVE_LIB_FOLDER!" : os.path.relpath(
 					usdLibraryInstall[0].get_path(),
 					os.path.dirname( usdEnv.subst( "$INSTALL_USD_RESOURCE_DIR/IECoreUSD/plugInfo.json" ) )
-				).format( "\\", "\\\\" ),
+				).replace( "\\", "\\\\" ),
 			}
 		)
 		usdEnv.AddPostAction( "$INSTALL_USD_RESOURCE_DIR/IECoreUSD", lambda target, source, env : makeSymLinks( usdEnv, usdEnv["INSTALL_USD_RESOURCE_DIR"] ) )

include/IECoreMaya/MayaTypeIds.h

@@ -67,6 +67,7 @@ enum MayaTypeId
 	GeometryCombinerId = 0x00110DD2,
 	SceneShapeId = 0x00110DD3,
 	SceneShapeInterfaceId = 0x00110DD4,
+	SceneShapeProxyId = 0x00110DD5,
 	/// Don't forget to update MayaTypeIdsBinding.cpp
 
 	LastId = 0x00110E3F,

include/IECoreMaya/SceneShapeProxy.h

@@ -0,0 +1,67 @@
+//////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) 2022, Image Engine Design Inc. 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 Image Engine Design 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 IE_COREMAYA_SCENESHAPEPROXY_H
+#define IE_COREMAYA_SCENESHAPEPROXY_H
+
+#include "IECoreMaya/SceneShape.h"
+
+namespace IECoreMaya
+{
+
+/// A proxy derived from the SceneShape which exposes the same functionality as the base clase
+/// with the exception, that we never register it as a maya SubSceneOverride. The reasoning
+/// behind this is that the SubSceneOverride does not take into account the visibility state of the shape.
+/// During an update loop of the SubSceneOverride, all SceneShapes will be queried for their update state,
+/// regardless their visibility in the scene. This query is slow and we get a huge drop in performance
+/// when having a huge amount of SceneShapes in the scene.
+/// This is considered to be a bug in the ViewPort 2 API. Our attempts to rewrite the code to use
+/// "MPxGeometryOverride" or "MPxDrawOverride" prove themselves as unstable or not suitable for our
+/// use case, why we decided to use this "hackery" and not register a proxy of the SceneShape for
+/// drawing at all
+class IECOREMAYA_API SceneShapeProxy : public SceneShape
+{
+	public :
+
+		SceneShapeProxy();
+		virtual ~SceneShapeProxy();
+
+		static void *creator();
+		static MStatus initialize();
+		static MTypeId id;
+};
+
+}
+
+#endif // IE_COREMAYA_SCENESHAPEPROXY_H

include/IECoreMaya/SceneShapeProxyUI.h

@@ -0,0 +1,59 @@
+//////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) 2022, Image Engine Design Inc. 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 Image Engine Design 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 IECOREMAYA_SCENESHAPEPROXYUI_H
+#define IECOREMAYA_SCENESHAPEPROXYUI_H
+
+#include "maya/MPxSurfaceShapeUI.h"
+#include "maya/MTypes.h"
+#include "IECoreMaya/Export.h"
+
+namespace IECoreMaya
+{
+
+/// The SceneShapeProxyUI is required for the registration of the SceneShapeProxy and we just make it a NoOp
+/// TODO: It might be worth to see if the SceneShapeUI has any dependencies on the drawing capabilities of the
+/// shape and if that's not the case, register SceneShapeProxy with the original implementation of SceneShapeUI
+class IECOREMAYA_API SceneShapeProxyUI : public MPxSurfaceShapeUI
+{
+
+	public :
+
+		SceneShapeProxyUI();
+		static void *creator();
+};
+
+} // namespace IECoreMaya
+
+#endif // IECOREMAYA_SCENESHAPEPROXYUI_H

include/IECoreNuke/Convert.h

@@ -114,12 +114,21 @@ IECORENUKE_API Imath::M44f convert( const DD::Image::Matrix4 &from );
 template<>
 IECORENUKE_API Imath::M44d convert( const DD::Image::Matrix4 &from );
 
+template<>
+IECORENUKE_API DD::Image::Matrix4 convert( const Imath::M44d &from );
+
 template<>
 IECORENUKE_API Imath::Box2i convert( const DD::Image::Box &from );
 
 template<>
 IECORENUKE_API DD::Image::Box3 convert( const Imath::Box3f &from );
 
+template<>
+IECORENUKE_API Imath::Box3f convert( const DD::Image::Box3 &from );
+
+template<>
+IECORENUKE_API Imath::Box3d convert( const DD::Image::Box3 &from );
+
 } // namespace IECore
 
 #endif // IECORENUKE_CONVERT_H

include/IECoreNuke/LiveScene.h

@@ -0,0 +1,132 @@
+//////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (c) 2022, Image Engine Design Inc. 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 Image Engine Design 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 IECORENUKE_LIVESCENE_H
+#define IECORENUKE_LIVESCENE_H
+
+#include "DDImage/GeoOp.h"
+#include "DDImage/GeometryList.h"
+
+#include "IECore/PathMatcher.h"
+
+#include "IECoreScene/SceneInterface.h"
+
+#include "IECoreNuke/Export.h"
+#include "IECoreNuke/TypeIds.h"
+
+namespace IECoreNuke
+{
+
+IE_CORE_FORWARDDECLARE( LiveScene );
+
+/// A read-only class for representing a live Nuke scene as an IECore::SceneInterface
+class IECORENUKE_API LiveScene : public IECoreScene::SceneInterface
+{
+	public :
+
+		static const std::string& nameAttribute;
+
+		IE_CORE_DECLARERUNTIMETYPEDEXTENSION( LiveScene, LiveSceneTypeId, IECoreScene::SceneInterface );
+
+		LiveScene();
+		LiveScene( DD::Image::GeoOp *op, const std::string rootPath="/" );
+
+		~LiveScene() override;
+
+		std::string fileName() const override;
+
+		Name name() const override;
+		void path( Path &p ) const override;
+
+		Imath::Box3d readBound( double time ) const override;
+		void writeBound( const Imath::Box3d &bound, double time );
+
+		IECore::ConstDataPtr readTransform( double time ) const override;
+		Imath::M44d readTransformAsMatrix( double time ) const override;
+		IECore::ConstDataPtr readWorldTransform( double time ) const;
+		Imath::M44d readWorldTransformAsMatrix( double time ) const;
+		void writeTransform( const IECore::Data *transform, double time ) override;
+
+		bool hasAttribute( const Name &name ) const override;
+		void attributeNames( NameList &attrs ) const override;
+		IECore::ConstObjectPtr readAttribute( const Name &name, double time ) const override;
+		void writeAttribute( const Name &name, const IECore::Object *attribute, double time ) override;
+
+		bool hasTag( const Name &name, int filter = SceneInterface::LocalTag ) const override;
+		void readTags( NameList &tags, int filter = SceneInterface::LocalTag ) const override;
+		void writeTags( const NameList &tags ) override;
+
+		NameList setNames( bool includeDescendantSets = true ) const override;
+		IECore::PathMatcher readSet( const Name &name, bool includeDescendantSets = true, const IECore::Canceller *canceller = nullptr ) const override;
+		void writeSet( const Name &name, const IECore::PathMatcher &set ) override;
+		void hashSet( const Name& setName, IECore::MurmurHash &h ) const override;
+
+		bool hasObject() const override;
+		IECore::ConstObjectPtr readObject( double time, const IECore::Canceller *canceller = nullptr  ) const override;
+		IECoreScene::PrimitiveVariableMap readObjectPrimitiveVariables( const std::vector<IECore::InternedString> &primVarNames, double time ) const override;
+		void writeObject( const IECore::Object *object, double time ) override;
+
+		void childNames( NameList &childNames ) const override;
+		bool hasChild( const Name &name ) const override;
+		IECoreScene::SceneInterfacePtr child( const Name &name, MissingBehaviour missingBehaviour = SceneInterface::ThrowIfMissing ) override;
+		IECoreScene::ConstSceneInterfacePtr child( const Name &name, MissingBehaviour missingBehaviour = SceneInterface::ThrowIfMissing ) const override;
+		IECoreScene::SceneInterfacePtr createChild( const Name &name ) override;
+
+		IECoreScene::SceneInterfacePtr scene( const Path &path, MissingBehaviour missingBehaviour = SceneInterface::ThrowIfMissing ) override;
+		IECoreScene::ConstSceneInterfacePtr scene( const Path &path, MissingBehaviour missingBehaviour = SceneInterface::ThrowIfMissing ) const override;
+
+		void hash( HashType hashType, double time, IECore::MurmurHash &h ) const override;
+
+		static double timeToFrame( const double& time );
+		static double frameToTime( const int& frame );
+
+		private:
+
+		DD::Image::GeoOp *op() const;
+		DD::Image::GeometryList geometryList( const double* time=nullptr ) const;
+
+		std::string geoInfoPath( const int& index ) const;
+
+		DD::Image::GeoOp *m_op;
+		std::string m_rootPath;
+		IECore::PathMatcher m_pathMatcher;
+		typedef std::map<unsigned, std::string> objectPathMap;
+		mutable objectPathMap m_objectPathMap;
+};
+
+IE_CORE_DECLAREPTR( LiveScene );
+
+} // namespace IECoreNuke
+
+#endif // IECORENUKE_LIVESCENE_H