From 541c5cf87cc53b4c389f47d16fcd2698a2a034d6 Mon Sep 17 00:00:00 2001 From: Andrew Kaufman Date: Thu, 24 Oct 2013 16:25:32 -0700 Subject: [PATCH] Adding new Cortex logo graphics. Also installing them for IECoreHoudini and using the for ParameterisedHolders, Converter SOP, and SceneCache ROP. Still need to replace the other SceneCache icons, but those will be customized by function --- SConstruct | 2 +- graphics/CortexLogo.svg | 53 +++++++++++++++++++++++++++++ graphics/CortexLogoMini.svg | 17 +++++++++ src/IECoreHoudini/plugin/Plugin.cpp | 9 +++-- 4 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 graphics/CortexLogo.svg create mode 100644 graphics/CortexLogoMini.svg diff --git a/SConstruct b/SConstruct index 59f0ee55da..924c0b48bd 100644 --- a/SConstruct +++ b/SConstruct @@ -2670,7 +2670,7 @@ if doConfigure : #===== # install icons #===== - houdiniIcons = glob.glob( "icons/IECoreHoudini/*.svg" ) + houdiniIcons = glob.glob( "icons/IECoreHoudini/*.svg" ) + glob.glob( "graphics/CortexLogo*.svg" ) houdiniIconInstall = houdiniPluginEnv.Install( "$INSTALL_HOUDINIICON_DIR", source=houdiniIcons ) houdiniPluginEnv.Alias( "install", houdiniIconInstall ) houdiniPluginEnv.Alias( "installHoudini", houdiniIconInstall ) diff --git a/graphics/CortexLogo.svg b/graphics/CortexLogo.svg new file mode 100644 index 0000000000..8d691094ea --- /dev/null +++ b/graphics/CortexLogo.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/CortexLogoMini.svg b/graphics/CortexLogoMini.svg new file mode 100644 index 0000000000..bbbb073576 --- /dev/null +++ b/graphics/CortexLogoMini.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/src/IECoreHoudini/plugin/Plugin.cpp b/src/IECoreHoudini/plugin/Plugin.cpp index edf48129e3..c8f1f2bcc7 100644 --- a/src/IECoreHoudini/plugin/Plugin.cpp +++ b/src/IECoreHoudini/plugin/Plugin.cpp @@ -87,21 +87,21 @@ void newSopOperator(OP_OperatorTable *table) SOP_OpHolder::create, SOP_ParameterisedHolder::parameters, 0, 4, SOP_ParameterisedHolder::variables, OP_FLAG_GENERATOR ); - opHolder->setIconName( "SOP_ieOpHolder" ); + opHolder->setIconName( "CortexLogoMini" ); OP_Operator *proceduralHolder = new OP_Operator( "ieProceduralHolder", "Cortex Procedural", SOP_ProceduralHolder::create, SOP_ParameterisedHolder::parameters, 0, 4, SOP_ParameterisedHolder::variables, OP_FLAG_GENERATOR ); - proceduralHolder->setIconName( "SOP_ieProceduralHolder" ); + proceduralHolder->setIconName( "CortexLogoMini" ); OP_Operator *converter = new OP_Operator( SOP_CortexConverter::typeName, "Cortex Convert", SOP_CortexConverter::create, SOP_CortexConverter::parameters, 1, 1, SOP_CortexConverter::variables, OP_FLAG_GENERATOR ); - converter->setIconName( "SOP_ieCortexConverter" ); + converter->setIconName( "CortexLogoMini" ); OP_Operator *cacheReader = new OP_Operator( "ieInterpolatedCacheReader", "Interpolated Cache Reader", @@ -160,8 +160,7 @@ void newDriverOperator( OP_OperatorTable *table ) ROP_SceneCacheWriter::create, ROP_SceneCacheWriter::buildParameters(), 0, 999, 0, OP_FLAG_GENERATOR ); - /// \todo: get a new icon - sceneCacheWriter->setIconName( "SOP_ieCortexConverter" ); + sceneCacheWriter->setIconName( "CortexLogoMini" ); table->addOperator( sceneCacheWriter );