MAYA-106190 - Prim type icons #782

seando-adsk · 2020-09-18T17:21:46Z

MAYA-106190 - Prim type icons

MAYA-106684 - ProxyShape icon

MAYA-106805 - Icons in the Create USD sub-menu

MAYA-106628 - Icons in the UFE menu and a DEF icon in the Outliner

MAYA-106629 - Generic USD icon in the main menu

Moved "ae" templates folder (from "lib/mayaUsd/") to new "resources" folder.
Added new "resources/icons" folder with all the prim Outliner icons. The icons are part of the MayaUsd_LIB so added icon folder in module path.
In UFE context menu added icon for "USD Layer Editor menu item.
In UFE context "Add New Prim" submenu added icons for all the prim types.
Implemented "treeViewIcon" override in UsdUIInfoHandler interface.
Added a few icons to the adsk MayaUsd plugin.
- mayaUsdProxyShape - outliner icon
- USD_stage/USD_generic used in menus
Removed "_usd" from proxy shape name, when creating a stage from file.

MAYA-106684 - ProxyShape icon MAYA-106805 - Icons in the Create USD sub-menu MAYA-106628 - Icons in the UFE menu and a DEF icon in the Outliner MAYA-106629 - Generic USD icon in the main menu * Moved "ae" templates folder (from "lib/mayaUsd/") to new "resources" folder. * Added new "resources/icons" folder with all the prim Outliner icons. The icons are part of the MayaUsd_LIB so added icon folder in module path. * In UFE context menu added icon for "USD Layer Editor menu item. * In UFE context "Add New Prim" submenu added icons for all the prim types. * Implemented "treeViewIcon" override in UsdUIInfoHandler interface. * Added a few icons to the adsk MayaUsd plugin. ** mayaUsdProxyShape - outliner icon ** USD_stage/USD_generic used in menus * Removed "_usd" from proxy shape name, when creating a stage from file.

lib/mayaUsd/CMakeLists.txt

seando-adsk · 2020-09-18T17:24:31Z

lib/mayaUsd/resources/icons/CMakeLists.txt

+        install(FILES "out_USD_${ICON_BASE}_100.png"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/icons"
+            RENAME "out_USD_${ICON_BASE}.png"
+        )
+        install(FILES "out_USD_${ICON_BASE}_150.png" "out_USD_${ICON_BASE}_200.png"
+            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/icons"
+        )


Install all the Outliner icon files (for the various prim types).

seando-adsk · 2020-09-18T17:26:55Z

lib/mayaUsd/ufe/UsdContextOps.cpp

