diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporterDivided.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_DividedVertexBuffer.cs similarity index 98% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporterDivided.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_DividedVertexBuffer.cs index 2658a2b35..22b72471d 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporterDivided.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_DividedVertexBuffer.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace UniGLTF { - public static class MeshExporterDivided + public static class MeshExporter_DividedVertexBuffer { public static (glTFMesh, Dictionary) Export(glTF gltf, int bufferIndex, MeshWithRenderer unityMesh, List unityMaterials, diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporterDivided.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_DividedVertexBuffer.cs.meta similarity index 83% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporterDivided.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_DividedVertexBuffer.cs.meta index 6a31e5d50..47854c705 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporterDivided.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_DividedVertexBuffer.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 92bc82be5ead84a429346379590f6d7d +guid: c21bb25d00e03bc49be4ed15201fb705 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_SharedVertexBuffer.cs similarity index 99% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_SharedVertexBuffer.cs index 56d6d91fe..68c136057 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_SharedVertexBuffer.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace UniGLTF { - public static class MeshExporter + public static class MeshExporter_SharedVertexBuffer { /// /// primitive 間で vertex を共有する形で Export する。 @@ -23,7 +23,7 @@ namespace UniGLTF /// /// /// - public static (glTFMesh, Dictionary blendShapeIndexMap) ExportSharedVertexBuffer(glTF gltf, int bufferIndex, + public static (glTFMesh, Dictionary blendShapeIndexMap) Export(glTF gltf, int bufferIndex, MeshWithRenderer unityMesh, List unityMaterials, IAxisInverter axisInverter, MeshExportSettings settings) { diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs.meta b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_SharedVertexBuffer.cs.meta similarity index 69% rename from Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs.meta rename to Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_SharedVertexBuffer.cs.meta index 7ca52c723..2144f29ce 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter.cs.meta +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/MeshExporter_SharedVertexBuffer.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 9b5d31a97e5221e43b16cfb4213a4a79 -timeCreated: 1545139997 -licenseType: Free +guid: d8bea9b98938e8c489ebad8641a76900 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs index d34008efe..54a9a2707 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/gltfExporter.cs @@ -253,8 +253,8 @@ namespace UniGLTF foreach (var unityMesh in uniqueUnityMeshes) { var (gltfMesh, blendShapeIndexMap) = meshExportSettings.DivideVertexBuffer - ? MeshExporterDivided.Export(glTF, bufferIndex, unityMesh, Materials, m_axisInverter, meshExportSettings) - : MeshExporter.ExportSharedVertexBuffer(glTF, bufferIndex, unityMesh, Materials, m_axisInverter, meshExportSettings) + ? MeshExporter_DividedVertexBuffer.Export(glTF, bufferIndex, unityMesh, Materials, m_axisInverter, meshExportSettings) + : MeshExporter_SharedVertexBuffer.Export(glTF, bufferIndex, unityMesh, Materials, m_axisInverter, meshExportSettings) ; glTF.meshes.Add(gltfMesh); Meshes.Add(unityMesh.Mesh); diff --git a/Assets/UniGLTF/Tests/UniGLTF/MeshTests.cs b/Assets/UniGLTF/Tests/UniGLTF/MeshTests.cs index e5dc10c7c..c9a4aa3ea 100644 --- a/Assets/UniGLTF/Tests/UniGLTF/MeshTests.cs +++ b/Assets/UniGLTF/Tests/UniGLTF/MeshTests.cs @@ -136,8 +136,8 @@ namespace UniGLTF var unityMesh = new MeshWithRenderer(go.transform); var (gltfMesh, blendShapeIndexMap) = meshExportSettings.DivideVertexBuffer - ? MeshExporterDivided.Export(glTF, bufferIndex, unityMesh, Materials, axisInverter, meshExportSettings) - : MeshExporter.ExportSharedVertexBuffer(glTF, bufferIndex, unityMesh, Materials,axisInverter, meshExportSettings) + ? MeshExporter_DividedVertexBuffer.Export(glTF, bufferIndex, unityMesh, Materials, axisInverter, meshExportSettings) + : MeshExporter_SharedVertexBuffer.Export(glTF, bufferIndex, unityMesh, Materials,axisInverter, meshExportSettings) ; { @@ -184,8 +184,8 @@ namespace UniGLTF var unityMesh = new MeshWithRenderer(go.transform); var (gltfMesh, blendShapeIndexMap) = meshExportSettings.DivideVertexBuffer - ? MeshExporterDivided.Export(glTF, bufferIndex, unityMesh, Materials, axisInverter, meshExportSettings) - : MeshExporter.ExportSharedVertexBuffer(glTF, bufferIndex, unityMesh, Materials,axisInverter, meshExportSettings) + ? MeshExporter_DividedVertexBuffer.Export(glTF, bufferIndex, unityMesh, Materials, axisInverter, meshExportSettings) + : MeshExporter_SharedVertexBuffer.Export(glTF, bufferIndex, unityMesh, Materials,axisInverter, meshExportSettings) ; {