refactor out of SDK, get material export util running

Signed-off-by: Jonny Galloway <[email protected]>

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Scripts/Python/Export/__init__.py

@@ -0,0 +1,16 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+# -------------------------------------------------------------------------
+# standard imports
+import logging as _logging
+
+from DccScriptingInterface.Tools.DCC.Maya.Scripts.Python import _PACKAGENAME
+_PACKAGENAME = f'{_PACKAGENAME}.export'
+_LOGGER = _logging.getLogger(_PACKAGENAME)
+
+__all__ = ['materials']

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/Scripts/Python/maya_menu_items/materials_helper.py → Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Scripts/Python/Export/materials.py

@@ -1,22 +1,43 @@
-import maya.cmds as mc
-from PySide2 import QtWidgets, QtCore, QtGui
-from azpy.o3de.renderer.materials import material_utilities
-from azpy.dcc.maya.helpers import maya_materials_conversion as material_utils
-from SDK.Python import general_utilities
-from maya import OpenMayaUI as omui
-from shiboken2 import wrapInstance
+
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+# -------------------------------------------------------------------------
+"""! @brief: todo: module docstring"""
+
+# standard imports
 from pathlib import Path
 import logging as _logging
 import os
 
+# o3de, dccsi imports
+from DccScriptingInterface.azpy.o3de.renderer.materials import material_utilities
+from DccScriptingInterface.azpy.dcc.maya.helpers import maya_materials_conversion as material_utils
+from DccScriptingInterface.azpy import general_utils
 
-mayaMainWindowPtr = omui.MQtUtil.mainWindow()
-mayaMainWindow = wrapInstance(int(mayaMainWindowPtr), QtWidgets.QWidget)
+# maya imports
+import maya.cmds as mc
+from maya import OpenMayaUI as omui
+from shiboken2 import wrapInstance
+from PySide2 import QtWidgets, QtCore, QtGui
 
+#  global scope
+from DccScriptingInterface.Tools.DCC.Maya.Scripts.Python.export import _PACKAGENAME
+_MODULENAME = f'{_PACKAGENAME}.materials'
+_LOGGER = _logging.getLogger(_MODULENAME)
+_LOGGER.info(f'Initializing: {_MODULENAME}')
 
-_LOGGER = _logging.getLogger('SDK.maya.scripts.Python.maya_menu.items')
+from DccScriptingInterface.globals import *
 
+mayaMainWindowPtr = omui.MQtUtil.mainWindow()
+mayaMainWindow = wrapInstance(int(mayaMainWindowPtr), QtWidgets.QWidget)
+# -------------------------------------------------------------------------
 
+
+# ---- First Class --------------------------------------------------------
 class MaterialsHelper(QtWidgets.QWidget):
     def __init__(self, operation, parent=None):
         super().__init__(parent)
@@ -369,17 +390,24 @@ class MaterialsHelper(QtWidgets.QWidget):
                 if os.path.splitext(file)[-1] in file_types:
                     file_list.append(root / file)
         return file_list
+# -------------------------------------------------------------------------
 
 
+# -------------------------------------------------------------------------
 def delete_instances():
+    """to do: docstring"""
+    from DccScriptingInterface.Tools.DCC.Maya.Scripts.Python.export import _PACKAGENAME
+
     for obj in mayaMainWindow.children():
-        if str(type(obj)) == "<class 'SDK.Maya.Scripts.Python.maya_menu_items.materials_helper.MaterialsHelper'>":
+        if str(type(obj)) == f"<class '{_PACKAGENAME}.MaterialsHelper'>":
             if obj.__class__.__name__ == "MaterialsHelper":
                 obj.setParent(None)
                 obj.deleteLater()
 
 
 def show_ui(operation):
+    """to do: docstring"""
     delete_instances()
     ui = MaterialsHelper(operation, mayaMainWindow)
     ui.show()
+# -------------------------------------------------------------------------

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Scripts/Python/__init__.py

