#if UNITY_EDITOR

Added '#if UNITY_EDITOR' to all the scripts that should only run/be used in the editor.
Settings, Hotkey bugfix.
2025-07-07 08:46:07 +02:00 · 2019-05-04 13:29:02 +02:00 · 2019-03-31 18:45:16 +02:00 · 2019-03-31 18:09:53 +02:00 · 2018-09-01 00:40:20 +02:00 · 2018-08-27 12:07:30 +02:00
23 changed files with 196 additions and 30 deletions
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2018 Max
+Copyright (c) 2018 Max Kruf

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/MA_ToolBox/MA_TextureAtlasserPro/Icons/duplicateQuadIcon.png
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Icons/duplicateQuadIcon.png
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProAtlas.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProAtlas.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -101,3 +102,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProQuad.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProQuad.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -164,3 +165,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs
@ -0,0 +1,27 @@
+#if UNITY_EDITOR
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using MA_Editor;
+
+namespace MA_TextureAtlasserPro
+{
+	[System.Serializable]
+	public class MA_TextureAtlasserProSettings : ScriptableObject
+	{
+		[Header("Selection")]
+		public bool autoFocus = true;
+
+		[Header("Duplication:")]
+		public bool copySelectedQuadData = false;
+		public string duplicatedQuadNamePrefix = "new ";
+
+		[Header("Hotkeys:")]
+		public bool useHotkeys = false;
+		public KeyCode addQuadHotKey = KeyCode.Q;
+		public KeyCode removeQuadHotKey = KeyCode.R;
+		public KeyCode duplicateHotKey = KeyCode.D;
+	}
+}
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureGroup.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureGroup.cs
@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_EDITOR
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

@ -17,3 +18,4 @@ namespace MA_TextureAtlasserPro
 		public string name;
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using UnityEngine;
 using UnityEditor;

@ -12,6 +13,7 @@ namespace MA_TextureAtlasserPro
 		public static GUIContent exportAtlasIcon;
 		public static GUIContent createQuadIcon;
 		public static GUIContent removeQuadIcon;
+		public static GUIContent duplicateQuadIcon;
 		public static GUIContent showTexturesOnIcon;
 		public static GUIContent showTexturesOffIcon;
 		public static GUIContent dragHandleIcon;
@ -24,6 +26,7 @@ namespace MA_TextureAtlasserPro
 			exportAtlasIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "exportAtlasIcon" + ".png"));
 			createQuadIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "createQuadIcon" + ".png"));
 			removeQuadIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "removeQuadIcon" + ".png"));
+			duplicateQuadIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "duplicateQuadIcon" + ".png"));
 			showTexturesOnIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "showTexturesOnIcon" + ".png"));
 			showTexturesOffIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "showTexturesOffIcon" + ".png"));
 			dragHandleIcon = new GUIContent("", (Texture)EditorGUIUtility.Load(LOADICONPATH + "dragHandleIcon" + ".png"));
