Merge pull request #162 from andrewkaufman/sceneNodeInterfaceBinding

Adding wrapper class for SceneCacheNodes and binding scene() method
ImageEngine · Nov 1, 2013 · d7c0f78 · d7c0f78
2 parents 00828c8 + e8db573
commit d7c0f78
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 1 deletion.
diff --git a/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp b/src/IECoreHoudini/bindings/SceneCacheNodeBinding.cpp
@@ -36,22 +36,92 @@
 
 #include "OP/OP_Node.h"
 
+#include "IECore/MessageHandler.h"
+
 #include "IECorePython/RunTimeTypedBinding.h"
 
 #include "IECoreHoudini/SceneCacheNode.h"
 #include "IECoreHoudini/OBJ_SceneCacheTransform.h"
+#include "IECoreHoudini/NodeHandle.h"
+
 #include "IECoreHoudini/bindings/SceneCacheNodeBinding.h"
 
 using namespace boost::python;
 using namespace IECoreHoudini;
 
 class SceneCacheNodeHelper
 {
+	public :
+
+		SceneCacheNodeHelper( OP_Node *node = 0 )
+		{
+			if ( !node )
+			{
+				return;
+			}
+
+			if ( sceneNode( node ) )
+			{
+				m_handle = node;
+			}
+			else
+			{
+				UT_String path;
+				node->getFullPath( path );
+				IECore::msg( IECore::MessageHandler::Error, "SceneCacheNode", path.toStdString() + " was not a valid SceneCacheNode" );
+			}
+		}
+
+		~SceneCacheNodeHelper()
+		{
+		}
+
+		bool hasNode() const
+		{
+			return m_handle.alive();
+		}
+
+		SceneCacheNode<OP_Node> *sceneNode( OP_Node *node ) const
+		{
+			// make sure its a SceneCacheNode
+			if ( !node || !node->hasParm( SceneCacheNode<OP_Node>::pFile.getToken() ) || !node->hasParm( SceneCacheNode<OP_Node>::pRoot.getToken() ) )
+			{
+				return 0;
+			}
+
+			return reinterpret_cast<SceneCacheNode<OP_Node>* >( node );
+		}
+
+		IECore::SceneInterfacePtr scene() const
+		{
+			if ( !hasNode() )
+			{
+				return 0;
+			}
+
+			if ( SceneCacheNode<OP_Node> *node = sceneNode( m_handle.node() ) )
+			{
+				if ( IECore::ConstSceneInterfacePtr s = node->scene() )
+				{
+					return const_cast<IECore::SceneInterface*>( s.get() );
+				}
+			}
+
+			return 0;
+		}
+
+	private :
+
+		NodeHandle m_handle;
+
 };
 
 void IECoreHoudini::bindSceneCacheNode()
 {
-	scope modeCacheNodeScope = class_<SceneCacheNodeHelper>( "SceneCacheNode" );
+	scope modeCacheNodeScope = class_<SceneCacheNodeHelper>( "SceneCacheNode" )
+		.def( init<OP_Node*>() )
+		.def( "scene", &SceneCacheNodeHelper::scene )
+	;
 
 	enum_<SceneCacheNode<OP_Node>::Space>( "Space" )
 		.value( "World", SceneCacheNode<OP_Node>::World )

diff --git a/test/IECoreHoudini/SceneCacheTest.py b/test/IECoreHoudini/SceneCacheTest.py
@@ -2380,6 +2380,23 @@ def testTimeDependent( self ) :
 		self.assertTrue( hou.node( xform.path()+"/1/2/3/geo" ).isTimeDependent() )
 		self.assertFalse( hou.node( xform.path()+"/1/2/3/geo/3" ).isTimeDependent() )
 
+	def testSceneMethod( self ) :
+
+		def testNode( node ) :
+
+			sceneNode = IECoreHoudini.SceneCacheNode( node )
+			shared = IECore.SharedSceneInterfaces.get( TestSceneCache.__testFile )
+			self.assertTrue( sceneNode.scene().isSame( shared ) )
+			node.parm( "root" ).set( "/1/fake" )
+			self.assertEqual( sceneNode.scene(), None )
+			node.parm( "root" ).set( "/1/2" )
+			self.compareScene( sceneNode.scene(), shared.scene( [ "1", "2" ] ) )
+
+		self.writeSCC()
+		testNode( self.sop() )
+		testNode( self.xform() )
+		testNode( self.geometry() )
+
 	def tearDown( self ) :
 
 		for f in [ TestSceneCache.__testFile, TestSceneCache.__testOutFile, TestSceneCache.__testLinkedOutFile, TestSceneCache.__testHip, TestSceneCache.__testBgeo, TestSceneCache.__testBgeoGz, TestSceneCache.__testGeo ] :