max/MA_TextureAtlasser
1
0
Fork 0
mirror of https://github.com/maxartz15/MA_TextureAtlasser.git synced 2025-07-07 08:46:07 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: max:1.1
Branches Tags
max:master
max:1.8.5 max:1.8.4 max:1.8.3 max:1.8.2 max:1.8.1 max:1.8.0 max:1.7.5 max:1.7.4 max:1.7.3 max:1.7.2 max:1.7.1 max:1.7 max:1.6 max:1.6.1 max:1.5 max:1.4 max:1.3 max:1.2 max:1.1 max:1.0
...
compare: max:1.2
Branches Tags
max:master
max:1.8.5 max:1.8.4 max:1.8.3 max:1.8.2 max:1.8.1 max:1.8.0 max:1.7.5 max:1.7.4 max:1.7.3 max:1.7.2 max:1.7.1 max:1.7 max:1.6 max:1.6.1 max:1.5 max:1.4 max:1.3 max:1.2 max:1.1 max:1.0

2 Commits
1.1 ... 1.2

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
19 changed files with 79 additions and 38 deletions
Expand all files Collapse all files

2
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProAtlas.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -101,3 +102,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

2
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProQuad.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -164,3 +165,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureAtlasserProSettings.cs
View File

@ -1,4 +1,5 @@
using System.Collections;
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
@ -23,3 +24,4 @@ namespace MA_TextureAtlasserPro
public KeyCode duplicateHotKey = KeyCode.D;
}
}
#endif

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Data/MA_TextureGroup.cs
View File

@ -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

2
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProIcons.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using UnityEngine;
using UnityEditor;
@ -33,3 +34,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Utils/MA_TextureAtlasserProUtils.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -211,7 +212,7 @@ namespace MA_TextureAtlasserPro
{
if(atlas != null && atlas.selectedTextureQuad != null)
{
CreateTextureQuad(atlas, namePrefix + atlas.selectedTextureQuad.name, atlas.selectedTextureQuad.rect);
CreateTextureQuad(atlas, namePrefix + atlas.selectedTextureQuad.name, atlas.selectedTextureQuad.rect, false);
if(copyData)
{
@ -378,3 +379,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

2
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProDebugView.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -76,3 +77,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

2
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -132,3 +133,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

2
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProMenuView.cs
View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -79,3 +80,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProViewBase.cs
View File

@ -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

31
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProWorkView.cs
View File

@ -1,4 +1,5 @@
using System.Collections;
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using MA_Editor;
@ -93,24 +94,27 @@ namespace MA_TextureAtlasserPro
//Hotkeys.
if (curWindow.settings.useHotkeys)
{
if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.addQuadHotKey)
if(curWindow.textureAtlas != null)
{
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)
if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.addQuadHotKey)
{
MA_TextureAtlasserProUtils.RemoveTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus);
MA_TextureAtlasserProUtils.CreateTextureQuad(curWindow.textureAtlas, "new Quad", new Rect(0, 0, 128, 128), curWindow.settings.autoFocus);
e.Use();
}
if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.duplicateHotKey)
if (curWindow.textureAtlas.selectedTextureQuad != null)
{
MA_TextureAtlasserProUtils.DuplicateTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus);
e.Use();
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();
}
}
}
}
@ -145,3 +149,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProCreateWindow.cs
View File

@ -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

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProExportWindow.cs
View File

@ -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

4
MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Windows/MA_TextureAtlasserProWindow.cs
View File

@ -1,4 +1,5 @@
using System.Collections;
#if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
@ -119,3 +120,4 @@ namespace MA_TextureAtlasserPro
}
}
}
#endif

2
MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorGridUtils.cs
View File

@ -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

2
MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorRectUtils.cs
View File

@ -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

2
MA_ToolBox/MA_Utilities/EditorUtils/MA_EditorZoomUtils.cs
View File

@ -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

2
MA_ToolBox/MA_Utilities/MeshUtils/MA_MeshUtils.cs
View File

@ -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

2
MA_ToolBox/MA_Utilities/TextureUtils/MA_TextureUtils.cs
View File

@ -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