@ -31,3 +34,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProUtils.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProUtils.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -9,12 +10,43 @@ namespace MA_TextureAtlasserPro
 {
 	public static class MA_TextureAtlasserProUtils
 	{
+		public const string SETTINGSASSETPATH = "Assets/MA_ToolBox/MA_TextureAtlasserPro/Settings/";
 		public const string SAVEASSETPATH = "Assets/MA_ToolBox/MA_TextureAtlasserPro/Atlasses/"; 
 		public const string LOADASSETPATH = "Assets/MA_ToolBox/MA_TextureAtlasserPro/Atlasses/";
 		public const string EXPORTASSETPATH = "Assets/MA_ToolBox/MA_TextureAtlasserPro/Exports/"; 
 		public const float VIEWOFFSET = 20;
 		public const string DEFAULTTEXTUREGROUPNAME = "Albedo";

+		public static MA_TextureAtlasserProSettings CreateSettings()
+		{
+			MA_TextureAtlasserProSettings _settings = (MA_TextureAtlasserProSettings)ScriptableObject.CreateInstance<MA_TextureAtlasserProSettings>();
+
+			if(_settings != null)
+			{
+				AssetDatabase.CreateAsset(_settings, SETTINGSASSETPATH + "MA_TextureAtlasserProSettings.asset");
+				AssetDatabase.SaveAssets();
+				AssetDatabase.Refresh();
+
+				return _settings;
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		public static MA_TextureAtlasserProSettings LoadSettings()
+		{
+			MA_TextureAtlasserProSettings _settings = AssetDatabase.LoadAssetAtPath(SETTINGSASSETPATH + "MA_TextureAtlasserProSettings.asset", typeof(MA_TextureAtlasserProSettings)) as MA_TextureAtlasserProSettings;
+
+			if (_settings == null)
+			{
+				_settings = CreateSettings();
+			}
+
+			return _settings;
+		}
+
 		public static MA_TextureAtlasserProAtlas CreateTextureAtlas(string name, Vector2 size)
 		{
 			MA_TextureAtlasserProAtlas _atlas = (MA_TextureAtlasserProAtlas)ScriptableObject.CreateInstance<MA_TextureAtlasserProAtlas>();
@ -113,7 +145,7 @@ namespace MA_TextureAtlasserPro
 			}
 		}

-		public static void CreateTextureQuad(MA_TextureAtlasserProAtlas atlas, string name, Rect rect)
+		public static void CreateTextureQuad(MA_TextureAtlasserProAtlas atlas, string name, Rect rect, bool focus = true)
 		{
 			if(atlas != null)
 			{
@ -140,6 +172,11 @@ namespace MA_TextureAtlasserPro
 					AssetDatabase.AddObjectToAsset(_quad, atlas);
 					AssetDatabase.SaveAssets();
 					AssetDatabase.Refresh();
+
+					if(focus)
+					{
+						atlas.selectedTextureQuad = atlas.textureQuads[atlas.textureQuads.Count - 1];
+					}
 				}
 				else
 				{
@ -152,14 +189,41 @@ namespace MA_TextureAtlasserPro
 			}
 		}

-		public static void RemoveTextureQuad(MA_TextureAtlasserProAtlas atlas)
+		public static void RemoveTextureQuad(MA_TextureAtlasserProAtlas atlas, bool focus = true)
 		{
 			if(atlas != null && atlas.selectedTextureQuad != null)
 			{
-				atlas.textureQuads.Remove(atlas.selectedTextureQuad);
+				int _index = atlas.textureQuads.IndexOf(atlas.selectedTextureQuad);
+
+				atlas.textureQuads.RemoveAt(_index);
 				GameObject.DestroyImmediate(atlas.selectedTextureQuad, true);
 				AssetDatabase.SaveAssets();
 				AssetDatabase.Refresh();
+
+				if (focus && atlas.textureQuads.Count > 0)
+				{
+					_index = Mathf.Clamp(_index, 0, atlas.textureQuads.Count - 1);
+					atlas.selectedTextureQuad = atlas.textureQuads[_index];
+				}
+			}
+		}
+
+		public static void DuplicateTextureQuad(MA_TextureAtlasserProAtlas atlas, bool focus = true, bool copyData = false, string namePrefix = "new ")
+		{
+			if(atlas != null && atlas.selectedTextureQuad != null)
+			{
+				CreateTextureQuad(atlas, namePrefix + atlas.selectedTextureQuad.name, atlas.selectedTextureQuad.rect, false);
+
+				if(copyData)
+				{
+					atlas.textureQuads[atlas.textureQuads.Count - 1].meshes = atlas.selectedTextureQuad.meshes;
+					atlas.textureQuads[atlas.textureQuads.Count - 1].textureGroups = atlas.selectedTextureQuad.textureGroups;
+				}
+
+				if(focus)
+				{
+					atlas.selectedTextureQuad = atlas.textureQuads[atlas.textureQuads.Count - 1];
+				}
 			}
 		}

@ -315,3 +379,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProDebugView.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProDebugView.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -76,3 +77,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -132,3 +133,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs
@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -52,12 +53,17 @@ namespace MA_TextureAtlasserPro
 					GUILayout.Space(MA_TextureAtlasserProUtils.VIEWOFFSET);
 					if(GUILayout.Button(MA_TextureAtlasserProIcons.createQuadIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true)))
 					{
-						MA_TextureAtlasserProUtils.CreateTextureQuad(curWindow.textureAtlas, "new Quad", new Rect(0, 0, 128, 128));
+						MA_TextureAtlasserProUtils.CreateTextureQuad(curWindow.textureAtlas, "new Quad", new Rect(0, 0, 128, 128), curWindow.settings.autoFocus);
 					}
 					if(curWindow.textureAtlas.selectedTextureQuad != null && GUILayout.Button(MA_TextureAtlasserProIcons.removeQuadIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true)))
 					{
 						if(curWindow.textureAtlas.selectedTextureQuad != null)
-							MA_TextureAtlasserProUtils.RemoveTextureQuad(curWindow.textureAtlas);		
+							MA_TextureAtlasserProUtils.RemoveTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus);		
+					}
+					if (curWindow.textureAtlas.selectedTextureQuad != null && GUILayout.Button(MA_TextureAtlasserProIcons.duplicateQuadIcon, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true)))
+					{
+						if (curWindow.textureAtlas.selectedTextureQuad != null)
+							MA_TextureAtlasserProUtils.DuplicateTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus, curWindow.settings.copySelectedQuadData, curWindow.settings.duplicatedQuadNamePrefix);
 					}
 				}

