Moved FBX export for turntable to temp folder

Author: ryanmayeda

core/templates.yml

@@ -389,6 +389,8 @@ paths:
     # level sequence review output from unreal
     unreal_movie_publish:
         definition: '[sequences/{Sequence}/][{Shot}/]editorial/{YYYY}_{MM}_{DD}/unreal/{level_sequence}_{world}.v{version}.avi'
+    unreal_shot_publish:
+        definition: '@shot_root/publish/unreal/{name}.v{version}.nk'
 
     ##########################################################################################
     # Asset pipeline
@@ -453,7 +455,7 @@ paths:
     maya_ue4_turntable_render:
         definition: '@asset_root/work/images/{name}_turntable_v{version}.avi'
     maya_ue4_turntable_publish:
-        definition: '@asset_root/review/{name}_turntable_v{version}.avi'
+        definition: '@asset_root/review/{Asset}_{name}_turntable_v{version}.avi'
 
 
     #
@@ -571,11 +573,11 @@ paths:
     # Unreal
     #
 
-    # static mesh export from unreal
-    unreal_asset_fbx_export:
-        definition: 'shotgun/fbx_export/{name}.fbx'
+    # Placeholder location for static mesh assets exported from Unreal
+    # Hook implementation intended to be a starting point for a pipeline
+    # No context info used in template, developers expected to further customize
     unreal_asset_publish:
-        definition: 'to_publish/{name}.fbx'
+        definition: 'assets/unrealdemo/exports/{YYYY}_{MM}_{DD}/{name}.fbx'
 
 
 #

env/includes/engine_locations.yml

@@ -84,5 +84,5 @@ engines.tk-unreal.location:
   type: git_branch
   path: [email protected]:shotgunsoftware/tk-unreal
   branch: master
-  version: 3d1b3407fb962b85a49b1f8970af4d305aa9ac1d
+  version: e589cdfe37b7eee89328920c26f913617d4ef5a3
 

env/includes/settings/tk-multi-publish2.yml

@@ -408,8 +408,6 @@ settings.tk-multi-publish2.motion_builder.shot_step:
 # project
 settings.tk-multi-publish2.unreal.project:
   collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
-  collector_settings:
-    Work Template: unreal_asset_fbx_export
   publish_plugins:
   - name: Publish to Shotgun
     hook: "{self}/publish_file.py"

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

@@ -11,6 +11,7 @@
 import subprocess
 import sys
 import shutil
+import datetime
 
 HookBaseClass = sgtk.get_hook_baseclass()
 
@@ -337,23 +338,29 @@ def publish(self, settings, item):
 
         # =======================
         # 1. Export the Maya scene to FBX
-        # The FBX will be exported to the current work folder, but any other
-        # destination folder could be specified instead
+        # 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
+        self.parent.ensure_folder_exists(self.temp_folder)
+        fbx_folder = self.temp_folder
+
+        # Get the filename from the work file
         work_path = item.properties.get("work_path")
         work_path = os.path.normpath(work_path)
-
-        # Split the destination path into folder and filename
-        fbx_folder = os.path.split(work_path)[0]
         work_name = os.path.split(work_path)[1]
-        work_name = os.path.splitext(work_name)[0]
+        work_name = os.path.splitext(work_name)[0]        
 
         # Replace non-word characters in filename, Unreal doesn't like those
         # Substitute '_' instead
         exp = re.compile(u"\W", re.UNICODE)
         work_name = exp.sub("_", work_name)
 
+        # Use current time as string as a unique identifier
+        now = datetime.datetime.now()
+        timestamp = str(now.hour) + str(now.minute) + str(now.second)
+
         # Replace file extension with .fbx and suffix it with "_turntable"
-        fbx_name = work_name + "_turntable.fbx"
+        fbx_name = work_name + "_" + timestamp + "_turntable.fbx"
         fbx_output_path = os.path.join(fbx_folder, fbx_name)
 
         # Export the FBX to the given output path
@@ -374,11 +381,8 @@ def publish(self, settings, item):
         script_path = os.path.abspath(script_path)
 
         # Workaround for script path with spaces in it
-        do_temp_folder_cleanup = False
         if " " in script_path:
             # Make temporary copies of the scripts to a path without spaces
-            self.parent.ensure_folder_exists(self.temp_folder)
-
             script_destination = self.temp_folder + "unreal_setup_turntable.py"
             shutil.copy(script_path, script_destination)
             script_path = script_destination
@@ -405,9 +409,6 @@ def publish(self, settings, item):
         script_args.append(turntable_map_path)
 
         self._unreal_execute_script(unreal_exec_path, unreal_project_path, script_path, script_args)
-        
-        if do_temp_folder_cleanup:
-            shutil.rmtree(self.temp_folder)
 
         # =======================
         # 4. Render the turntable to movie.
@@ -502,13 +503,16 @@ def finalize(self, settings, item):
         # bump the session file to the next version
         # self._save_to_next_version(item.properties["maya_path"], item, _save_session)
 
-        # Delete the exported FBX
-        fbx_path = item.properties.get("temp_fbx_path")
-        if fbx_path:
-            try:
-                os.remove(fbx_path)
-            except:
-                pass
+        # Delete the exported FBX and scripts from the temp folder
+        shutil.rmtree(self.temp_folder)
+
+        # Revive this when Unreal supports spaces in command line Python args
+        # fbx_path = item.properties.get("temp_fbx_path")
+        # if fbx_path:
+        #     try:
+        #         os.remove(fbx_path)
+        #     except:
+        #         pass
 
     def _get_version_entity(self, item):
         """