@@ -0,0 +1,16 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+#
+# -------------------------------------------------------------------------
+# standard imports
+import logging as _logging
+
+from DccScriptingInterface.Tools.DCC.Maya.Scripts import _PACKAGENAME
+_PACKAGENAME = f'{_PACKAGENAME}.Python'
+_LOGGER = _logging.getLogger(_PACKAGENAME)
+
+__all__ = ['export']

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Scripts/__init__.py

@@ -1,5 +1,3 @@
-# coding:utf-8
-#!/usr/bin/python
 #
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -8,6 +6,12 @@
 #
 #
 # -------------------------------------------------------------------------
+# standard imports
+import logging as _logging
+
+from DccScriptingInterface.Tools.DCC.Maya import _PACKAGENAME
+_PACKAGENAME = f'{_PACKAGENAME}.Scripts'
+_LOGGER = _logging.getLogger(_PACKAGENAME)
 
 __all__ = ['set_callbacks',
            'set_defaults',

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Maya/Scripts/set_menu.py

@@ -55,15 +55,16 @@ def export_scene_materials(args):
     # for function to fire
 
     _LOGGER.info('Exporting Scene Materials')
+
     from importlib import reload
-    from azpy.dcc.maya.helpers import maya_materials_conversion
-    from azpy.o3de.renderer.materials import material_utilities
-    from azpy.o3de.renderer.materials import o3de_material_generator
-    from azpy.dcc.maya.helpers import convert_aiStandardSurface_material
-    from azpy.dcc.maya.helpers import convert_aiStandard_material
-    from azpy.dcc.maya.helpers import convert_stingray_material
-    from SDK.Python import general_utilities
-    from SDK.Maya.Scripts.Python.maya_menu_items import materials_helper
+    from DccScriptingInterface.azpy.dcc.maya.helpers import maya_materials_conversion
+    from DccScriptingInterface.azpy.o3de.renderer.materials import material_utilities
+    from DccScriptingInterface.azpy.o3de.renderer.materials import o3de_material_generator
+    from DccScriptingInterface.azpy.dcc.maya.helpers import convert_aiStandardSurface_material
+    from DccScriptingInterface.azpy.dcc.maya.helpers import convert_aiStandard_material
+    from DccScriptingInterface.azpy.dcc.maya.helpers import convert_stingray_material
+    from DccScriptingInterface.azpy import general_utils
+    from DccScriptingInterface.Tools.DCC.Maya.Scripts.Python.export import materials
 
     reload(maya_materials_conversion)
     reload(material_utilities)
@@ -71,9 +72,9 @@ def export_scene_materials(args):
     reload(convert_aiStandardSurface_material)
     reload(convert_aiStandard_material)
     reload(convert_stingray_material)
-    reload(general_utilities)
-    reload(materials_helper)
-    materials_helper.MaterialsHelper('convert')
+    reload(general_utils)
+    reload(materials)
+    materials.MaterialsHelper('convert')
 # -------------------------------------------------------------------------
 
 

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/IDE/Wing/.solutions/DCCsi_8x.wpr

@@ -155,6 +155,9 @@ proj.launch-config = {loc('../../../../../../../../../sample-code-gems/py_gems/P
         ('',
          'launch-H3gT8EPtxXR6YyOq')),
                       loc('../../../../azpy/env_base.py'): ('project',
+        ('',
+         'launch-H3gT8EPtxXR6YyOq')),
+                      loc('../../../../azpy/o3de/renderer/materials/template_generator.py'): ('project',
         ('',
          'launch-H3gT8EPtxXR6YyOq')),
                       loc('../../../../azpy/shared/__init__.py'): ('project',
@@ -209,6 +212,9 @@ proj.launch-config = {loc('../../../../../../../../../sample-code-gems/py_gems/P
         ('',
          'launch-H3gT8EPtxXR6YyOq')),
                       loc('../../../DCC/Blender/start.py'): ('project',
+        ('',
+         'launch-H3gT8EPtxXR6YyOq')),
+                      loc('../../../DCC/Maya/Scripts/Python/export/materials.py'): ('project',
         ('',
          'launch-H3gT8EPtxXR6YyOq')),
                       loc('../../../DCC/Maya/Scripts/userSetup.py'): ('project',

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py

@@ -32,17 +32,22 @@ _LOGGER = _logging.getLogger(_PACKAGENAME)
 _LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
 _MODULE_PATH = Path(__file__) # thos module should not be used as an entry
 
-__all__ = ['constants',
-           'config_utils',
-           'env_bool',
-           'return_stub',
-           'logger',
-           'core',
+__all__ = ['core',
            'dcc',
            'dev',
            'o3de',
            'shared',
-           'test']
+           'test',
+           'config_class',
+           'config_utils',
+           'constants',
+           'env_bool',
+           'general_utils',
+           'return_stub',
+           'logger']
+
+# future deprection of these modules
+# env_base and synthetic_env were precursors to using dynaconf
 
 from DccScriptingInterface import PATH_DCCSIG
 

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dcc/maya/__init__.py

@@ -30,7 +30,8 @@ _LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
 
 from DccScriptingInterface.globals import *
 
-__all__ = ['stub'] # only add here, if that sub-module does NOT require bpy!
+__all__ = ['stub'] # only add here, if that sub-module does NOT require
+# maya api such as maya.cmds, maya.OpenMaya, pymel, etc.
 # -------------------------------------------------------------------------
 
 
@@ -59,6 +60,7 @@ def init(_all=list()):
 try:
     import maya.cmds
     __all__ = init(__all__) # if we can import maya, we can load sub-modules
+    # which reply on maya apis
 except:
     pass # no changes to __all__
 

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dcc/maya/helpers/convert_aiStandardSurface_material.py

@@ -22,12 +22,12 @@
 # @section Maya Materials Notes
 # - Comments are Doxygen compatible
 
-from azpy.dcc.maya.helpers import maya_materials_conversion
-from SDK.Python import general_utilities as helpers
+from DccScriptingInterface.azpy.dcc.maya.helpers import maya_materials_conversion
+from DccScriptingInterface.azpy import general_utils as helpers
 import logging as _logging
 import maya.cmds as mc
 
-_LOGGER = _logging.getLogger('azpy.dcc.maya.helpers.convert_aiStandardSurface_material')
+_LOGGER = _logging.getLogger('DCCsi.azpy.dcc.maya.helpers.convert_aiStandardSurface_material')
 
 
 def get_material_info(target_material: str):

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dcc/maya/helpers/convert_aiStandard_material.py

@@ -22,14 +22,14 @@
 # @section Maya Materials Notes
 # - Comments are Doxygen compatible
 
-from azpy.dcc.maya.helpers import maya_materials_conversion
-from SDK.Python import general_utilities as helpers
+from DccScriptingInterface.azpy.dcc.maya.helpers import maya_materials_conversion
+from DccScriptingInterface.azpy import general_utils as helpers
 from pathlib import Path
 import logging as _logging
 import maya.cmds as mc
 
 
-_LOGGER = _logging.getLogger('azpy.dcc.maya.helpers.convert_aiStandard_material')
+_LOGGER = _logging.getLogger('DCCsi.azpy.dcc.maya.helpers.convert_aiStandard_material')
 
 
 def get_material_info(target_material: str):

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dcc/maya/helpers/convert_stingray_material.py

@@ -22,14 +22,14 @@
 # @section Maya Materials Notes
 # - Comments are Doxygen compatible
 
-from azpy.dcc.maya.helpers import maya_materials_conversion
-from SDK.Python import general_utilities as helpers
+from DccScriptingInterface.azpy.dcc.maya.helpers import maya_materials_conversion
+from DccScriptingInterface.azpy import general_utils as helpers
 import logging as _logging
 import maya.cmds as mc
 from pathlib import Path
 
 
-_LOGGER = _logging.getLogger('azpy.dcc.maya.helpers.convert_stingray_material')
+_LOGGER = _logging.getLogger('DCCsi.azpy.dcc.maya.helpers.convert_stingray_material')
 
 
 stingray_file_connections = [

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dcc/maya/helpers/maya_materials.py

@@ -1,5 +1,3 @@
-# coding:utf-8
-#!/usr/bin/python
 #
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -22,17 +20,24 @@
 # @section Maya Materials Notes
 # - Comments are Doxygen compatible
 
-
+# standard imports
 import os
 import logging as _logging
 from pathlib import Path
-import maya.cmds as mc
-from azpy.dcc.maya.utils import pycharm_debugger
-from azpy.dcc.maya.helpers import convert_arnold_material as arnold
-from azpy.dcc.maya.helpers import convert_stingray_material as stingray
 
+# o3de, dccsi imports
+from DccScriptingInterface.azpy.dcc.maya.helpers import convert_arnold_material as arnold
+from DccScriptingInterface.azpy.dcc.maya.helpers import convert_stingray_material as stingray
+
+# this breaks if you aren't running pycharm / pydev
+# need to wrap this safely with an envar or another mechanism
+# from azpy.dcc.maya.utils import pycharm_debugger
+
+# maya, pyside imports, etc
+import maya.cmds as mc
 
-_LOGGER = _logging.getLogger('azpy.dcc.maya.utils.maya_materials')
+# module global scope
+_LOGGER = _logging.getLogger('DCCsi.azpy.dcc.maya.utils.maya_materials')
 
 
 # TODO - You need to provide for creating new files while Maya is already open

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/dcc/maya/helpers/maya_materials_conversion.py

@@ -1,15 +1,11 @@
-#!/usr/bin/python
 #
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-
+#
+# -------------------------------------------------------------------------
 """! @brief This module contains several common material utilities/operations. """
 
 ##
@@ -24,18 +20,24 @@
 # @section Maya Materials Notes
 # - Comments are Doxygen compatible
 
-
+# standard imports
 import os
 import logging as _logging
 from pathlib import Path
-import maya.cmds as mc
-from azpy.dcc.maya.utils import pycharm_debugger
-from azpy.dcc.maya.helpers import convert_aiStandard_material as aiStandard
-from azpy.dcc.maya.helpers import convert_aiStandardSurface_material as aiStandardSurface
-from azpy.dcc.maya.helpers import convert_stingray_material as stingray
 
+# o3de, dccsi imports
+from DccScriptingInterface.azpy.dcc.maya.helpers import convert_aiStandard_material as aiStandard
+from DccScriptingInterface.azpy.dcc.maya.helpers import convert_aiStandardSurface_material as aiStandardSurface
+from DccScriptingInterface.azpy.dcc.maya.helpers import convert_stingray_material as stingray
+
+# this breaks if you aren't running pycharm / pydev
+# need to wrap this safely with an envar or another mechanism
+# from azpy.dcc.maya.utils import pycharm_debugger
+
+# maya, pyside imports, etc
+import maya.cmds as mc
 
-_LOGGER = _logging.getLogger('azpy.dcc.maya.utils.maya_materials_conversion')
+_LOGGER = _logging.getLogger('DCCsi.azpy.dcc.maya.utils.maya_materials_conversion')
 
 
 # TODO - You need to provide for creating new files while Maya is already open

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Python/general_utilities.py → Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/general_utils.py

@@ -1,16 +1,11 @@
-# -*- coding: utf-8 -*-
-# !/usr/bin/python
 #
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-
+#
+# -------------------------------------------------------------------------
 """! @brief This module contains several common utilities/operations for Python when creating tools for the DCCsi. """
 
 ##
@@ -25,17 +20,22 @@
 # @section QT Utilities Notes
 # - Comments are Doxygen compatible
 
+# standard imports
 import sqlite3
 from sqlite3 import Error
 from pathlib import Path
 from box import Box
-import logging
+import logging as _logging
 import json
 import re
 import os
 
-
-_LOGGER = logging.getLogger('SDK.DCC.Python.general_utilities')
+# module global scope
+from DccScriptingInterface.azpy import _PACKAGENAME
+_MODULENAME = f'{_PACKAGENAME}.general_utilities'
+_LOGGER = _logging.getLogger(_MODULENAME)
+_LOGGER.debug('Initializing: {0}.'.format({_MODULENAME}))
+# -------------------------------------------------------------------------
 
 
 def get_incremented_filename(name):
@@ -186,3 +186,4 @@ def get_database_values(cursor: sqlite3.Cursor, tables: list) -> dict:
         database_values[table] = table_values
     return database_values
 
+

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/o3de/renderer/materials/material_utilities.py

@@ -1,34 +1,36 @@
-# -*- coding: utf-8 -*-
-# !/usr/bin/python
 #
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
 #
+#
+# -------------------------------------------------------------------------
+"""! @brief To Do: module docstring here..."""
 
-"""! @brief Description here..."""
-
-from azpy.o3de.utils import o3de_utilities as o3de_helpers
-from azpy.o3de.renderer.materials import o3de_material_generator as exporter
-from azpy.constants import FRMT_LOG_LONG
-from SDK.Python import general_utilities as helpers
-import azpy.config_utils
-from PySide2 import QtWidgets
-from pathlib import Path
-import importlib
-from box import Box
+# standard imports
 import logging as _logging
 import click
 import json
 import os
+from pathlib import Path
+import importlib
+
+# dccsi 3rdparty
+from box import Box
+
+# dccsi imports
+from DccScriptingInterface.azpy.o3de.utils import o3de_utilities as o3de_helpers
+from DccScriptingInterface.azpy.o3de.renderer.materials import o3de_material_generator as exporter
+from DccScriptingInterface.azpy.constants import FRMT_LOG_LONG
+from DccScriptingInterface.azpy import general_utils as helpers
+import DccScriptingInterface.azpy.config_utils
+
+# maya and pyside imports, etc.
+from PySide2 import QtWidgets
 
 
-_LOGGER = _logging.getLogger('azpy.o3de.renderer.materials.material_utilities')
+_LOGGER = _logging.getLogger('DCCsi.azpy.o3de.renderer.materials.material_utilities')
 
 
 def run_cli():

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/o3de/renderer/materials/o3de_material_generator.py

@@ -12,8 +12,8 @@
 #
 
 """! @brief Description here..."""
-from azpy.o3de.renderer.materials import material_utilities
-from SDK.Python import general_utilities as helpers
+from DccScriptingInterface.azpy.o3de.renderer.materials import material_utilities
+from DccScriptingInterface.azpy import general_utils as helpers
 import logging as _logging
 from pathlib import Path
 from box import Box

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/o3de/renderer/materials/template_generator.py

@@ -18,13 +18,13 @@ import os
 from pathlib import Path
 from box import Box
 import logging as _logging
-import azpy.config_utils
-from azpy.o3de.utils import o3de_utilities as o3de_helpers
-from azpy.constants import FRMT_LOG_LONG
-from SDK.Python import general_utilities as helpers
+import DccScriptingInterface.azpy.config_utils
+from DccScriptingInterface.azpy.o3de.utils import o3de_utilities as o3de_helpers
+from DccScriptingInterface.azpy.constants import FRMT_LOG_LONG
+from DccScriptingInterface.azpy import general_utils as helpers
 
 
-_config = azpy.config_utils.get_dccsi_config()
+_config = DccScriptingInterface.azpy.config_utils.get_dccsi_config()
 settings = _config.get_config_settings()
 
 for handler in _logging.root.handlers[:]: