Skip to content

Commit 41eb154

Browse files
authored
Uni-48723 Sprint 61 Release (1.7.0-preview) (#424)
* New native library (is it really new?) * Updated changelog and docs * Updated integrations (now with zip files) * Disabling il2cpp * Fixed a FDG warning (nested types)
1 parent 63f7d0b commit 41eb154

File tree

20 files changed

+96
-63
lines changed

20 files changed

+96
-63
lines changed

Assets/com.unity.formats.fbx.tests/FbxExporterReflection.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/com.unity.formats.fbx.tests/FbxPrefabAutoUpdaterTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void TestNameMapping()
170170
FbxPrefab fbxPrefabScript = cubePrefab.GetComponent<FbxPrefab>();
171171

172172

173-
FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
173+
StringPair stringpair = new StringPair();
174174
stringpair.FBXObjectName = "SphereFBX";
175175
stringpair.UnityObjectName = "Sphere";
176176
fbxPrefabScript.NameMapping.Add(stringpair);
@@ -203,7 +203,7 @@ public void RemappingTest()
203203

204204
// In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
205205
FbxPrefab fbxPrefabScript = cube.GetComponent<FbxPrefab>();
206-
FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
206+
StringPair stringpair = new StringPair();
207207
stringpair.FBXObjectName = "SphereFBX";
208208
stringpair.UnityObjectName = "Sphere";
209209
fbxPrefabScript.NameMapping.Add(stringpair);
@@ -262,7 +262,7 @@ public void RemappingTest()
262262

263263
// In FbxPrefab Component of Cube, add SphereFBX/Sphere name mapping
264264
FbxPrefab fbxPrefabScript = cube.GetComponent<FbxPrefab>();
265-
FbxPrefab.StringPair stringpair = new FbxPrefab.StringPair();
265+
StringPair stringpair = new StringPair();
266266
stringpair.FBXObjectName = "SphereFBX";
267267
stringpair.UnityObjectName = "Sphere";
268268
fbxPrefabScript.NameMapping.Add(stringpair);

Packages/Integrations/Autodesk/maya/scripts/unitySetupUI.mel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ global string $unityImportIconPath = "import.png";
77
global string $unityExportIconPath = "export.png";
88
global string $unityIconPath = "unity.png";
99

10-
global string $unityFamilyLabel = "The UnityFbxForMaya plugin (v.1.6.0-preview) allows you to reliably exchange and review your work between Maya and Unity.";
10+
global string $unityFamilyLabel = "The UnityFbxForMaya plugin (v.1.7.0-preview) allows you to reliably exchange and review your work between Maya and Unity.";
1111
global string $unityImportLabel = "Import an FBX file from a Unity project and auto-configure for exporting";
1212
global string $unityExportModelLabel = "Export Model to Unity";
1313
global string $unityExportAnimLabel = "Export Animation to Unity";

Packages/com.autodesk.fbx/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changes in FBX SDK C# Bindings
22

3+
## [1.7.0] - 2018-06-01
4+
5+
FEATURE
6+
7+
* The C# Bindings package has been renamed to com.autodesk.fbx
8+
* Fixed violations of the C# Framework Design Guidelines (FDG)
9+
* Fixed errors reported while running the Package Validation Suite
10+
311
## [1.6.0] - 2018-05-29
412

513
* The fbxsdk package can now be used in standalone builds (runtime)

Packages/com.autodesk.fbx/Documentation/com.unity.formats.fbxsdk.md renamed to Packages/com.autodesk.fbx/Documentation/com.autodesk.fbx.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# About the FBX SDK C# Bindings package
22

3-
__Version__: 1.6.0-preview
3+
__Version__: 1.7.0-preview
44

55
The FBX SDK C# Bindings provide access from Unity C# scripts to a subset of the Autodesk FBX SDK, version 2018.1.
66

@@ -30,18 +30,19 @@ The FBX Exporter package contains:
3030

3131
There is no API documentation in the preview package. Refer to the <a href="http://help.autodesk.com/view/FBX/2018/ENU/">Autodesk FBX SDK API documentation</a>.
3232

33-
The bindings are in the `Unity.FbxSdk` namespace:
33+
The bindings are in the `Autodesk.Fbx` namespace:
3434

3535
```
36-
using UnityEngine.Formats.FbxSdk;
36+
using Autodesk.Fbx;
37+
using UnityEditor;
3738
using UnityEngine;
3839
3940
public class HelloFbx {
40-
[MenuItem("Fbx/Hello")]
41-
public static void Hello() {
42-
using(var manager = FbxManager.Create()) {
43-
Debug.LogFormat("FBX SDK is version {0}, FbxManager.GetVersion());
44-
}
41+
[MenuItem("Fbx/Hello")]
42+
public static void Hello() {
43+
using(var manager = FbxManager.Create()) {
44+
Debug.LogFormat("FBX SDK is version {0}", FbxManager.GetVersion());
4545
}
46+
}
4647
}
4748
```

Packages/com.autodesk.fbx/Documentation/com.unity.formats.fbxsdk.md.meta renamed to Packages/com.autodesk.fbx/Documentation/com.autodesk.fbx.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.autodesk.fbx/Scripts/NativeMethods.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,23 @@ private static int InitFbxAllocators()
226226
#if COM_UNITY_FORMATS_FBX_AS_ASSET || UNITY_STANDALONE
227227
const string DllImportName = "UnityFbxSdkNative";
228228
#elif UNITY_EDITOR_OSX
229-
const string DllImportName = "Packages/com.unity.formats.fbxsdk/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative";
229+
const string DllImportName = "Packages/com.autodesk.fbx/MacOS/UnityFbxSdkNative.bundle/Contents/MacOS/UnityFbxSdkNative";
230230
#elif UNITY_EDITOR_LINUX
231-
const string DllImportName = "Packages/com.unity.formats.fbxsdk/Linux/UnityFbxSdkNative.so";
231+
const string DllImportName = "Packages/com.autodesk.fbx/Linux/UnityFbxSdkNative.so";
232232
#elif UNITY_EDITOR_WIN
233-
const string DllImportName = "Packages/com.unity.formats.fbxsdk/Windows/UnityFbxSdkNative.dll";
233+
const string DllImportName = "Packages/com.autodesk.fbx/Windows/UnityFbxSdkNative.dll";
234234
#else
235235
#error "FbxSdk: C# bindings for this platform haven't been implemented yet, sorry."
236236
const string DllImportName = "UnityFbxSdkNative";
237237
#endif
238238

239+
// Because of a non-static delegate (ProgressCallback) that is called from NativeFBX->Managed,
240+
// we are not supporting IL2CPP
241+
#if ENABLE_IL2CPP
242+
#error Autodesk.Fbx is not supported on IL2CPP
243+
#endif
244+
245+
239246

240247
[global::System.Runtime.InteropServices.DllImport(DllImportName, EntryPoint="CSharp_AutodeskfFbx_new_FbxDouble4x4__SWIG_0___")]
241248
public static extern global::System.IntPtr new_FbxDouble4x4__SWIG_0();
Binary file not shown.

Packages/com.autodesk.fbx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.autodesk.fbx",
3-
"version" : "0.0.0-master",
3+
"version" : "1.7.0-preview",
44
"displayName" : "FBX SDK CSharp bindings",
55
"unity": "2018.2",
66
"description" : "This package provides C# bindings to the Autodesk FBX SDK.",

0 commit comments

Comments
 (0)