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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,5 @@
using System.Collections; #if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -17,3 +18,4 @@ namespace MA_TextureAtlasserPro
public string name; public string name;
} }
} }
#endif

View File

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

View File

@ -1,3 +1,4 @@
#if UNITY_EDITOR
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
@ -211,7 +212,7 @@ namespace MA_TextureAtlasserPro
{ {
if(atlas != null && atlas.selectedTextureQuad != null) 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) if(copyData)
{ {
@ -378,3 +379,4 @@ namespace MA_TextureAtlasserPro
} }
} }
} }
#endif

View File

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

View File

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

View File

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

View File

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

View File

@ -1,4 +1,5 @@
using System.Collections; #if UNITY_EDITOR
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using MA_Editor; using MA_Editor;
@ -92,6 +93,8 @@ namespace MA_TextureAtlasserPro
//Hotkeys. //Hotkeys.
if (curWindow.settings.useHotkeys) if (curWindow.settings.useHotkeys)
{
if(curWindow.textureAtlas != null)
{ {
if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.addQuadHotKey) if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.addQuadHotKey)
{ {
@ -109,12 +112,13 @@ namespace MA_TextureAtlasserPro
if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.duplicateHotKey) if (e.type == EventType.KeyDown && e.keyCode == curWindow.settings.duplicateHotKey)
{ {
MA_TextureAtlasserProUtils.DuplicateTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus); MA_TextureAtlasserProUtils.DuplicateTextureQuad(curWindow.textureAtlas, curWindow.settings.autoFocus, curWindow.settings.copySelectedQuadData, curWindow.settings.duplicatedQuadNamePrefix);
e.Use(); e.Use();
} }
} }
} }
} }
}
private Vector2 ConvertScreenCoordsToZoomCoords(Vector2 screenCoords) private Vector2 ConvertScreenCoordsToZoomCoords(Vector2 screenCoords)
{ {
@ -145,3 +149,4 @@ namespace MA_TextureAtlasserPro
} }
} }
} }
#endif

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,7 @@
//Maxartz15 //Maxartz15
//Version 1.0 //Version 1.0
#if UNITY_EDITOR
using UnityEngine; using UnityEngine;
using MA_Editor; using MA_Editor;
@ -68,3 +69,4 @@ namespace MA_Editor.RectUtils
} }
} }
} }
#endif

View File

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

View File

@ -1,6 +1,7 @@
//Maxartz15 //Maxartz15
//Version 1.0 //Version 1.0
#if UNITY_EDITOR
using System; using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
@ -185,3 +186,4 @@ namespace MA_Mesh
public string textureName; public string textureName;
} }
} }
#endif

View File

@ -3,6 +3,7 @@
//Part of MA_TextureUtils //Part of MA_TextureUtils
//https://github.com/maxartz15/MA_TextureUtils //https://github.com/maxartz15/MA_TextureUtils
#if UNITY_EDITOR
using UnityEngine; using UnityEngine;
using UnityEditor; using UnityEditor;
using System.IO; using System.IO;
@ -201,3 +202,4 @@ namespace MA_Texture
#endregion #endregion
} }
} }
#endif