GafferScene, IECoreArnold : Adapt to IECoreScene::Renderer removal

.github/workflows/main/installDependencies.py

@@ -49,7 +49,7 @@
 
 # Determine default archive URL.
 
-defaultURL = "https://github.com/GafferHQ/dependencies/releases/download/10.0.0a4/gafferDependencies-10.0.0a4-{platform}{buildEnvironment}.{extension}"
+defaultURL = "https://github.com/GafferHQ/dependencies/releases/download/10.0.0a5/gafferDependencies-10.0.0a5-{platform}{buildEnvironment}.{extension}"
 
 # Parse command line arguments.
 

Changes.md

@@ -64,6 +64,8 @@ Fixes
 - ScenePathPlugValueWidget :
   - Fixed context used to evaluate the scene. This is now focus-aware, so the scene browser only shows locations that are available with respect to the current focus.
   - Fixed bugs that prevented usage in `Editor.Settings` nodes.
+- SceneReader : Fixed bug reading USD cameras without authored shutter attributes. Previously, the loaded camera would have an unwanted shutter parameter, but now the shutter parameter is correctly omitted.
+- SceneWriter : Fixed bug writing cameras without a shutter parameter to USD. Previously shutter attributes were authored with default values, but now the shutter attributes are not authored at all.
 
 API
 ---
@@ -103,12 +105,13 @@ Breaking Changes
 - OSLObject, OSLImage, Expression : Removed support for file-based pointclouds.
 - ContextAlgo : Removed deprecated API. Use ScriptNodeAlgo instead, which has been available from Gaffer 1.4.13.0 onwards.
 - ScriptNodeAlgo : Reimplemented using Metadata rather than Context variables for storage. Use the ScriptNodeAlgo API instead of attempting direct access to `ui:*` context variables.
+- SceneReader, SceneWriter : Changed handling of missing shutter parameters. See Fixes section for more detail.
 
 Build
 -----
 
 - Boost : Updated to version 1.82.0.
-- Cortex : Updated to version 10.5.14.1.
+- Cortex : Updated to version 10.6.0.0a1.
 - Cycles : Updated to version 4.4.0.
 - FreeType : Updated to version 2.13.3.
 - LibRaw : Updated to version 0.21.4.

include/GafferScene/Private/IECoreScenePreview/Geometry.h

@@ -40,6 +40,8 @@
 
 #include "IECoreScene/VisibleRenderable.h"
 
+#include "IECore/Version.h"
+
 namespace IECoreScenePreview
 {
 
@@ -64,7 +66,10 @@ class GAFFERSCENE_API Geometry : public IECoreScene::VisibleRenderable
 		const IECore::CompoundData *parameters() const;
 
 		Imath::Box3f bound() const override;
-		void render( IECoreScene::Renderer *renderer ) const override;
+
+#if CORTEX_COMPATIBILITY_VERSION < MAKE_CORTEX_COMPATIBILITY_VERSION( 10, 6 )
+		void render( IECoreScene::Renderer *renderer ) const override {};
+#endif
 
 	private:
 

include/GafferScene/Private/IECoreScenePreview/Placeholder.h

@@ -42,6 +42,8 @@
 
 #include "IECoreScene/VisibleRenderable.h"
 
+#include "IECore/Version.h"
+
 namespace IECoreScenePreview
 {
 
@@ -70,7 +72,9 @@ class GAFFERSCENE_API Placeholder : public IECoreScene::VisibleRenderable
 		const Imath::Box3f &getBound() const;
 
 		Imath::Box3f bound() const override;
-		void render( IECoreScene::Renderer *renderer ) const override;
+#if CORTEX_COMPATIBILITY_VERSION < MAKE_CORTEX_COMPATIBILITY_VERSION( 10, 6 )
+		void render( IECoreScene::Renderer *renderer ) const override {};
+#endif
 
 	private :
 

include/GafferScene/Private/IECoreScenePreview/Procedural.h

@@ -42,6 +42,8 @@
 
 #include "IECoreScene/VisibleRenderable.h"
 
+#include "IECore/Version.h"
+
 namespace IECoreScenePreview
 {
 
@@ -59,10 +61,9 @@ class GAFFERSCENE_API Procedural : public IECoreScene::VisibleRenderable
 
 		IE_CORE_DECLAREEXTENSIONOBJECT( Procedural, IECoreScenePreview::PreviewProceduralTypeId, IECoreScene::VisibleRenderable );
 
-		/// Legacy inherited from IECore::VisibleRenderable.
-		/// Should not be implemented by derived classes.
-		void render( IECoreScene::Renderer *renderer ) const final;
-		/// Render function for use with new renderer backends.
+#if CORTEX_COMPATIBILITY_VERSION < MAKE_CORTEX_COMPATIBILITY_VERSION( 10, 6 )
+		void render( IECoreScene::Renderer *renderer ) const final {};
+#endif
 		/// Must be implemented by derived classes.
 		virtual void render( Renderer *renderer ) const = 0;
 

src/GafferScene/IECoreScenePreview/Geometry.cpp

@@ -86,11 +86,6 @@ Imath::Box3f Geometry::bound() const
 	return m_bound;
 }
 
-void Geometry::render( Renderer *renderer ) const
-{
-	msg( Msg::Warning, "Geometry::render", "Legacy renderers not supported" );
-}
-
 bool Geometry::isEqualTo( const IECore::Object *other ) const
 {
 	if( !VisibleRenderable::isEqualTo( other ) )

src/GafferScene/IECoreScenePreview/Placeholder.cpp

@@ -76,11 +76,6 @@ Imath::Box3f Placeholder::bound() const
 	return m_bound;
 }
 
-void Placeholder::render( Renderer *renderer ) const
-{
-	msg( Msg::Warning, "Placeholder::render", "Legacy renderers not supported" );
-}
-
 bool Placeholder::isEqualTo( const IECore::Object *other ) const
 {
 	if( !VisibleRenderable::isEqualTo( other ) )

src/GafferScene/IECoreScenePreview/Procedural.cpp

@@ -81,8 +81,3 @@ void Procedural::memoryUsage( IECore::Object::MemoryAccumulator &accumulator ) c
 {
 	VisibleRenderable::memoryUsage( accumulator );
 }
-
-void Procedural::render( IECoreScene::Renderer *renderer ) const
-{
-	IECore::msg( IECore::Msg::Warning, std::string( typeName() ) + "::render", "Legacy renderers are not supported." );
-}

src/GafferScene/RendererAlgo.cpp

@@ -52,7 +52,6 @@
 #include "IECoreScene/ClippingPlane.h"
 #include "IECoreScene/CoordinateSystem.h"
 #include "IECoreScene/Output.h"
-#include "IECoreScene/PreWorldRenderable.h"
 #include "IECoreScene/Primitive.h"
 #include "IECoreScene/Shader.h"
 #include "IECoreScene/VisibleRenderable.h"

src/IECoreArnold/VDBAlgo.cpp

@@ -37,8 +37,6 @@
 #include "IECoreArnold/NodeAlgo.h"
 #include "IECoreArnold/ParameterAlgo.h"
 
-#include "IECoreScene/Renderer.h"
-
 #include "IECore/CompoundData.h"
 #include "IECore/Exception.h"
 #include "IECore/MessageHandler.h"