Skip to content

Commit b22b3f1

Browse files
inwoodsinwoods
authored
Merge pull request #172 from Unity-Technologies/UNI-27141-rename-maya-plugin
UNI-27141 rename unityoneclick to UnityFbxForMaya
2 parents 1687308 + c7b2dc3 commit b22b3f1

File tree

14 files changed

+48
-48
lines changed

14 files changed

+48
-48
lines changed

‎Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace FbxExporters.Editor
77
{
88
public class Integrations
99
{
10-
private const string MODULE_FILENAME = "unityoneclick";
10+
private const string MODULE_FILENAME = "UnityFbxForMaya";
1111
private const string PACKAGE_NAME = "FbxExporters";
1212
private const string VERSION_FILENAME = "README.txt";
1313
private const string VERSION_FIELD = "VERSION";
@@ -58,7 +58,7 @@ private static string ESCAPED_QUOTE {
5858
}
5959

6060
private static string MAYA_COMMANDS { get {
61-
return string.Format("configureUnityOneClick {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {0}{5}{0} {6}; scriptJob -idleEvent quit;",
61+
return string.Format("configureUnityFbxForMaya {0}{1}{0} {0}{2}{0} {0}{3}{0} {0}{4}{0} {0}{5}{0} {6}; scriptJob -idleEvent quit;",
6262
ESCAPED_QUOTE, GetProjectPath(), GetAppPath(), GetTempSavePath(),
6363
GetExportSettingsPath(), GetMayaInstructionPath(), (IsHeadlessInstall()?1:0));
6464
}}
@@ -323,7 +323,7 @@ public static bool InstallMaya(bool verbose = false)
323323
}
324324
else
325325
{
326-
// detect if unityoneclick.mod is installed
326+
// detect if UnityFbxForMaya.mod is installed
327327
installed = System.IO.File.Exists(moduleFilePath);
328328

329329
if (installed)

‎Assets/FbxExporters/Integrations/Autodesk/maya/README.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ Manual Installation
3030
Instructions for installing if you don't use the unity package installer
3131
and your installing in a non-default location.
3232

33-
1. copy unityoneclick.mod to user folder
33+
1. copy UnityFbxForMaya.mod to user folder
3434

3535
MacOS & Ubuntu: ~/MayaProjects/modules
3636
Windows: C:\Program Files\Autodesk\Maya2017\modules
3737

38-
2. configure path within unityoneclick.mod to point to integration installation folder
38+
2. configure path within UnityFbxForMaya.mod to point to integration installation folder
3939

4040
{UnityProject}/Assets/Integrations/Autodesk/maya2017
4141

@@ -53,4 +53,4 @@ export PYTHONPATH=${MAYA_INTEGRATION_PATH}/scripts
5353
${MAYAPY_PATH} ${MAYA_INTEGRATION_PATH}/scripts/run_all_tests.py
5454

5555
# run one test
56-
${MAYAPY_PATH} ${MAYA_INTEGRATION_PATH}/scripts/unityOneClick/commands.py
56+
${MAYAPY_PATH} ${MAYA_INTEGRATION_PATH}/scripts/UnityFbxForMaya/commands.py

‎Assets/FbxExporters/Integrations/Autodesk/maya/unityoneclick.txt renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/UnityFbxForMaya.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
#
1414
########################################################################
1515

16-
+ unityoneclick {Version} {UnityProject}/Assets/FbxExporters/Integrations/Autodesk/maya
16+
+ UnityFbxForMaya {Version} {UnityProject}/Assets/FbxExporters/Integrations/Autodesk/maya

‎Assets/FbxExporters/Integrations/Autodesk/maya/plug-ins/unityOneClickPlugin.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/plug-ins/UnityFbxForMayaPlugin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import maya.OpenMayaMPx as OpenMayaMPx
2121
import maya.cmds
2222

23-
from unityOneClick import (version, commands, ui, debug)
23+
from UnityFbxForMaya import (version, commands, ui, debug)
2424

2525
kPluginInfo = { 'name': version.pluginName(), 'version': version.versionName(), 'vendor': version.vendorName() }
2626
kVerbose = True
27-
kHeadlessInstall = (maya.cmds.optionVar( exists='UnityOneClick_Headless')
28-
and maya.cmds.optionVar(q='UnityOneClick_Headless') == 1)
27+
kHeadlessInstall = (maya.cmds.optionVar( exists='UnityFbxForMaya_Headless')
28+
and maya.cmds.optionVar(q='UnityFbxForMaya_Headless') == 1)
2929

3030
# initialize the script plug-in
3131
def initializePlugin(mobject):

‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/__init__.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
########################################################################
1515
"""
1616
Maya Unity Integration
17-
@package unityOneClick
17+
@package UnityFbxForMaya
1818
@author Simon Inwood <[email protected]>
19-
@defgroup unityOneClickPlugin Unity Plugin
19+
@defgroup UnityFbxForMayaPlugin Unity Plugin
2020
2121
@brief
2222

‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/basetestcase.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/basetestcase.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import maya.cmds
2525
import maya.mel
2626

27-
from unityOneClick.logger import LoggerMixin
27+
from UnityFbxForMaya.logger import LoggerMixin
2828

2929
try:
3030
import maya.standalone
3131
maya.standalone.initialize()
32-
print "unityOneClick standalone"
32+
print "UnityFbxForMaya standalone"
3333
except:
3434
pass
3535

‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/commands.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/commands.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
"""
1616
@package commands
1717
@defgroup UnityCommands Commands
18-
@ingroup UnityOneClickPlugin
18+
@ingroup UnityFbxForMayaPlugin
1919
@author Simon Inwood <[email protected]>
2020
"""
2121

22-
from unityOneClick.logger import LoggerMixin
22+
from UnityFbxForMaya.logger import LoggerMixin
2323

2424
import maya.OpenMaya as OpenMaya # @UnresolvedImport
2525
import maya.OpenMayaMPx as OpenMayaMPx # @UnresolvedImport
2626
import maya.mel
2727
import maya.cmds
2828

29-
import unityOneClick.version as version
29+
import UnityFbxForMaya.version as version
3030

3131
import ctypes
3232
ctypes.pythonapi.PyCObject_AsVoidPtr.restype = ctypes.c_void_p
@@ -36,11 +36,11 @@
3636

3737
class BaseCommand(OpenMayaMPx.MPxCommand, LoggerMixin):
3838
"""
39-
Base class for UnityOneClick Plugin Commands.
39+
Base class for UnityFbxForMaya Plugin Commands.
4040
"""
4141
kIconPath = ""
4242
kFamilyIcon = 'unity.png'
43-
kFamilyLabel = "The UnityOneClick plugin allows you to reliably exchange and review your work between Maya and Unity."
43+
kFamilyLabel = "The UnityFbxForMaya plugin allows you to reliably exchange and review your work between Maya and Unity."
4444

4545
def __init__(self):
4646
OpenMayaMPx.MPxCommand.__init__(self)
@@ -123,7 +123,7 @@ class importCmd(BaseCommand):
123123
kShortLabel = 'Import'
124124
kCmdName = "{}Import".format(version.pluginPrefix())
125125
kScriptCommand = 'import maya.cmds;maya.cmds.{0}()'.format(kCmdName)
126-
kRuntimeCommand = "UnityOneClickImport"
126+
kRuntimeCommand = "UnityFbxForMayaImport"
127127

128128
def __init__(self):
129129
super(self.__class__, self).__init__()
@@ -249,7 +249,7 @@ class exportCmd(BaseCommand):
249249
kShortLabel = 'Export'
250250
kCmdName = "{}Export".format(version.pluginPrefix())
251251
kScriptCommand = 'import maya.cmds;maya.cmds.{0}()'.format(kCmdName)
252-
kRuntimeCommand = "UnityOneClickExport"
252+
kRuntimeCommand = "UnityFbxForMayaExport"
253253

254254
def __init__(self):
255255
super(self.__class__, self).__init__()
@@ -328,7 +328,7 @@ def unregister(pluginFn):
328328
# UNIT TESTS
329329
#===============================================================================
330330
import unittest
331-
from unityOneClick.basetestcase import BaseTestCase
331+
from UnityFbxForMaya.basetestcase import BaseTestCase
332332

333333
class BaseCmdTest(BaseTestCase):
334334
"""Base class for command UnitTests
@@ -338,7 +338,7 @@ class BaseCmdTest(BaseTestCase):
338338

339339
def setUp(self):
340340
super(BaseCmdTest,self).setUp()
341-
maya.cmds.loadPlugin( 'unityOneClickPlugin.py', quiet=True ) # @UndefinedVariable
341+
maya.cmds.loadPlugin( 'UnityFbxForMayaPlugin.py', quiet=True ) # @UndefinedVariable
342342

343343
# test routine
344344
def test_invoke(self):

‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/debug.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/debug.py

File renamed without changes.

‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/logger.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/logger.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
@ingroup UnityUtils
2222
"""
2323

24-
from unityOneClick.debug import debug_info
25-
from unityOneClick.version import pluginName
24+
from UnityFbxForMaya.debug import debug_info
25+
from UnityFbxForMaya.version import pluginName
2626

2727
import maya.OpenMaya as OpenMaya # @UnresolvedImport
2828

‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/unityOneClick/ui.py renamed to ‎Assets/FbxExporters/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/ui.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323

2424
import maya.cmds
2525

26-
from unityOneClick import (commands)
26+
from UnityFbxForMaya import (commands)
2727

2828
# ======================================================================'
2929
# User Interface
3030
# ======================================================================'
3131

32-
kMenuName = 'UnityOneClick'
33-
kMenuDivider = 'UnityOneClickDivider'
32+
kMenuName = 'UnityFbxForMaya'
33+
kMenuDivider = 'UnityFbxForMayaDivider'
3434
kMenuLabel = 'UNITY'
3535
kMenuInsertAfter = 'exportActiveFileOptions'
3636

@@ -104,7 +104,7 @@ def installMenu():
104104

105105
def uninstallMenu():
106106
"""
107-
uninstall the unityOneClick menu from main window
107+
uninstall the UnityFbxForMaya menu from main window
108108
@ingroup UnityUI
109109
"""
110110
if maya.cmds.menu(kMenuName, exists=True): # @UndefinedVariable

0 commit comments

Comments
 (0)