rename import/export plugins to match UnityGLTF naming (GLTF instead …

…of Gltf)
KhronosGroup · Jan 3, 2024 · 5db2486 · 5db2486
1 parent 958d697
commit 5db2486
Show file tree

Hide file tree

Showing 34 changed files with 123 additions and 91 deletions.
diff --git a/Editor/Scripts/GLTFImporterInspector.cs b/Editor/Scripts/GLTFImporterInspector.cs
@@ -29,16 +29,16 @@ public override void OnEnable()
 
 			var m_HasSceneData = serializedObject.FindProperty(nameof(GLTFImporter.m_HasSceneData));
 			if (m_HasSceneData.boolValue)
-				AddTab(new GltfAssetImporterTab(this, "Model", ModelInspectorGUI));
+				AddTab(new GLTFAssetImporterTab(this, "Model", ModelInspectorGUI));
 
-			AddTab(new GltfAssetImporterTab(this, "Animation", AnimationInspectorGUI));
+			AddTab(new GLTFAssetImporterTab(this, "Animation", AnimationInspectorGUI));
 
 			var m_HasMaterialData = serializedObject.FindProperty(nameof(GLTFImporter.m_HasMaterialData));
 			var m_HasTextureData = serializedObject.FindProperty(nameof(GLTFImporter.m_HasTextureData));
 			if (m_HasMaterialData.boolValue || m_HasTextureData.boolValue)
-				AddTab(new GltfAssetImporterTab(this, "Materials", MaterialInspectorGUI));
+				AddTab(new GLTFAssetImporterTab(this, "Materials", MaterialInspectorGUI));
 
-			AddTab(new GltfAssetImporterTab(this, "Used Extensions", ExtensionInspectorGUI));
+			AddTab(new GLTFAssetImporterTab(this, "Used Extensions", ExtensionInspectorGUI));
 
 			base.OnEnable();
 		}

