diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs index f72809474..005d79d47 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs @@ -251,14 +251,6 @@ namespace UniGLTF }; } - public struct MeshWithRenderer - { - public Mesh Mesh; - [Obsolete("Use Renderer")] - public Renderer Rendererer { get { return Renderer; } set { Renderer = value; } } - public Renderer Renderer; - } - public static IEnumerable<(Mesh, glTFMesh, Dictionary)> ExportMeshes(glTF gltf, int bufferIndex, List unityMeshes, List unityMaterials, MeshExportSettings settings) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshWithRenderer.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshWithRenderer.cs new file mode 100644 index 000000000..22e2f4d36 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshWithRenderer.cs @@ -0,0 +1,19 @@ +using System; +using UnityEngine; + +namespace UniGLTF +{ + public struct MeshWithRenderer + { + public Mesh Mesh; + [Obsolete("Use Renderer")] + public Renderer Rendererer => Renderer; + public Renderer Renderer; + + public MeshWithRenderer(Transform x) + { + Mesh = x.GetSharedMesh(); + Renderer = x.GetComponent(); + } + } +} diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshWithRenderer.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshWithRenderer.cs.meta new file mode 100644 index 000000000..6ae443e42 --- /dev/null +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshWithRenderer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6f745ee7743b23243bf6adcb740dab82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs index 30a535fd0..55e8fee4a 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs @@ -253,11 +253,7 @@ namespace UniGLTF #region Meshes var unityMeshes = Nodes - .Select(x => new MeshExporter.MeshWithRenderer - { - Mesh = x.GetSharedMesh(), - Renderer = x.GetComponent(), - }) + .Select(x => new MeshWithRenderer(x)) .Where(x => { if (x.Mesh == null)