GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix marshallers

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-04 14:18:32 +02:00
parent a889d888ff
commit 57052b3b14
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Editor/Content/Import/ModelImportEntry.cs
View File

@@ -364,7 +364,7 @@ namespace FlaxEditor.Content.Import
private bool ShowAnimation => Type == ModelType.Animation;
[StructLayout(LayoutKind.Sequential)]
[NativeMarshalling(typeof(InternalOptionsMarshaler))]
[NativeMarshalling(typeof(InternalOptionsMarshaller))]
internal struct InternalOptions
{
public ModelType Type;
@@ -421,8 +421,8 @@ namespace FlaxEditor.Content.Import
public int ObjectIndex;
}
[CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaler))]
internal static class InternalOptionsMarshaler
[CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaller))]
internal static class InternalOptionsMarshaller
{
[Unmanaged]
[StructLayout(LayoutKind.Sequential)]
@@ -442,7 +442,6 @@ namespace FlaxEditor.Content.Import
public byte ImportVertexColors;
public byte ImportBlendShapes;
public int LightmapUVsSource;
//[MarshalAs(UnmanagedType.LPWStr)]
public IntPtr CollisionMeshesPrefix;
// Transform
@@ -459,8 +458,8 @@ namespace FlaxEditor.Content.Import
public float SamplingRate;
public byte SkipEmptyCurves;
public byte OptimizeKeyframes;
public byte ImportScaleTracks;
public byte EnableRootMotion;
//[MarshalAs(UnmanagedType.LPWStr)]
public IntPtr RootNodeName;
// Level Of Detail
@@ -514,6 +513,7 @@ namespace FlaxEditor.Content.Import
SamplingRate = managed.SamplingRate,
SkipEmptyCurves = managed.SkipEmptyCurves,
OptimizeKeyframes = managed.OptimizeKeyframes,
ImportScaleTracks = managed.ImportScaleTracks,
EnableRootMotion = managed.EnableRootMotion,
RootNodeName = ManagedString.ToManaged(managed.RootNodeName),
GenerateLODs = managed.GenerateLODs,
@@ -557,6 +557,7 @@ namespace FlaxEditor.Content.Import
SamplingRate = managed.SamplingRate,
SkipEmptyCurves = managed.SkipEmptyCurves,
OptimizeKeyframes = managed.OptimizeKeyframes,
ImportScaleTracks = managed.ImportScaleTracks,
EnableRootMotion = managed.EnableRootMotion,
RootNodeName = ManagedString.ToNative(managed.RootNodeName),
GenerateLODs = managed.GenerateLODs,

6
Source/Editor/Content/Import/TextureImportEntry.cs
View File

@@ -299,7 +299,7 @@ namespace FlaxEditor.Content.Import
public List<SpriteInfo> Sprites = new List<SpriteInfo>();
[StructLayout(LayoutKind.Sequential)]
[NativeMarshalling(typeof(InternalOptionsMarshaler))]
[NativeMarshalling(typeof(InternalOptionsMarshaller))]
internal struct InternalOptions
{
public TextureFormatType Type;
@@ -321,8 +321,8 @@ namespace FlaxEditor.Content.Import
public string[] SpriteNames;
}
[CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaler))]
internal static class InternalOptionsMarshaler
[CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaller))]
internal static class InternalOptionsMarshaller
{
[StructLayout(LayoutKind.Sequential)]
internal struct InternalOptionsNative

6
Source/Engine/Animations/AnimationGraph.cs
View File

@@ -45,7 +45,7 @@ namespace FlaxEngine
/// The node evaluation context structure.
/// </summary>
[StructLayout(LayoutKind.Sequential)]
[NativeMarshalling(typeof(ContextMarshaler))]
[NativeMarshalling(typeof(ContextMarshaller))]
public struct Context
{
/// <summary>
@@ -94,8 +94,8 @@ namespace FlaxEngine
public AnimatedModel Instance;
}
[CustomMarshaller(typeof(Context), MarshalMode.Default, typeof(ContextMarshaler))]
internal static class ContextMarshaler
[CustomMarshaller(typeof(Context), MarshalMode.Default, typeof(ContextMarshaller))]
internal static class ContextMarshaller
{
[StructLayout(LayoutKind.Sequential)]
public struct ContextNative