@ -74,3 +80,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProViewBase.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProViewBase.cs
@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_EDITOR
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@ -53,3 +54,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs
@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_EDITOR
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using MA_Editor;
@ -88,6 +89,34 @@ namespace MA_TextureAtlasserPro
                zoomCoordsOrigin -= delta;

                e.Use();
+            }
+
+			//Hotkeys.
+			if (curWindow.settings.useHotkeys)
+			{
+				if(curWindow.textureAtlas != null)
+				{
+					if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.addQuadHotKey)
+					{
+						MA_TextureAtlasserProUtils.CreateTextureQuad(curWindow.textureAtlas, "new Quad", new Rect(0, 0, 128, 128), curWindow.settings.autoFocus);
+						e.Use();
+					}
+
+					if (curWindow.textureAtlas.selectedTextureQuad != null)
+					{
+						if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.removeQuadHotKey)
+						{
+							MA_TextureAtlasserProUtils.RemoveTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus);
+							e.Use();
+						}
+
+						if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.duplicateHotKey)
+						{
+							MA_TextureAtlasserProUtils.DuplicateTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus, curWindow.settings.copySelectedQuadData, curWindow.settings.duplicatedQuadNamePrefix);
+							e.Use();
+						}
+					}
+				}
 			}
 		}

@ -120,3 +149,4 @@ namespace MA_TextureAtlasserPro
        }
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProCreateWindow.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProCreateWindow.cs
@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_EDITOR
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@ -168,3 +169,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs
@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_EDITOR
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@ -133,3 +134,4 @@ namespace MA_TextureAtlasserPro
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs
@ -1,4 +1,5 @@
-using System.Collections;
+#if UNITY_EDITOR
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@ -8,6 +9,7 @@ namespace MA_TextureAtlasserPro
    public class MA_TextureAtlasserProWindow : EditorWindow 
    {
        public static MA_TextureAtlasserProWindow thisWindow;
+		public MA_TextureAtlasserProSettings settings;
        public MA_TextureAtlasserProAtlas textureAtlas;

        public MA_TextureAtlasserProWorkView workView;
@ -56,6 +58,7 @@ namespace MA_TextureAtlasserPro
 				GetCurrentWindow();
 			}

