@@ -72,16 +72,20 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
72
72
(
73
73
parameters main rollout: params
74
74
(
75
- filePath type: #string ui: filep default: " "
76
- fileName type: #string ui: filen default: " "
75
+ modelFilePath type: #string ui: filep default: " "
76
+ modelFileName type: #string ui: filen default: " "
77
+ animFilePath type: #string ui: afilep default: " "
78
+ animFileName type: #string ui: afilen default: " "
77
79
)
78
80
rollout params " Unity Export Parameters"
79
81
(
80
- edittext filep " File Path:" text: filePath readOnly: false labelOnTop: true
81
- edittext filen " File Name:" text: fileName readOnly: false labelOnTop: true
82
+ edittext filep " Model File Path:" text: modelFilePath readOnly: false labelOnTop: true
83
+ edittext filen " Model File Name:" text: modelFileName readOnly: false labelOnTop: true
84
+ edittext afilep " Animation File Path:" text: animFilePath readOnly: false labelOnTop: true
85
+ edittext afilen " Animation File Name:" text: animFileName readOnly: false labelOnTop: true
82
86
)
83
87
)
84
- custAttributes.add unityDummy unitySetData #unique
88
+ custAttributes.add unityDummy unitySetData
85
89
)
86
90
unityDummy -- return dummy
87
91
)
@@ -124,6 +128,16 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
124
128
local unityFbxFileNameAttr = filenameFromPath fbxFileName
125
129
local unityFbxFileName = getFilenameFile fbxFileName
126
130
131
+ local unityAnimFilePathAttr = unityFbxFilePathAttr
132
+ local unityAnimFileNameAttr = unityFbxFileNameAttr
133
+
134
+ -- check if importing an animation file (contains @ symbol)
135
+ local isAnimFile = false
136
+ if (matchPattern unityFbxFileName pattern: " *@*" ) do (
137
+ isAnimFile = true
138
+ unityFbxFileName = (filterString unityFbxFileName " @" )[1 ]
139
+ )
140
+
127
141
currSetName = unityFbxFileName + " _UnityExportSet"
128
142
129
143
callbacks.addScript #postImport (" afterImport()" ) id: #unityPlugin
@@ -134,8 +148,14 @@ macroScript UnityImport category:"Unity" tooltip:"Import an FBX file from a Unit
134
148
currSetName = unityFbxFileName + " _UnityExportSet"
135
149
unityDummy = getOrCreateSettingsDummy currSetName
136
150
137
- unityDummy.unityData.filePath = unityFbxFilePathAttr
138
- unityDummy.unityData.fileName = unityFbxFileNameAttr
151
+ if ((not isAnimFile) or unityDummy.unityData.modelFilePath == " " ) do (
152
+ unityDummy.unityData.modelFilePath = unityFbxFilePathAttr
153
+ )
154
+ if ((not isAnimFile) or unityDummy.unityData.modelFileName == " " ) do (
155
+ unityDummy.unityData.modelFileName = unityFbxFileNameAttr
156
+ )
157
+ unityDummy.unityData.animFilePath = unityAnimFilePathAttr
158
+ unityDummy.unityData.animFileName = unityAnimFileNameAttr
139
159
140
160
unityRootDummy = getOrCreateRootDummy()
141
161
unityDummy.parent = unityRootDummy
0 commit comments