Otimization

Mateus Lustosa
1 parent 39372c3a
Showing 5 changed files with 142 additions and 121 deletions Show diff stats
Assets/Scenes/Main.unity
Assets/Scripts/Animation List/Trie.cs
Assets/Scripts/Animation List/Trie.cs.meta
Assets/Scripts/Player Manager/GenericPlayerManager.cs
Assets/Scripts/PlayerManager.cs
@@ -5756,7 +5756,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &970584909
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6697,7 +6697,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Version 3.0.34
+  m_Text: Version 3.0.36
 --- !u!222 &1071047506
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -13955,7 +13955,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2099411279
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13970,10 +13970,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 702185295}
   m_RootOrder: 2
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 260.71997, y: -76.62858}
+  m_SizeDelta: {x: 106, y: 106}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2099411280
 MonoBehaviour:
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace LAViD.VLibras.Generic
+{
+    class Node
+    {
+        private bool end = false;
+        private Node[] children = null;
+    }
+
+    class Trie
+    {
+        private Node root;
+
+        // public Trie()
+    }
+}
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 3238f46fe9379b2469349a4bce058b65
+timeCreated: 1476385070
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -187,8 +187,8 @@ public abstract class GenericPlayerManager : MonoBehaviour {
 	/* Para animações */
 	public void stopAnimations()
 	{
-		StopCoroutine("AnimationsHandler");
-		this.randomAnimations.unlockFor("AnimationsHandler");
+		StopCoroutine("AnimationsWatcher");
+		this.randomAnimations.unlockFor("AnimationsWatcher");
 		this.subtitles.setText("");
 		lock (this.animQueue) { this.animQueue.Clear(); }
@@ -472,13 +472,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
 		string lastAnimationSubtitle = "";
 		bool spelled = false;
-		if ( ! this.playing)
-			StartCoroutine("AnimationsHandler");
-
-		String[] stringPos = gloss.Split(' ');
-
 		Queue<ToPlay> toPlayQueue = new Queue<ToPlay>();
-		int wordsCount = 0;
 		toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", this));
         /*WWW checkConnectionRequest = getCheckConnectionRequest();
@@ -497,9 +491,9 @@ public abstract class GenericPlayerManager : MonoBehaviour {
         bool connected = true;
         bool playingStarted = false;
+		String[] stringPos = gloss.Split(' ');
         foreach (string aniName in stringPos)
 		{
-			wordsCount++;
 			if (String.IsNullOrEmpty(aniName)) continue;
 			bool nonexistent = nonexistentAssetBundles.Contains(aniName);
@@ -508,41 +502,46 @@ public abstract class GenericPlayerManager : MonoBehaviour {
 			if ( ! nonexistent && ! loaded && connected)
 			{
                 WWW bundleRequest = loadAssetBundle(aniName);
-                yield return WaitForResponse(bundleRequest);
-
-                PlayerLogger.Log("GPM", "L", "Bundle request done (" + aniName + ").");
-                if (bundleRequest.isDone && bundleRequest.error == null)
+                if (bundleRequest != null)
                 {
-                    AssetBundle bundle = bundleRequest.assetBundle;
+                    yield return WaitForResponse(bundleRequest);
+
+                    PlayerLogger.Log("GPM", "L", "Bundle request done (" + aniName + ").");
-                    if (bundle != null && !String.IsNullOrEmpty(bundle.mainAsset.name))
+                    if (bundleRequest.isDone && bundleRequest.error == null)
                     {
-                        AnimationClip aniClip = bundle.mainAsset as AnimationClip;
-                        bundle.Unload(false);
+                        AssetBundle bundle = bundleRequest.assetBundle;
-                        if (aniClip)
+                        if (bundle != null && !String.IsNullOrEmpty(bundle.mainAsset.name))
                         {
-                            COMPONENT_ANIMATION.AddClip(aniClip, aniName);
-                            if (playingStarted) yield return new WaitForEndOfFrame();
+                            AnimationClip aniClip = bundle.mainAsset as AnimationClip;
+                            bundle.Unload(false);
-                            loadedAssetBundles.Add(aniName);
-                            loaded = true;
+                            if (aniClip)
+                            {
+                                COMPONENT_ANIMATION.AddClip(aniClip, aniName);
+                                if (playingStarted) yield return new WaitForEndOfFrame();
-                            PlayerLogger.Log("GPM", "L", "Bundle \"" + aniName + "\" loaded!");
+                                loadedAssetBundles.Add(aniName);
+                                loaded = true;
+
+                                PlayerLogger.Log("GPM", "L", "Bundle \"" + aniName + "\" loaded!");
+                            }
+                            else PlayerLogger.Log("GPM", "L", "Sign \"" + aniName + "\" wasn't loaded successfuly.");
                         }
-                        else PlayerLogger.Log("GPM", "L", "Sign \"" + aniName + "\" wasn't loaded successfuly.");
-                    }
-                    else PlayerLogger.Log("GPM", "L", "Bundle \"" + aniName + "\" wasn't loaded successfuly.");
+                        else PlayerLogger.Log("GPM", "L", "Bundle \"" + aniName + "\" wasn't loaded successfuly.");
-                    if ( ! loaded) nonexistentAssetBundles.Add(aniName);
-                }
-                else
-                {
-                    PlayerLogger.Log("GPM", "L", "Connection error.");
-                    onConnectionError(gloss, aniName);
+                        if ( ! loaded) nonexistentAssetBundles.Add(aniName);
+                    }
+                    else
+                    {
+                        PlayerLogger.Log("GPM", "L", "Connection error.");
+                        onConnectionError(gloss, aniName);
+                    }
                 }
-			}
+                else PlayerLogger.Log("GPM", "L", "Animation of \"" + aniName + "\" do not exist.");
+            }
 			// Reproduz palavra
 			if (loaded)
@@ -588,7 +587,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
 				}
 			}
-			if (toPlayQueue.Count > 4 || wordsCount == stringPos.Length) {
+			if (toPlayQueue.Count > 4) {
                 playingStarted = true;
                 while (toPlayQueue.Count > 0)
@@ -601,6 +600,12 @@ public abstract class GenericPlayerManager : MonoBehaviour {
             if (playingStarted) yield return new WaitForEndOfFrame();
         }
+		while (toPlayQueue.Count > 0)
+		{
+			toPlayQueue.Dequeue().play(this);
+			yield return new WaitForEndOfFrame();
+		}
+
 		// Default
 		playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "");
@@ -610,93 +615,75 @@ public abstract class GenericPlayerManager : MonoBehaviour {
 	}
 	/* Sincroniza as legendas com as animações. */
-	IEnumerator AnimationsHandler()
+	IEnumerator AnimationsWatcher()
 	{
-		this.playing = true;
-		this.randomAnimations.lockFor("AnimationsHandler");
-		onPlayingStateChange();
-
-		bool isNotEmpty = this.animQueue.Count > 0;
-
-		// Animação anterior a atual
-		AnimationReference endedAnimation = null;
-
-		// Enquanto estiver executando a corotina "Loader"
-		// ou existir animações na fila de reprodução
-		while (loading || isNotEmpty)
+		PlayerLogger.Log("GPM", "AW", "Starting.");
+		
+		while (true)
 		{
-			// Se não houver animações na fila, espera
-			if (isNotEmpty)
+			if (this.animQueue.Count > 0)
 			{
-				// Pega primeira animação
-				AnimationReference reference;
-				lock (this.animQueue) { reference = this.animQueue.Peek(); }
-
-				// Se estiver sendo reproduzida
-				if (COMPONENT_ANIMATION.IsPlaying(reference.name))
+				if (!this.playing)
 				{
-					this.subtitles.setText(reference.subtitle);
+					PlayerLogger.Log("GPM", "AW", "Playing.");
-					// Animação seguinte
-					AnimationReference next = null;
-					lock (this.animQueue)
-					{
-						this.animationPlaying = this.animQueue.Dequeue();
+					this.playing = true;
+					onPlayingStateChange();
-						if (this.animQueue.Count > 0)
-							next = this.animQueue.Peek();
-					}
+					this.randomAnimations.lockFor("AnimationsWatcher");
+				}
+				// Gets first animation
+				AnimationReference reference = this.animQueue.Peek();
+				
+				if (COMPONENT_ANIMATION.IsPlaying(reference.name))
+				{
+					this.animationPlaying = this.animQueue.Dequeue();
+					this.subtitles.setText(reference.subtitle);
+					
+					// Watches transition between current and next animation
 					while (true)
 					{
-						// Se a próxima animação estiver sendo reproduzida (no fade)
+						yield return new WaitForEndOfFrame();
+
+						// Gets next animation
+						AnimationReference next = this.animQueue.Count > 0 ? this.animQueue.Peek() : null;
+						
 						if (next != null && COMPONENT_ANIMATION.IsPlaying(next.name))
 						{
-							// Se a animação anterior a atual não tiver acabado,
-							// espera acabar e só então conta o tempo
-							if (endedAnimation != null)
-								while (COMPONENT_ANIMATION.IsPlaying(endedAnimation.name))
-									yield return null;
-
-							// Tempo para pular para a legenda da próxima animação
-							yield return new WaitForSeconds(0.4F);
-							
-							endedAnimation = reference;
+							// Waits next animation starts
+							while (!COMPONENT_ANIMATION.IsPlaying(next.name))
+								yield return new WaitForEndOfFrame();
+
+							// Waits half fade
+							yield return new WaitForSeconds(this.fadeLength / 2);
 							break;
 						}
-
-						else if (COMPONENT_ANIMATION.IsPlaying(reference.name))
-							yield return null;
-
-						else break;
+						else if (!COMPONENT_ANIMATION.IsPlaying(reference.name)) break;
 					}
-
-					reference = null;
 				}
-				// Se a animação não tiver sido liberada e seu AnimationState for nulo,
-				// a animação será liberada
-				if (reference != null && reference.state == null)
+				// Animation played but was not tracked
+				if (reference.state == null)
 					this.animQueue.Dequeue();
-				else
-					yield return null;
-			}
-			else yield return null;
-
-			isNotEmpty = this.animQueue.Count > 0;
-		}
+			}	
+			else if (this.playing && !this.loading)
+			{
+				PlayerLogger.Log("GPM", "AW", "Not playing.");
-		this.subtitles.setText("");
+				resetStates();
-		resetStates();
-		this.randomAnimations.unlockFor("AnimationsHandler");
+				this.subtitles.setText("");
+				this.randomAnimations.unlockFor("AnimationsWatcher");
+			}
+		}
 	}
 	public void resetStates()
 	{
-		this.animationPlaying = null;
 		this.playing = false;
 		this.paused = false;
+		this.animationPlaying = null;
 		onPlayingStateChange();
 	}
@@ -68,8 +68,8 @@ public class PlayerManager : GenericPlayerManager {
 #endif
         Screen.fullScreen = false;
-		// Hide input text preview
-		// TouchScreenKeyboard.hideInput = true;
+
+        
 	}
 	public void playDict(string word)
@@ -120,19 +120,19 @@ public class PlayerManager : GenericPlayerManager {
 	protected override WWW loadAssetBundle(string aniName)
 	{
-        string address = BASE_URL + regionPath + WWW.EscapeURL(aniName);
+        if (this.regionHash == 1)
+        {
+            // Check if it exists in trie
+        }
+
+        string address = BASE_URL + this.regionPath + WWW.EscapeURL(aniName);
         PlayerLogger.Log("PM", "lAB", "Requesting bundle: " + address);
 		return WWW.LoadFromCacheOrDownload(address, this.regionHash);
 	}
-	private System.Object LOCKER_STATE = new System.Object();
-
-    public override void onPlayingStateChange()
-	{
-		lock (LOCKER_STATE) {
-			this.screenManager.changeStates(base.isPlaying(), base.isPaused(), ! String.IsNullOrEmpty(base.gloss));
-		}
+    public override void onPlayingStateChange() {
+		this.screenManager.changeStates(base.isPlaying(), base.isPaused(), ! String.IsNullOrEmpty(base.gloss));
 	}
     public override void onConnectionError(string gloss, string word)
@@ -207,13 +207,8 @@ public class PlayerManager : GenericPlayerManager {
     protected override IEnumerator WaitForResponse(WWW www)
     {
         PlayerLogger.Log("PM", "WFR", "Stating time check.");
-
-#if UNITY_ANDROID
-        const float timeoutLimit = 10f;
-#elif UNITY_IOS
-        const float timeoutLimit = 3f;
-#endif
+        const float timeoutLimit = 10f;
         float timer = 0;
         while ( ! www.isDone)
@@ -263,9 +258,16 @@ public class PlayerManager : GenericPlayerManager {
                 PlayerLogger.Log("PM", "t", "(WWW) Error: " + glossRequest.error);
             }
-            else if (glossRequest.responseHeaders.Count == 0 || !glossRequest.responseHeaders["STATUS"].EndsWith("200 OK"))
+            else if (glossRequest.responseHeaders.Count == 0)
+            {
+                PlayerLogger.Log("PM", "t", "Unsuccessful answer (0).");
+
+                this.screenManager.showConnectionErrorDialog(
+                    PlayerManager.ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE);
+            }
+            else if (!glossRequest.responseHeaders["STATUS"].Contains("200"))
             {
-                PlayerLogger.Log("PM", "t", "Unsuccessful answer.");
+                PlayerLogger.Log("PM", "t", "Unsuccessful answer (" + glossRequest.responseHeaders["STATUS"] + ").");
                 this.screenManager.showConnectionErrorDialog(
                     PlayerManager.ERROR_STATUS_MESSAGE.TRANSLATOR_CONNECTION_FAILURE);
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+using System;
	2	+using System.Collections.Generic;
	3	+using System.Linq;
	4	+using System.Text;
	5	+
	6	+namespace LAViD.VLibras.Generic
	7	+{
	8	+ class Node
	9	+ {
	10	+ private bool end = false;
	11	+ private Node[] children = null;
	12	+ }
	13	+
	14	+ class Trie
	15	+ {
	16	+ private Node root;
	17	+
	18	+ // public Trie()
	19	+ }
	20	+}
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+fileFormatVersion: 2
	2	+guid: 3238f46fe9379b2469349a4bce058b65
	3	+timeCreated: 1476385070
	4	+licenseType: Pro
	5	+MonoImporter:
	6	+ serializedVersion: 2
	7	+ defaultReferences: []
	8	+ executionOrder: 0
	9	+ icon: {instanceID: 0}
	10	+ userData:
	11	+ assetBundleName:
	12	+ assetBundleVariant: