Merge pull request #13 from GPLgithub/master

PySide6 and Maya 2025 fixes, UE 5.4 turntable project

Author: ryanmayeda

azure-pipelines.yml

@@ -24,6 +24,18 @@ jobs:
   strategy:
     matrix:
       # Define all the platform/python version we need
+      MacPython39:
+        platform: 'osx'  # Short name for us
+        imageName: 'macOS-latest'
+        python.version: '3.9'
+      WinPython39:
+        platform: 'win' # Short name for us
+        imageName: 'windows-latest'
+        python.version: '3.9'
+      LinuxPython39:
+        platform: 'linux'  # Short name for us
+        imageName: 'ubuntu-latest'
+        python.version: '3.9'
       MacPython311:
         platform: 'osx'  # Short name for us
         imageName: 'macOS-latest'

hooks/core/bootstrap.py

@@ -27,7 +27,7 @@
 
 class Bootstrap(get_hook_baseclass()):
     """
-    Override the bootstrap core hook to cache some bundles ourselves.
+    Override the bootstrap core hook to cache ourself some bundles.
     http://developer.shotgunsoftware.com/tk-core/core.html#bootstrap.Bootstrap
     """
     # List of github repos for which we download releases, with a github token to
@@ -97,7 +97,7 @@ def populate_bundle_cache_entry(self, destination, descriptor, **kwargs):
             if self.shotgun.config.proxy_handler:
                 # Re-use proxy settings from the Shotgun connection
                 opener = url2.build_opener(
-                    self.parent.shotgun.config.proxy_handler,
+                    self.shotgun.config.proxy_handler,
                 )
                 url2.install_opener(opener)
 
@@ -229,7 +229,7 @@ def _download_zip_github_asset(self, asset, destination, token):
         if self.shotgun.config.proxy_handler:
             # Re-use proxy settings from the Shotgun connection
             opener = url2.build_opener(
-                self.parent.shotgun.config.proxy_handler,
+                self.shotgun.config.proxy_handler,
                 auth_handler
             )
         else:

hooks/tk-multi-publish2/tk-maya/basic/publish_fbx.py

@@ -7,7 +7,6 @@
 import maya.mel as mel
 import sgtk
 from sgtk.util.filesystem import ensure_folder_exists
-from tank_vendor import six
 
 HookBaseClass = sgtk.get_hook_baseclass()
 
@@ -294,9 +293,27 @@ def validate(self, settings, item):
 
         return True
 
+    def _copy_to_publish(self, settings, item):
+        """
+        Override base implementation to do nothing
+        since we're not copying a file but exporting
+        directly to the publish location.
+        """
+        pass
+
+    def _copy_local_to_publish(self, settings, item):
+        """
+        Override base implementation to do nothing
+        since we're not copying a file but exporting
+        directly to the publish location.
+        """
+        pass
+
     def _copy_work_to_publish(self, settings, item):
         """
-        Override base implementation to do nothing.
+        Override base implementation to do nothing
+        since we're not copying a file but exporting
+        directly to the publish location.
         """
         pass
 
@@ -363,13 +380,9 @@ def finalize(self, settings, item):
 def _session_path():
     """
     Return the path to the current session
-    :return:
+    :return: A string or ``None``.
     """
     path = cmds.file(query=True, sn=True)
-
-    if path is not None:
-        path = six.ensure_str(path)
-
     return path
 
 

hooks/tk-multi-publish2/tk-maya/basic/publish_turntable.py

@@ -19,7 +19,7 @@
 import subprocess
 import sys
 import tempfile
-from six.moves.urllib import parse
+from urllib import parse
 
 HookBaseClass = sgtk.get_hook_baseclass()
 
@@ -40,9 +40,19 @@ def __init__(self, with_open_button=False, *args, **kwargs):
         self.combo_box.setEditable(True)
         self.combo_box.setMaxVisibleItems(10)
         # Prevent the QComboBox to get too big if the path is long.
-        self.combo_box.setSizeAdjustPolicy(
-            QtGui.QComboBox.AdjustToMinimumContentsLength
-        )
+        engine = sgtk.platform.current_engine()
+        # Note: it would be better to test for Qt4 or Qt5 so this
+        # wouldn't have to be changed when moving to new major
+        # releases of Qt, but has_qt4 and has_qt5 returns True
+        # even when PySide6 is being used.
+        if engine.has_qt6:
+            self.combo_box.setSizeAdjustPolicy(
+                QtGui.QComboBox.AdjustToMinimumContentsLengthWithIcon
+            )
+        else:  # Qt4 or Qt5
+            self.combo_box.setSizeAdjustPolicy(
+                QtGui.QComboBox.AdjustToMinimumContentsLength
+            )
 
         self.open_button = QtGui.QToolButton()
         icon = QtGui.QIcon()
