Merged in playemgames/unity-ui-extensions-1/playemgames/hack-to-clear-out-culled-images-to-prope-1470396744892 (pull request #26)

Hack to clear out culled images to properly position them instead of reuse images.

--HG--
branch : develop_5.3
release
Simon Jackson 2016-08-30 21:30:58 +01:00
commit c2bb97f1bd
1 changed files with 24 additions and 1 deletions

View File

@ -13,12 +13,16 @@ namespace UnityEngine.UI.Extensions
// Image according to the label inside the name attribute to load, read from the Resources directory. The size of the image is controlled by the size property. // Image according to the label inside the name attribute to load, read from the Resources directory. The size of the image is controlled by the size property.
// Use: <quad name=NAME size=25 width=1 /> // Use: <quad name=NAME size=25 width=1 />
[AddComponentMenu("UI/Extensions/TextPic")] [AddComponentMenu("UI/Extensions/TextPic")]
[ExecuteInEditMode] // Needed for culling images that are not used //
public class TextPic : Text, IPointerClickHandler, IPointerExitHandler, IPointerEnterHandler, ISelectHandler public class TextPic : Text, IPointerClickHandler, IPointerExitHandler, IPointerEnterHandler, ISelectHandler
{ {
/// <summary> /// <summary>
/// Image Pool /// Image Pool
/// </summary> /// </summary>
private readonly List<Image> m_ImagesPool = new List<Image>(); private readonly List<Image> m_ImagesPool = new List<Image>();
private readonly List<GameObject> culled_ImagesPool = new List<GameObject>();
private bool clearImages = false;
/// <summary> /// <summary>
/// Vertex Index /// Vertex Index
@ -162,9 +166,17 @@ namespace UnityEngine.UI.Extensions
{ {
if (m_ImagesPool[i]) if (m_ImagesPool[i])
{ {
m_ImagesPool[i].enabled = false; /* TEMPORARY FIX REMOVE IMAGES FROM POOL DELETE LATER SINCE CANNOT DESTROY */
// m_ImagesPool[i].enabled = false;
m_ImagesPool[i].gameObject.SetActive(false);
m_ImagesPool[i].gameObject.hideFlags = HideFlags.HideAndDontSave;
culled_ImagesPool.Add(m_ImagesPool[i].gameObject);
m_ImagesPool.Remove(m_ImagesPool[i]);
} }
} }
if (culled_ImagesPool.Count > 1) {
clearImages = true;
}
} }
protected override void OnPopulateMesh(VertexHelper toFill) protected override void OnPopulateMesh(VertexHelper toFill)
@ -403,5 +415,16 @@ namespace UnityEngine.UI.Extensions
public readonly List<Rect> boxes = new List<Rect>(); public readonly List<Rect> boxes = new List<Rect>();
} }
/* TEMPORARY FIX REMOVE IMAGES FROM POOL DELETE LATER SINCE CANNOT DESTROY */
void Update() {
if (clearImages) {
for (int i = 0; i < culled_ImagesPool.Count; i++){
DestroyImmediate(culled_ImagesPool[i]);
}
culled_ImagesPool.Clear();
clearImages = false;
}
}
} }
} }