+			thisWindow.settings = MA_TextureAtlasserProUtils.LoadSettings();
 			thisWindow.workView = new MA_TextureAtlasserProWorkView(thisWindow, "workView");
 			thisWindow.menuView = new MA_TextureAtlasserProMenuView(thisWindow, "menuView");
 			thisWindow.inspectorView = new MA_TextureAtlasserProInspectorView(thisWindow, "inspectorView");
@ -86,7 +89,7 @@ namespace MA_TextureAtlasserPro
 			}
 			
 			//Check views
-			if(workView == null || menuView == null || inspectorView == null || debugView == null)
+			if(settings == null || workView == null || menuView == null || inspectorView == null || debugView == null)
 			{
 				CreateViews();
 				return;
@ -117,3 +120,4 @@ namespace MA_TextureAtlasserPro
        }
    }
 }
+#endif
--- a/MA_ToolBox/MA_TextureAtlasserPro/Settings/Settings.txt
+++ b/MA_ToolBox/MA_TextureAtlasserPro/Settings/Settings.txt
@ -0,0 +1 @@
+Settigns are supposed to be here.
--- a/MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorGridUtils.cs
+++ b/MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorGridUtils.cs
@ -1,6 +1,7 @@
 //Maxartz15
 //Version 1.0

+#if UNITY_EDITOR
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@ -59,3 +60,4 @@ namespace MA_Editor.Grid
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorRectUtils.cs
+++ b/MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorRectUtils.cs
@ -1,6 +1,7 @@
 //Maxartz15
 //Version 1.0

+#if UNITY_EDITOR
 using UnityEngine;
 using MA_Editor;

@ -68,3 +69,4 @@ namespace MA_Editor.RectUtils
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorZoomUtils.cs
+++ b/MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorZoomUtils.cs
@ -1,6 +1,7 @@
 //Maxartz15
 //Version 1.0

+#if UNITY_EDITOR
 using UnityEngine;
 using MA_Editor;
 using MA_Editor.RectUtils;
@ -37,3 +38,4 @@ namespace MA_Editor.GUILayoutZoom
 		}
 	}
 }
+#endif
--- a/MA_ToolBox/MA_Utilities/MeshUtils/MA_MeshUtils.cs
+++ b/MA_ToolBox/MA_Utilities/MeshUtils/MA_MeshUtils.cs
@ -1,6 +1,7 @@
 //Maxartz15
 //Version 1.0

+#if UNITY_EDITOR
 using System;
 using System.IO;
 using System.Text;
@ -185,3 +186,4 @@ namespace MA_Mesh
 		public string textureName;
 	}
 }
+#endif
--- a/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs
+++ b/MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs
@ -3,6 +3,7 @@
 //Part of MA_TextureUtils
 //https://github.com/maxartz15/MA_TextureUtils

+#if UNITY_EDITOR
 using UnityEngine;
 using UnityEditor;
 using System.IO;
@ -201,3 +202,4 @@ namespace MA_Texture
        #endregion
    }
 }
+#endif
--- a/README.md
+++ b/README.md
@ -6,4 +6,6 @@ By having full control over the size and position of the textures that are being

 https://youtu.be/PBRKlopkZP0

+Download the UnityPackage here: https://github.com/maxartz15/MA_TextureAtlasser/releases
+
 For more information: https://maxartz15.com/ma_textureatlas/
Author	SHA1	Message	Date
max	78e4fb0ad1	#if UNITY_EDITOR Added '#if UNITY_EDITOR' to all the scripts that should only run/be used in the editor.	2019-05-04 13:29:02 +02:00
max	7990f987dc	Settings, Hotkey bugfix. null errors.	2019-03-31 18:45:16 +02:00
max	82efcbb6d0	Duplicate Quad, Settings, Hotkeys. Added the option to duplicate the selected quad. Added settings for focus, duplication, hotkeys. Added hotkeys, can be enabled in the settings file.	2019-03-31 18:09:53 +02:00
Max Kruf	7f5e22b3c1	Update README.md	2018-09-01 00:40:20 +02:00
Max Kruf	c91c1cb7ee	Update LICENSE	2018-08-27 12:07:30 +02:00