@@ -92,7 +102,7 @@ def get_path(self):
 
         :returns: An utf-8 encoded string.
         """
-        return six.ensure_str(self.combo_box.currentText())
+        return self.combo_box.currentText()
 
     def set_path(self, path):
         """
@@ -540,14 +550,14 @@ def get_ui_settings(self, widget):
         # Please note that we don't have to return all settings here, just the
         # settings which are editable in the UI.
         settings = {
-            "Unreal Engine Version": six.ensure_str(widget.unreal_setup_widget.unreal_version),
-            "Unreal Engine Path": six.ensure_str(widget.unreal_setup_widget.unreal_path),
+            "Unreal Engine Version": widget.unreal_setup_widget.unreal_version,
+            "Unreal Engine Path": widget.unreal_setup_widget.unreal_path,
             # Get the project path evaluated from the template or the value which
             # was manually set.
-            "Unreal Project Path": six.ensure_str(widget.unreal_setup_widget.unreal_project_path),
-            "Turntable Map Path": six.ensure_str(widget.unreal_turntable_map_widget.text()),
-            "Sequence Path": six.ensure_str(widget.unreal_sequence_widget.text()),
-            "Turntable Assets Path": six.ensure_str(widget.unreal_turntable_asset_widget.text()),
+            "Unreal Project Path": widget.unreal_setup_widget.unreal_project_path,
+            "Turntable Map Path": widget.unreal_turntable_map_widget.text(),
+            "Sequence Path": widget.unreal_sequence_widget.text(),
+            "Turntable Assets Path": widget.unreal_turntable_asset_widget.text(),
             # "HDR Path": widget.hdr_image_template_widget.get_path(),
             # "Start Frame": widget.start_frame_spin_box.value(),
             # "End Frame": widget.end_frame_spin_box.value(),
@@ -970,15 +980,22 @@ def publish(self, settings, item):
         publish_path = self.get_publish_path(settings, item)
         publish_path = os.path.normpath(publish_path)
 
-        # This plugin publishes a turntable movie to Shotgun
+        # This plugin publishes a turntable movie to FPTR
         # These are the steps needed to do that
 
         # =======================
         # 1. Export the Maya scene to FBX
         # The FBX will be exported to a temp folder
         # Another folder can be specified as long as the name has no spaces
         # Spaces are not allowed in command line Unreal Python args
-        temp_folder = tempfile.mkdtemp(suffix="temp_unreal_shotgun")
+
+        # Set a base temp dir on Windows to avoid having
+        # the user name in the temp path which can include
+        # "." e.g. firstname.name and makes UE crashes
+        base_temp_dir = None
+        if sys.platform == "win32":
+            base_temp_dir = r"C:\Temp"
+        temp_folder = tempfile.mkdtemp(suffix="temp_unreal_shotgun", dir=base_temp_dir)
         # Store the temp folder path on the item for cleanup in finalize
         item.local_properties["temp_folder"] = temp_folder
         fbx_folder = temp_folder
@@ -1033,7 +1050,7 @@ def publish(self, settings, item):
         # Use the unreal_setup_turntable to do this in Unreal
         self.logger.info("Setting up Unreal turntable project...")
         # Copy the Unreal project in a temp location so we can modify it
-        temp_dir = tempfile.mkdtemp()
+        temp_dir = tempfile.mkdtemp(dir=base_temp_dir)
         project_path, project_file = os.path.split(unreal_project_path)
         project_folder = os.path.basename(project_path)
         temp_project_dir = os.path.join(temp_dir, project_folder)
@@ -1083,13 +1100,13 @@ def publish(self, settings, item):
         # "environment can only contain strings" erors will happen.
         extra_env = {
             # The FBX to import into Unreal
-            "UNREAL_SG_FBX_OUTPUT_PATH": six.ensure_str(fbx_output_path),
+            "UNREAL_SG_FBX_OUTPUT_PATH": fbx_output_path,
             # The Unreal content browser folder where the asset will be imported into
-            "UNREAL_SG_ASSETS_PATH": six.ensure_str(turntable_assets_path),
+            "UNREAL_SG_ASSETS_PATH": turntable_assets_path,
             # The Unreal turntable map to duplicate where the asset will be instantiated into
-            "UNREAL_SG_MAP_PATH": six.ensure_str(turntable_map_path),
-            "UNREAL_SG_SEQUENCE_PATH": six.ensure_str(sequence_path),
-            "UNREAL_SG_MOVIE_OUTPUT_PATH": six.ensure_str(publish_path),
+            "UNREAL_SG_MAP_PATH": turntable_map_path,
+            "UNREAL_SG_SEQUENCE_PATH": sequence_path,
+            "UNREAL_SG_MOVIE_OUTPUT_PATH": publish_path,
         }
         self.logger.info("Adding %s to the environment" % extra_env)
         run_env.update(extra_env)
@@ -1581,12 +1598,31 @@ def evaluate_unreal_project_path(self, unreal_project_path_template, unreal_engi
             )
         )
 
+    def _copy_to_publish(self, settings, item):
+        """
+        Override base implementation to do nothing
+        since we're not copying a file but rendering
+        directly to the publish location.
+        """
+        pass
+
+    def _copy_local_to_publish(self, settings, item):
+        """
+        Override base implementation to do nothing
+        since we're not copying a file but rendering
+        directly to the publish location.
+        """
+        pass
+
     def _copy_work_to_publish(self, settings, item):
         """
-        Override base implementation to do nothing.
+        Override base implementation to do nothing
+        since we're not copying a file but rendering
+        directly to the publish location.
         """
         pass
 
+
 def _short_version(version):
     """
     Return a short major.minor version for the given version.
@@ -1598,7 +1634,7 @@ def _short_version(version):
     """
     parts = version.split(".", 2)
     if len(parts) > 2:
-         return ".".join(parts[:2])
+        return ".".join(parts[:2])
     return version
 
 

resources/ueprojects/5.2/turntable/Config/DefaultEditor.ini

@@ -0,0 +1,2 @@
+
+

resources/ueprojects/5.2/turntable/Config/DefaultEngine.ini

@@ -0,0 +1,26 @@
+[/Script/HardwareTargeting.HardwareTargetingSettings]
+TargetedHardwareClass=Desktop
+AppliedTargetedHardwareClass=Desktop
+DefaultGraphicsPerformance=Maximum
+AppliedDefaultGraphicsPerformance=Maximum
+
+[/Script/WmfMediaFactory.WmfMediaSettings]
+AllowNonStandardCodecs=True
+LowLatency=False
+NativeAudioOut=False
+HardwareAcceleratedVideoDecoding=True
+
+[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
+bEnablePlugin=True
+bAllowNetworkConnection=True
+SecurityToken=4F99E4E87844874F1DAD32833EBC3ACB
+bIncludeInShipping=False
+bAllowExternalStartInShipping=False
+bCompileAFSProject=False
+bUseCompression=False
+bLogFiles=False
+bReportStats=False
+ConnectionType=USBOnly
+bUseManualIPAddress=False
+ManualIPAddress=
+

resources/ueprojects/5.2/turntable/Config/DefaultGame.ini

@@ -0,0 +1,2 @@
+[/Script/EngineSettings.GeneralProjectSettings]
+ProjectID=B6599CB54F66B6CFD93DC3A95CB55C3D

resources/ueprojects/5.2/turntable/Config/DefaultInput.ini

@@ -0,0 +1,86 @@
+[/Script/Engine.InputSettings]
+-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
++AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Mouse2D",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Vive_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MixedReality_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="OculusTouch_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Left_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Grip_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trigger_Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="ValveIndex_Right_Trackpad_Force",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
+bAltEnterTogglesFullscreen=True
+bF11TogglesFullscreen=True
+bUseMouseForTouch=False
+bEnableMouseSmoothing=True
+bEnableFOVScaling=True
+bCaptureMouseOnLaunch=True
+bEnableLegacyInputScales=True
+bEnableMotionControls=True
+bFilterInputByPlatformUser=False
+bEnableInputDeviceSubsystem=True
+bShouldFlushPressedKeysOnViewportFocusLost=True
+bEnableDynamicComponentInputBinding=True
+bAlwaysShowTouchInterface=False
+bShowConsoleOnFourFingerTap=True
+bEnableGestureRecognizer=False
+bUseAutocorrect=False
+DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown
+DefaultViewportMouseLockMode=LockOnCapture
+FOVScale=0.011110
+DoubleClickTime=0.200000
+DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput
+DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent
+DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
+-ConsoleKeys=Tilde
++ConsoleKeys=Tilde
+