Merge pull request #278 from davidsminor/sxStringArrayOptions

added support for string array options in SXRenderer

Author: andrewkaufman

src/IECoreRI/SXRendererImplementation.cpp

@@ -166,6 +166,17 @@ void IECoreRI::SXRendererImplementation::setOption( const std::string &name, IEC
 					SxSetOption( m_stateStack.top().context.get(), name.c_str(), SxString, &s );
 					break;	
 				}
+			case StringVectorDataTypeId :
+				{
+					const std::vector<std::string>& strings = static_cast<const StringVectorData *>( value.get() )->readable();
+					std::vector< const char* > s;
+					for( size_t i=0; i < strings.size(); ++i )
+					{
+						s.push_back( strings[i].c_str() );
+					}
+					SxSetOption( m_stateStack.top().context.get(), name.c_str(), SxString, &(s[0]), s.size() );
+					break;	
+				}
 			default :
 				msg( Msg::Warning, "IECoreRI::SXRendererImplementation::setOption", format( "Unsupport type \"%s\"." ) % value->typeName() );
 		}

test/IECoreRI/SXRendererTest.py

@@ -900,6 +900,23 @@ def testUserOptions( self ):
 
 		s = r.shade( points )
 		self.assertEqual( s["Ci"][0], IECore.Color3f( 1,1,1 ) )
+	
+	def testStringArrayOptions( self ):
+		
+		self.assertEqual( os.system( "shaderdl -Irsl -o test/IECoreRI/shaders/sxStringArrayOptionTest.sdl test/IECoreRI/shaders/sxStringArrayOptionTest.sl" ), 0 )
+		
+		points = self.__rectanglePoints( IECore.Box2i( IECore.V2i( 0 ), IECore.V2i( 1 ) ) )	
+		
+		r = IECoreRI.SXRenderer()
+		r.shader( "surface", "test/IECoreRI/shaders/sxStringArrayOptionTest.sdl", {} )
+		
+		s = r.shade( points )
+		self.assertEqual( s["Ci"][0], IECore.Color3f( 0,0,0 ) )
+		
+		r.setOption( "user:stringArray", IECore.StringVectorData( ["this","should","work"] ) )
+		
+		s = r.shade( points )
+		self.assertEqual( s["Ci"][0], IECore.Color3f( 1,1,1 ) )
 
 
 	def testCoordinateSystems( self ):

test/IECoreRI/shaders/sxStringArrayOptionTest.sl

@@ -0,0 +1,18 @@
+surface sxStringArrayOptionTest()
+{
+	string stringArray[];
+	option("user:stringArray", stringArray);
+	
+	Ci = color(0);
+	if( arraylength( stringArray ) == 3 )
+	{
+		if(	stringArray[0] == "this" &&
+			stringArray[1] == "should" &&
+			stringArray[2] == "work"	)
+		{
+			Ci = color(1);
+		}
+	}
+	
+	
+}