diff --git a/Editor/Scripts/GLTFSettingsInspector.cs b/Editor/Scripts/GLTFSettingsInspector.cs
@@ -149,7 +149,7 @@ internal static void DrawGLTFSettingsGUI(GLTFSettings settings, SerializedObject
 
 		private static Dictionary<Type, Editor> editorCache = new Dictionary<Type, Editor>();
 
-		internal static void OnPluginsGUI(IEnumerable<GltfPlugin> plugins, bool allowDisabling = true)
+		internal static void OnPluginsGUI(IEnumerable<GLTFPlugin> plugins, bool allowDisabling = true)
 		{
 			var lastAssembly = "";
 			foreach (var plugin in plugins
@@ -186,7 +186,7 @@ internal static void OnPluginsGUI(IEnumerable<GltfPlugin> plugins, bool allowDis
 						// GUILayout.Toggle(true, new GUIContent("", "Always enabled."), GUILayout.Width(12));
 						// EditorGUI.EndDisabledGroup();
 						if (allowDisabling)
-							GUILayout.Label(GUIContent.none, GUILayout.Width(12));
+							GUILayout.Label(GUIContent.none, GUILayout.Width(11));
 					}
 					else
 					{

diff --git a/Editor/Scripts/Internal/UnityGLTFTabbedEditor.cs b/Editor/Scripts/Internal/UnityGLTFTabbedEditor.cs
@@ -12,19 +12,19 @@ namespace UnityGLTF
 {
 	internal class UnityGLTFTabbedEditor : AssetImporterTabbedEditor
 	{
-		private readonly List<GltfAssetImporterTab> _tabs = new List<GltfAssetImporterTab>();
+		private readonly List<GLTFAssetImporterTab> _tabs = new List<GLTFAssetImporterTab>();
 		internal int TabCount => _tabs.Count;
 		internal BaseAssetImporterTabUI __ActiveTab => activeTab;
 
-		protected void AddTab(GltfAssetImporterTab tab)
+		protected void AddTab(GLTFAssetImporterTab tab)
 		{
 			if (tab == null) return;
 			if (!_tabs.Contains(tab)) _tabs.Add(tab);
 			tabs = _tabs.Select(x => (BaseAssetImporterTabUI) x).ToArray();
 			m_TabNames = _tabs.Select(t => t.Label).ToArray();
 		}
 
-		public GltfAssetImporterTab GetTab(int index)
+		public GLTFAssetImporterTab GetTab(int index)
 		{
 			if (_tabs == null || _tabs.Count < 1) return null;
 			if (index < 0) index = 0;
@@ -47,12 +47,12 @@ public override void OnEnable()
 		}
 	}
 
-	internal class GltfAssetImporterTab : BaseAssetImporterTabUI
+	internal class GLTFAssetImporterTab : BaseAssetImporterTabUI
 	{
 		internal readonly string Label;
 		private readonly Action _tabGui;
 
-		public GltfAssetImporterTab(AssetImporterEditor panelContainer, string label, Action tabGui) : base(panelContainer)
+		public GLTFAssetImporterTab(AssetImporterEditor panelContainer, string label, Action tabGui) : base(panelContainer)
 		{
 			this.Label = label;
 			this._tabGui = tabGui;

diff --git a/Editor/Scripts/Plugins/GltfPluginEditor.cs b/Editor/Scripts/Plugins/GltfPluginEditor.cs
@@ -3,7 +3,7 @@
 
 namespace UnityGLTF
 {
-    [CustomEditor(typeof(GltfPlugin), true)]
+    [CustomEditor(typeof(GLTFPlugin), true)]
     public class GltfPluginEditor: Editor
     {
         // Follows the default implementation of OnInspectorGUI, but skips the script field

diff --git a/Editor/Scripts/Plugins/RegisteredImportPlugins.cs b/Editor/Scripts/Plugins/RegisteredImportPlugins.cs
@@ -8,7 +8,7 @@ namespace UnityGLTF
 {
 	internal static class RegisteredImportPlugins
 	{
-		internal static readonly List<GltfImportPlugin> Plugins = new List<GltfImportPlugin>();
+		internal static readonly List<GLTFImportPlugin> Plugins = new List<GLTFImportPlugin>();
 
 		[InitializeOnLoadMethod]
 		public static void Init()

diff --git a/Runtime/Scripts/GLTFSceneExporter.cs b/Runtime/Scripts/GLTFSceneExporter.cs
@@ -53,10 +53,10 @@ public ExportContext(GLTFSettings settings)
 		public GLTFSceneExporter.AfterTextureExportDelegate AfterTextureExport;
 		public GLTFSceneExporter.AfterPrimitiveExportDelegate AfterPrimitiveExport;
 
-		internal GltfExportPluginContext GetExportContextCallbacks() => new ExportContextCallbacks(this);
+		internal GLTFExportPluginContext GetExportContextCallbacks() => new ExportContextCallbacks(this);
 
 #pragma warning disable CS0618 // Type or member is obsolete
-		internal class ExportContextCallbacks : GltfExportPluginContext
+		internal class ExportContextCallbacks : GLTFExportPluginContext
 		{
 			private readonly ExportContext _exportContext;
 
@@ -119,7 +119,7 @@ public partial class GLTFSceneExporter
 		public delegate void AfterPrimitiveExportDelegate(GLTFSceneExporter exporter, Mesh mesh, MeshPrimitive primitive, int index);
 
 
-		private class LegacyCallbacksPlugin : GltfExportPluginContext
+		private class LegacyCallbacksPlugin : GLTFExportPluginContext
 		{
 			public override void AfterSceneExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot) => GLTFSceneExporter.AfterSceneExport?.Invoke(exporter, gltfRoot);
 			public override void BeforeSceneExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot) => GLTFSceneExporter.BeforeSceneExport?.Invoke(exporter, gltfRoot);
@@ -147,7 +147,7 @@ public override bool BeforeMaterialExport(GLTFSceneExporter exporter, GLTFRoot g
 		}
 
 		private static ILogger Debug = UnityEngine.Debug.unityLogger;
-		private List<GltfExportPluginContext> _plugins = new List<GltfExportPluginContext>();
+		private List<GLTFExportPluginContext> _plugins = new List<GLTFExportPluginContext>();
 
 		public struct TextureMapType
 		{

diff --git a/Runtime/Scripts/GLTFSettings.cs b/Runtime/Scripts/GLTFSettings.cs
@@ -30,10 +30,10 @@ public enum BlendShapeExportPropertyFlags
 
 	    // Plugins
 	    [SerializeField, HideInInspector]
-	    public List<GltfImportPlugin> ImportPlugins = new List<GltfImportPlugin>();
+	    public List<GLTFImportPlugin> ImportPlugins = new List<GLTFImportPlugin>();
 
 	    [SerializeField, HideInInspector]
-	    public List<GltfExportPlugin> ExportPlugins = new List<GltfExportPlugin>();
+	    public List<GLTFExportPlugin> ExportPlugins = new List<GLTFExportPlugin>();
 
 	    [Header("Export Settings")]
 		[SerializeField]
@@ -115,7 +115,7 @@ public bool UseAnimationPointer
 					plugin.Enabled = value;
 				if (!value || plugin != null) return;
 
-				if (ExportPlugins == null) ExportPlugins = new List<GltfExportPlugin>();
+				if (ExportPlugins == null) ExportPlugins = new List<GLTFExportPlugin>();
 				ExportPlugins.Add(CreateInstance<AnimationPointerExport>());
 #if UNITY_EDITOR
 				EditorUtility.SetDirty(this);
@@ -218,14 +218,14 @@ public static bool TryGetSettings(out GLTFSettings settings)
 	    private static void RegisterPlugins(GLTFSettings settings)
 	    {
 		    // Initialize
-		    if (settings.ImportPlugins == null) settings.ImportPlugins = new List<GltfImportPlugin>();
-		    if (settings.ExportPlugins == null) settings.ExportPlugins = new List<GltfExportPlugin>();
+		    if (settings.ImportPlugins == null) settings.ImportPlugins = new List<GLTFImportPlugin>();
+		    if (settings.ExportPlugins == null) settings.ExportPlugins = new List<GLTFExportPlugin>();
 
 		    // Cleanup
 		    settings.ImportPlugins.RemoveAll(x => x == null);
 		    settings.ExportPlugins.RemoveAll(x => x == null);
 
-		    void FindAndRegisterPlugins<T>(List<T> plugins) where T : GltfPlugin
+		    void FindAndRegisterPlugins<T>(List<T> plugins) where T : GLTFPlugin
 		    {
 			    foreach (var pluginType in TypeCache.GetTypesDerivedFrom<T>())
 			    {

diff --git a/Runtime/Scripts/Plugins/AnimationPointerExport.cs b/Runtime/Scripts/Plugins/AnimationPointerExport.cs
@@ -1,17 +1,17 @@
 namespace UnityGLTF.Plugins
 {
-    public class AnimationPointerExport: GltfExportPlugin
+    public class AnimationPointerExport: GLTFExportPlugin
     {
         public override string DisplayName => "KHR_animation_pointer";
         public override string Description => "Animate arbitrary material and object properties. Without this extension, only node transforms and blend shape weights can be animated.";
         public override bool EnabledByDefault => false;
-        public override GltfExportPluginContext CreateInstance(ExportContext context)
+        public override GLTFExportPluginContext CreateInstance(ExportContext context)
         {
             return new AnimationPointerExportContext();
         }
     }
 
-    public class AnimationPointerExportContext: GltfExportPluginContext
+    public class AnimationPointerExportContext: GLTFExportPluginContext
     {
 
     }

diff --git a/Runtime/Scripts/Plugins/Core/GltfExportPlugin.cs b/Runtime/Scripts/Plugins/Core/GltfExportPlugin.cs
@@ -3,15 +3,15 @@
 
 namespace UnityGLTF.Plugins
 {
-    public abstract class GltfExportPlugin: GltfPlugin
+    public abstract class GLTFExportPlugin: GLTFPlugin
     {
         /// <summary>
         /// Return the Plugin Instance that receives the import callbacks
         /// </summary>
-        public abstract GltfExportPluginContext CreateInstance(ExportContext context);
+        public abstract GLTFExportPluginContext CreateInstance(ExportContext context);
     }
 
-    public abstract class GltfExportPluginContext
+    public abstract class GLTFExportPluginContext
     {
         public virtual void BeforeSceneExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot) {}
         public virtual void AfterSceneExport(GLTFSceneExporter exporter, GLTFRoot gltfRoot) {}

diff --git a/Runtime/Scripts/Plugins/Core/GltfExportPlugin.cs.meta b/Runtime/Scripts/Plugins/Core/GltfExportPlugin.cs.meta
diff --git a/Runtime/Scripts/Plugins/Core/GltfImportPlugin.cs b/Runtime/Scripts/Plugins/Core/GltfImportPlugin.cs
@@ -4,18 +4,18 @@
 
 namespace UnityGLTF.Plugins
 {
-	public abstract class GltfImportPlugin : GltfPlugin
+	public abstract class GLTFImportPlugin : GLTFPlugin
 	{
 		/// <summary>
 		/// Return the Plugin Instance that receives the import callbacks
 		/// </summary>
-		public abstract GltfImportPluginContext CreateInstance(GLTFImportContext context);
+		public abstract GLTFImportPluginContext CreateInstance(GLTFImportContext context);
 	}
 
 	/// <summary>
 	/// Instances are created during import once, they don't have to worry about clearing state
 	/// </summary>
-	public abstract class GltfImportPluginContext
+	public abstract class GLTFImportPluginContext
 	{
 		/// <summary>
 		/// Called before import starts

diff --git a/Runtime/Scripts/Plugins/Core/GltfImportPlugin.cs.meta b/Runtime/Scripts/Plugins/Core/GltfImportPlugin.cs.meta
diff --git a/Runtime/Scripts/Plugins/Core/GltfPlugin.cs b/Runtime/Scripts/Plugins/Core/GltfPlugin.cs
@@ -31,7 +31,7 @@ namespace UnityGLTF.Plugins
     // For each new instance of GLTFSceneExporter, new instances of plugins are created.
     // For each new instance of GLTFSceneImporter, new instances of plugins are created.
 
-    public abstract class GltfPlugin: ScriptableObject
+    public abstract class GLTFPlugin: ScriptableObject
     {
         public abstract string DisplayName { get; }
         public virtual string Description => null;

diff --git a/Runtime/Scripts/Plugins/Core/GltfPlugin.cs.meta b/Runtime/Scripts/Plugins/Core/GltfPlugin.cs.meta
diff --git a/Runtime/Scripts/Plugins/Core/ImportContext.cs b/Runtime/Scripts/Plugins/Core/ImportContext.cs
@@ -16,14 +16,14 @@ public class GLTFImportContext
 		public readonly AssetImporter SourceImporter;
 #endif
 
-		public readonly List<GltfImportPluginContext> Plugins;
+		public readonly List<GLTFImportPluginContext> Plugins;
 
 		public GLTFSceneImporter SceneImporter;
 		public GLTFRoot Root => SceneImporter?.Root;
 
-		private List<GltfImportPluginContext> InitializePlugins(GLTFSettings settings)
+		private List<GLTFImportPluginContext> InitializePlugins(GLTFSettings settings)
 		{
-			var plugins = new List<GltfImportPluginContext>();
+			var plugins = new List<GLTFImportPluginContext>();
 			foreach (var plugin in settings.ImportPlugins)
 			{
 				if (plugin != null && plugin.Enabled)
@@ -51,7 +51,7 @@ internal GLTFImportContext(GLTFSettings settings)
 			Plugins = InitializePlugins(settings);
 		}
 
-		public bool TryGetPlugin<T>(out GltfImportPluginContext o) where T: GltfImportPluginContext
+		public bool TryGetPlugin<T>(out GLTFImportPluginContext o) where T: GLTFImportPluginContext
 		{
 			foreach (var plugin in Plugins)
 			{

diff --git a/Runtime/Scripts/Plugins/DracoImport.cs b/Runtime/Scripts/Plugins/DracoImport.cs
@@ -1,10 +1,10 @@
 namespace UnityGLTF.Plugins
 {
-    public class DracoImport: GltfImportPlugin
+    public class DracoImport: GLTFImportPlugin
     {
         public override string DisplayName => "KHR_draco_mesh_compression";
         public override string Description => "Import Draco compressed meshes.";
-        public override GltfImportPluginContext CreateInstance(GLTFImportContext context)
+        public override GLTFImportPluginContext CreateInstance(GLTFImportContext context)
         {
             return new DracoImportContext();
         }
@@ -14,7 +14,7 @@ public override GltfImportPluginContext CreateInstance(GLTFImportContext context
 #endif
     }
 
-    public class DracoImportContext: GltfImportPluginContext
+    public class DracoImportContext: GLTFImportPluginContext
     {
 
     }

diff --git a/Runtime/Scripts/Plugins/Experimental/BakeParticleSystem.cs b/Runtime/Scripts/Plugins/Experimental/BakeParticleSystem.cs
@@ -4,18 +4,18 @@
 
 namespace UnityGLTF.Plugins
 {
-    public class BakeParticleSystem: GltfExportPlugin
+    public class BakeParticleSystem: GLTFExportPlugin
     {
         public override string DisplayName => "Bake to Mesh: Particle Systems";
         public override string Description => "Exports the current frame of all Particle Systems as a static mesh.";
         public override bool EnabledByDefault => false;
-        public override GltfExportPluginContext CreateInstance(ExportContext context)
+        public override GLTFExportPluginContext CreateInstance(ExportContext context)
         {
             return new BakeParticleSystemContext();
         }
     }
 
-    public class BakeParticleSystemContext: GltfExportPluginContext
+    public class BakeParticleSystemContext: GLTFExportPluginContext
     {
         private readonly List<Component> _components = new List<Component>();
         private readonly List<Object> _objects = new List<Object>();

diff --git a/Runtime/Scripts/Plugins/Experimental/CanvasExport.cs b/Runtime/Scripts/Plugins/Experimental/CanvasExport.cs
@@ -7,18 +7,18 @@
 
 namespace UnityGLTF.Plugins
 {
-    public class CanvasExport : GltfExportPlugin
+    public class CanvasExport : GLTFExportPlugin
     {
         public override string DisplayName => "Bake to Mesh: Canvas";
         public override string Description => "Bakes UI Canvas components to meshes and materials. Render order is estimated by slight transform offsets; results might differ in viewers depending on how transparent objects are sorted.";
         public override bool EnabledByDefault => false;
-        public override GltfExportPluginContext CreateInstance(ExportContext context)
+        public override GLTFExportPluginContext CreateInstance(ExportContext context)
         {
             return new CanvasExportContext();
         }
     }
 
-    public class CanvasExportContext: GltfExportPluginContext
+    public class CanvasExportContext: GLTFExportPluginContext
     {
         private static Shader shader;
 

diff --git a/Runtime/Scripts/Plugins/Experimental/Invisible.mat b/Runtime/Scripts/Plugins/Experimental/Invisible.mat
@@ -84,6 +84,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _AlphaClip: 1
+    - _AlphaToMask: 1
     - _Blend: 0
     - _BlendModePreserveSpecular: 1
     - _BumpScale: 1
@@ -130,4 +131,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 6
+  version: 7