@@ -275,7 +287,11 @@ Ufe::ContextOps::Items UsdContextOps::getItems(
        int hasLayerEditorCmd{0};
        MGlobal::executeCommand("runTimeCommand -exists UsdLayerEditor", hasLayerEditorCmd);
        if (hasLayerEditorCmd) {
+#if UFE_PREVIEW_VERSION_NUM >= 2023
+            items.emplace_back(kUSDLayerEditorItem, kUSDLayerEditorLabel, kUSDLayerEditorImage);


Added icon for the "USD Layer Editor" context menu item. And for the "Add New Prim" types below.

seando-adsk · 2020-09-18T17:28:00Z

lib/mayaUsd/ufe/UsdSceneItem.cpp

-		TF_CODING_ERROR("Could not find prim type '%s' for prim %s",
-			fPrim.GetTypeName().GetText(), UsdDescribe(fPrim).c_str());


This error was too extreme. There are nodes which don't have a schema type, so just silently return empty ancestor types.

seando-adsk · 2020-09-18T17:28:39Z

lib/mayaUsd/ufe/UsdUIInfoHandler.cpp

@@ -71,6 +73,48 @@ bool UsdUIInfoHandler::treeViewCellInfo(const Ufe::SceneItem::Ptr& item, Ufe::Ce
 	return changed;
 }

+std::string UsdUIInfoHandler::treeViewIcon(const Ufe::SceneItem::Ptr& item) const


Override this UFE method to provide an image for specific node types. Avoids the ancestor types call.

seando-adsk · 2020-09-18T17:29:14Z

lib/mayaUsd/ufe/UsdUIInfoHandler.cpp

+	if (!item) {
+		return "out_USD_UsdTyped.png";	// Default USD icon
+	}


Can call with nullptr to get a default USD icon.

lib/mayaUsd/ufe/UsdUIInfoHandler.cpp

seando-adsk · 2020-09-18T17:30:09Z

modules/mayaUSD.mod.template

@@ -8,7 +8,7 @@ PYTHONPATH+:=lib/python
 USD_LOCATION:=

 + MayaUSD_LIB ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}
-icons: 
+icons: lib/icons


All the outliner icons above were added to this folder (as part of the base lib). So that any of the 3 plugins will get them.

seando-adsk · 2020-09-18T17:30:37Z

plugin/adsk/icons/CMakeLists.txt

+set(PLUGIN_ICONS
+    out_mayaUsdProxyShape
+    USD_generic
+    USD_stage
+)


These icons are specific to the adsk mayausd plugin.

seando-adsk · 2020-09-18T17:31:17Z

plugin/adsk/scripts/mayaUsd_createStageFromFile.mel

-    if( isValidObjectName($baseName) )
-        $baseName += "_usd";


As per spec from Nat, remove this _usd from proxy shape name.

lib/mayaUsd/ufe/UsdUIInfoHandler.cpp

ppt-adsk · 2020-09-18T19:33:12Z

lib/mayaUsd/ufe/UsdUIInfoHandler.cpp

+	}
+
+	// We support these node types directly.
+	static const std::map<std::string, std::string> supportedTypes{


Just to avoid repetition, could we have a really small map with the exceptions (empty string and "AL_MayaReference"), and a set for the rest? I.e.

static const std::map<std::string, std::string> exceptionsTypes {
{"", "out_USD_Def.png"},
{"AL_MayaReference", "out_USD_mayaReference.png"}};
if (inTheExceptionsTypes) {
return that;
}
static const std::setstd::string supportedTypes {"BlendShape", "Camera", ...};
if (inSupportedTypes) {
return "out_USD_" + theType + ".png";
}

It is not really repetition as the map key is node type, which are never repeated. I see your point, but I like the current table. It is very clear what icon filename is associated with each node type. What benefit do you see from your suggestion? It actually requires a 2nd search.

Don't think the second search is a big deal. The repetition is in having the type twice, once in the key type, once in the mapped type, when the mapped type is simply the key type with a fixed prefix and a fixed suffix. Therefore, the set feels more appropriate, because there really is just one value in the associative data structure, the key type.

If you like the way it is now, I don't have that strong an opinion on it, so I'll leave it up to you.

ppt-adsk · 2020-09-21T15:30:39Z

lib/mayaUsd/ufe/UsdUIInfoHandler.cpp

+	}
+
+	// We support these node types directly.
+	static const std::map<std::string, std::string> supportedTypes{


Don't think the second search is a big deal. The repetition is in having the type twice, once in the key type, once in the mapped type, when the mapped type is simply the key type with a fixed prefix and a fixed suffix. Therefore, the set feels more appropriate, because there really is just one value in the associative data structure, the key type.

If you like the way it is now, I don't have that strong an opinion on it, so I'll leave it up to you.

seando-adsk commented Sep 18, 2020

View reviewed changes

seando-adsk requested a review from ppt-adsk September 18, 2020 17:31

seando-adsk added adsk Related to Autodesk plugin core Related to core library enhancement New feature or request requires maya This issue requires changes in Maya ufe-usd Related to UFE-USD plugin in Maya-Usd labels Sep 18, 2020

ppt-adsk reviewed Sep 18, 2020

View reviewed changes

ppt-adsk approved these changes Sep 21, 2020

View reviewed changes

seando-adsk assigned ecp-maya-devops-adsk and unassigned ecp-maya-devops-adsk Sep 21, 2020

seando-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Sep 22, 2020

kxl-adsk merged commit 77ff438 into dev Sep 22, 2020

kxl-adsk deleted the donnels/MAYA-106190/prim_type_icons branch September 22, 2020 20:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MAYA-106190 - Prim type icons #782

MAYA-106190 - Prim type icons #782

seando-adsk commented Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

seando-adsk Sep 18, 2020

ppt-adsk Sep 18, 2020

seando-adsk Sep 21, 2020

ppt-adsk Sep 21, 2020

ppt-adsk Sep 21, 2020

		TF_CODING_ERROR("Could not find prim type '%s' for prim %s",
		fPrim.GetTypeName().GetText(), UsdDescribe(fPrim).c_str());

MAYA-106190 - Prim type icons #782

MAYA-106190 - Prim type icons #782

Conversation

seando-adsk commented Sep 18, 2020

MAYA-106190 - Prim type icons

MAYA-106684 - ProxyShape icon

MAYA-106805 - Icons in the Create USD sub-menu

MAYA-106628 - Icons in the UFE menu and a DEF icon in the Outliner

MAYA-106629 - Generic USD icon in the main menu

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment