Merge pull request #161 from Unity-Technologies/Uni-26629-remove-preview

Uni-26629-remove-preview

Author: inwoods

Assets/FbxExporters/Integrations/Autodesk/maya/icons/preview.png

@@ -238,108 +238,6 @@ def invoke(cls):
         strCmd = '{0};'.format(cls.kCmdName)
         maya.mel.eval(strCmd)   # @UndefinedVariable
 
-class previewCmd(BaseCommand):
-    """
-    Preview Model in Unity Window
-        
-    @ingroup UnityCommands
-    """
-    kIconPath = "preview.png"
-    kLabel = 'Preview Model in Unity window'
-    kShortLabel = 'Preview'
-    kCmdName = "{}Preview".format(version.pluginPrefix())
-    kScriptCommand = 'import maya.cmds;maya.cmds.{0}()'.format(kCmdName)
-    kRuntimeCommand = "UnityOneClickPreview"
-    
-    def __init__(self):
-        super(self.__class__, self).__init__()
-    
-    @classmethod
-    def creator(cls):
-        return OpenMayaMPx.asMPxPtr(cls())
-    
-    @classmethod
-    def syntaxCreator(cls):
-        syntax = OpenMaya.MSyntax()
-        return syntax
-    
-    @classmethod
-    def scriptCmd(cls):
-        return
-    
-    def doIt(self, args):
-
-        unityAppPath = maya.cmds.optionVar(q='UnityApp')
-        unityProjectPath = maya.cmds.optionVar(q='UnityProject')
-        unityTempSavePath = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityTempSavePath'))
-        unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
-        if maya.cmds.optionVar(exists='UnityInstructionPath'):
-            instructionFile = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityInstructionPath'))
-        else:
-            self.displayError("Missing Unity instruction file path, please re-install integration.")
-            return
-        
-        # make sure the GamePipeline and fbxmaya plugins are loaded
-        if not self.loadDependencies():
-            return
-            
-        if not self.loadUnityFbxExportSettings():
-            return
-            
-        # select the export set for export, if it exists,
-        # otherwise take what is currently selected
-        origSelection = maya.cmds.ls(sl=True)
-        if self.setExists(self._exportSet):
-            maya.cmds.select(self._exportSet, r=True, ne=True)
-        
-        # save fbx to Assets/_safe_to_delete/
-        savePath = unityTempSavePath
-        maya.cmds.sysFile(savePath, makeDir=True)
-        savePath = os.path.join(savePath, "TurnTableModel.fbx")
-        savePath = os.path.abspath(savePath)
-        
-        maya.cmds.file(savePath, force=True, options="", typ="FBX export", pr=True, es=True)
-        
-        # create temp file in _safe_to_delete/
-        with open(instructionFile,"w+") as f:
-            pass
-        
-        if maya.cmds.about(macOS=True):
-            # Use 'open -a' to bring app to front if it has already been started.
-            # Note that the unity command will not get called.
-            melCommand = r'system("open -a \"{0}\" --args -projectPath \"{1}\" -executeMethod {2}");'\
-                .format(unityAppPath, unityProjectPath, unityCommand)
-
-        elif maya.cmds.about(linux=True):
-            melCommand = r'system("\"{0}\" -projectPath \"{1}\" -executeMethod {2}");'\
-                .format(unityAppPath, unityProjectPath, unityCommand)
-
-        elif maya.cmds.about(windows=True):
-            melCommand = r'system("start \"{0}\" \"{1}\" \"{2}\" \"-projectPath {3} -executeMethod {4}\"");'\
-                .format(unityProjectPath + "/Assets/FbxExporters/Integrations/BringToFront.exe", 
-                        os.path.basename(unityProjectPath), unityAppPath,
-                        unityProjectPath, unityCommand)
-
-        else:
-            raise NotImplementedError("missing platform implementation for {0}".format(maya.cmds.about(os=True)))
-
-        self.displayDebug('doIt({0})'.format(melCommand))
-
-        maya.mel.eval(melCommand)
-        
-        if origSelection:
-            maya.cmds.select(cl=True)
-            maya.cmds.select(origSelection, add=True, ne=True)
-
-    @classmethod
-    def invoke(cls):
-        """
-            Invoke command using mel so that it is executed and logged to script editor log
-            @return: void
-            """
-        strCmd = '{0};'.format(cls.kCmdName)
-        maya.mel.eval(strCmd)   # @UndefinedVariable
-
 class exportCmd(BaseCommand):
     """
     Export Model to Unity
@@ -407,62 +305,14 @@ def invoke(cls):
         strCmd = '{0};'.format(cls.kCmdName)
         maya.mel.eval(strCmd)   # @UndefinedVariable
 
-class configureCmd(BaseCommand):
-    """
-    Configure Maya Scene for previewing and exporting to Unity
-    
-    @ingroup UnityCommands
-    """
-    kLabel = 'Configure Maya to preview and export to a Unity Project'
-    kShortLabel = 'Configure'
-    kCmdName = "{}Configure".format(version.pluginPrefix())
-    kScriptCommand = 'import maya.cmds;maya.cmds.{0}()'.format(kCmdName)
-    kRuntimeCommand = "UnityOneClickConfigure"
-
-    def __init__(self):
-        super(self.__class__, self).__init__()
-
-    @classmethod
-    def creator(cls):
-        return OpenMayaMPx.asMPxPtr(cls())
-
-    @classmethod
-    def syntaxCreator(cls):
-        syntax = OpenMaya.MSyntax()
-        return syntax
-
-    @classmethod
-    def scriptCmd(cls):
-        return
-    
-    def doIt(self, args):
-        # make sure the GamePipeline plugin is loaded
-        if not self.loadDependencies():
-            return
-        
-        strCmd = 'SendToUnitySetProject'
-        self.displayDebug('doIt {0}'.format(strCmd))
-        maya.mel.eval(strCmd)
-        
-    @classmethod
-    def invoke(cls):
-        """
-        Invoke command using mel so that it is executed and logged to script editor log
-        @return: void
-        """
-        strCmd = '{0};'.format(cls.kCmdName)
-        maya.mel.eval(strCmd)   # @UndefinedVariable
-
 def register(pluginFn):
     """
     Register commands for plugin
     @param pluginFn (MFnPlugin): plugin object passed to initializePlugin
     """
     pluginFn.registerCommand(importCmd.kCmdName, importCmd.creator, importCmd.syntaxCreator)
-    pluginFn.registerCommand(previewCmd.kCmdName, previewCmd.creator, previewCmd.syntaxCreator)
     pluginFn.registerCommand(exportCmd.kCmdName, exportCmd.creator, exportCmd.syntaxCreator)
-    pluginFn.registerCommand(configureCmd.kCmdName, configureCmd.creator, configureCmd.syntaxCreator)
-    
+
     return
 
 def unregister(pluginFn):
@@ -471,9 +321,7 @@ def unregister(pluginFn):
     @param pluginFn (MFnPlugin): plugin object passed to uninitializePlugin
     """
     pluginFn.deregisterCommand(importCmd.kCmdName)
-    pluginFn.deregisterCommand(previewCmd.kCmdName)
     pluginFn.deregisterCommand(exportCmd.kCmdName)
-    pluginFn.deregisterCommand(configureCmd.kCmdName)
     return
 
 #===============================================================================
@@ -502,23 +350,13 @@ class importCmdTestCase(BaseCmdTest):
     """
     __cmd__ = importCmd
 
-class previewCmdTestCase(BaseCmdTest):
-    """UnitTest for testing the previewCmd command
-    """
-    __cmd__ = previewCmd
-
 class exportCmdTestCase(BaseCmdTest):
     """UnitTest for testing the exportCmd command
     """
     __cmd__ = exportCmd
 
-class configureCmdTestCase(BaseCmdTest):
-    """UnitTest for testing the configureCmd command
-    """
-    __cmd__ = configureCmd
-
 # NOTE: update this for test discovery
-test_cases = (importCmdTestCase, previewCmdTestCase, exportCmdTestCase, configureCmdTestCase,)
+test_cases = (importCmdTestCase, exportCmdTestCase,)
 
 def load_tests(loader, tests, pattern):
     suite = unittest.TestSuite()

Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/commands.py

@@ -95,13 +95,7 @@ def installMenu():
                        command=commands.importCmd.kScriptCommand,
                        image=commands.importCmd.iconPath(),
                        version=whatsNewVersion())
-    maya.cmds.menuItem(parent=kMenuName, 
-                       label=commands.previewCmd.kShortLabel, 
-                       annotation=commands.previewCmd.kLabel, 
-                       command=commands.previewCmd.kScriptCommand, 
-                       image=commands.previewCmd.iconPath(),
-                       version=whatsNewVersion())
-    maya.cmds.menuItem(parent=kMenuName, 
+    maya.cmds.menuItem(parent=kMenuName,
                        label=commands.exportCmd.kShortLabel, 
                        annotation=commands.exportCmd.kLabel, 
                        command=commands.exportCmd.kScriptCommand, 

Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/ui.py

@@ -19,6 +19,7 @@
 @defgroup UnityOneClickPluginVersion Plugin Version
 @ingroup UnityOneClickPlugin
 """
+VERSION = '1.0.0a1-sprint27'
 
 def pluginPrefix():
     """
@@ -32,14 +33,14 @@ def versionName():
     Return version string for the unityOneClick plugin
     @ingroup UnityOneClickPluginVersion
     """
-    return '0.0.14a'
+    return VERSION
 
 def pluginName():
     """
     Return name of unityOneClick plugin
     @ingroup UnityOneClickPluginVersion
     """
-    return '{}.unityOneClick'.format(pluginPrefix())
+    return 'UnityOneClick'
 
 def vendorName():
     """

Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/version.py

@@ -1,26 +1,28 @@
-# FbxExporters
+FbxExporters Package
+====================
 
 Copyright (c) 2017 Unity Technologies. All rights reserved.
 
 See LICENSE.txt file for full license information.
 
-VERSION: sprint26
+VERSION: 1.0.0a1-sprint27
 
 Requirements
 ------------
 
-* [FBX SDK C# Bindings](https://github.com/Unity-Technologies/FbxSharp)
+The Unity Integration for Maya is designed to work with Maya 2017 or later.
 
-Installing Maya Integration
---------------------------------------------
+Please note that MayaLT is not supported at this time.
 
-The easiest way to install the Maya integration is from the menu option in Unity.
+Installing Unity Integration for Maya
+-------------------------------------
 
-        FbxExporters -> Install Maya Integration
+The easiest way to install the Unity integration For Maya is from the FbxExports Settings panel in Unity.
+
+        MenuBar -> Edit -> Project Settings -> Fbx Export -> Install Unity Integration
 
 This menu item locates and uses the most recent version of Maya installed. If you want 
-to specify a custom version or location then set your MAYA_LOCATION environment 
-before running Unity.
+to specify a custom version or location you can browse and locate your version.
 
 Alternately, you can install the package and integrations from the command-line
 using a script, an example of which can be found in the scripts folder of the