From e37ad421d07875a0509dd209cca61861dae64270 Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Wed, 5 Oct 2016 22:12:24 -0300 Subject: [PATCH] Fix merge --- Assets/InputResizer.cs | 39 --------------------------------------- Assets/InputResizer.cs.meta | 12 ------------ Assets/Logger.cs | 25 ------------------------- Assets/Logger.cs.meta | 12 ------------ Assets/Scripts/Player Manager/GenericPlayerManager.cs | 25 +++++++++++++------------ Assets/Scripts/Player Manager/Logger.cs | 28 ++++++++++++++++++++++++++++ Assets/Scripts/Player Manager/Logger.cs.meta | 12 ++++++++++++ Assets/Scripts/Player Manager/Utils.cs | 3 ++- Assets/Scripts/PlayerManager.cs | 40 ++++++++++++++++++++-------------------- Assets/Scripts/UI/InputResizer.cs | 39 +++++++++++++++++++++++++++++++++++++++ Assets/Scripts/UI/InputResizer.cs.meta | 12 ++++++++++++ 11 files changed, 126 insertions(+), 121 deletions(-) delete mode 100644 Assets/InputResizer.cs delete mode 100644 Assets/InputResizer.cs.meta delete mode 100644 Assets/Logger.cs delete mode 100644 Assets/Logger.cs.meta create mode 100644 Assets/Scripts/Player Manager/Logger.cs create mode 100644 Assets/Scripts/Player Manager/Logger.cs.meta create mode 100644 Assets/Scripts/UI/InputResizer.cs create mode 100644 Assets/Scripts/UI/InputResizer.cs.meta diff --git a/Assets/InputResizer.cs b/Assets/InputResizer.cs deleted file mode 100644 index e9055fb..0000000 --- a/Assets/InputResizer.cs +++ /dev/null @@ -1,39 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -public class InputResizer : MonoBehaviour { - - protected void Start() - { - Text text = gameObject.GetComponent(); - - if (Screen.dpi < 140) - { - text.fontSize = 20; - } - - // 240 - else if (Screen.dpi < 280) - { - text.fontSize = 32; - } - - // 320 - else if (Screen.dpi < 400) - { - text.fontSize = 44; - } - - // 480 - else if (Screen.dpi < 500) - { - text.fontSize = 56; - } - - else - { - text.fontSize = 56; - } - } - -} diff --git a/Assets/InputResizer.cs.meta b/Assets/InputResizer.cs.meta deleted file mode 100644 index 640e481..0000000 --- a/Assets/InputResizer.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f8db495bb0057e14eb35ef4f2df7910e -timeCreated: 1475710064 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Logger.cs b/Assets/Logger.cs deleted file mode 100644 index 5bf3a2d..0000000 --- a/Assets/Logger.cs +++ /dev/null @@ -1,25 +0,0 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; - -public class Logger : MonoBehaviour { - - public static Logger instance; - - private Text textObj; - - void Start () - { - Logger.instance = this; - this.textObj = this.gameObject.GetComponent(); - } - - public static void Log(string text) - { - if (Logger.instance != null) - Logger.instance.textObj.text = text + "\n" + Logger.instance.textObj.text; - - Debug.Log(text); - } - -} diff --git a/Assets/Logger.cs.meta b/Assets/Logger.cs.meta deleted file mode 100644 index 38ab2c4..0000000 --- a/Assets/Logger.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a9cc0ccbda0accb4ea816c19265b622f -timeCreated: 1475670486 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Player Manager/GenericPlayerManager.cs b/Assets/Scripts/Player Manager/GenericPlayerManager.cs index 7ba5f4a..1c8667e 100644 --- a/Assets/Scripts/Player Manager/GenericPlayerManager.cs +++ b/Assets/Scripts/Player Manager/GenericPlayerManager.cs @@ -27,6 +27,7 @@ using System.Collections.Generic; using System; using System.Threading; using UnityEngine.UI; +using LAViD.VLibras; public abstract class GenericPlayerManager : MonoBehaviour { @@ -219,7 +220,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { return state; } catch (NullReferenceException nre) { - Logger.Log("'" + name + "' não foi encontrado!\n" + nre.ToString()); + LAViD.VLibras.Utils.Logger.Log("'" + name + "' não foi encontrado!\n" + nre.ToString()); } return null; @@ -422,7 +423,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { this.subtitles.updateLetterSpeed(); } - Logger.Log("Animação \"" + animName + "\" inexistente."); + LAViD.VLibras.Utils.Logger.Log("Animação \"" + animName + "\" inexistente."); } else { @@ -504,10 +505,10 @@ public abstract class GenericPlayerManager : MonoBehaviour { if (checkConnectionRequest.responseHeaders.Count > 0) { - Logger.Log(checkConnectionRequest.responseHeaders["STATUS"]); + LAViD.VLibras.Utils.Logger.Log(checkConnectionRequest.responseHeaders["STATUS"]); connected = checkConnectionRequest.responseHeaders["STATUS"].Contains("404"); } - else Logger.Log("No response headers.");*/ + else LAViD.VLibras.Utils.Logger.Log("No response headers.");*/ bool connected = true; bool playingStarted = false; @@ -525,15 +526,15 @@ public abstract class GenericPlayerManager : MonoBehaviour { WWW www = loadAssetBundle(aniName); yield return www; - Logger.Log("Bundle request done (" + aniName + ")."); + LAViD.VLibras.Utils.Logger.Log("Bundle request done (" + aniName + ")."); if (www.error == null) { AssetBundle bundle = www.assetBundle; - /*Logger.Log("count: " + www.responseHeaders.Count); + /*LAViD.VLibras.Utils.Logger.Log("count: " + www.responseHeaders.Count); if (www.responseHeaders.Count > 0) - Logger.Log(www.responseHeaders["STATUS"]); + LAViD.VLibras.Utils.Logger.Log(www.responseHeaders["STATUS"]); // if (www.responseHeaders.Count > 0 && www.responseHeaders["STATUS"].EndsWith("200 OK")); */ @@ -551,14 +552,14 @@ public abstract class GenericPlayerManager : MonoBehaviour { loadedAssetBundles.Add(aniName); loaded = true; - Logger.Log("Bundle \"" + aniName + "\" loaded!"); + LAViD.VLibras.Utils.Logger.Log("Bundle \"" + aniName + "\" loaded!"); } - else Logger.Log("Sinal \"" + aniName + "\" foi não carregado corretamente."); + else LAViD.VLibras.Utils.Logger.Log("Sinal \"" + aniName + "\" foi não carregado corretamente."); } } else { - Logger.Log("Connection error"); + LAViD.VLibras.Utils.Logger.Log("Connection error"); onConnectionError(gloss, aniName); } } @@ -592,11 +593,11 @@ public abstract class GenericPlayerManager : MonoBehaviour { // adiciona ao set de animações não existentes if ( ! nonexistent && connected) { - Logger.Log("Non existent"); + LAViD.VLibras.Utils.Logger.Log("Non existent"); nonexistentAssetBundles.Add(aniName); } - Logger.Log("~~ To spell: " + aniName); + LAViD.VLibras.Utils.Logger.Log("~~ To spell: " + aniName); if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) { diff --git a/Assets/Scripts/Player Manager/Logger.cs b/Assets/Scripts/Player Manager/Logger.cs new file mode 100644 index 0000000..10945c5 --- /dev/null +++ b/Assets/Scripts/Player Manager/Logger.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace LAViD.VLibras.Utils { + + public class Logger : MonoBehaviour { + + public static Logger instance; + + private Text textObj; + + void Start() + { + Logger.instance = this; + this.textObj = this.gameObject.GetComponent(); + } + + public static void Log(string text) + { + if (Logger.instance != null) + Logger.instance.textObj.text = text + "\n" + Logger.instance.textObj.text; + + Debug.Log(text); + } + + } + +} diff --git a/Assets/Scripts/Player Manager/Logger.cs.meta b/Assets/Scripts/Player Manager/Logger.cs.meta new file mode 100644 index 0000000..aaad33c --- /dev/null +++ b/Assets/Scripts/Player Manager/Logger.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a9cc0ccbda0accb4ea816c19265b622f +timeCreated: 1475716239 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player Manager/Utils.cs b/Assets/Scripts/Player Manager/Utils.cs index c3f7f49..4bee7aa 100644 --- a/Assets/Scripts/Player Manager/Utils.cs +++ b/Assets/Scripts/Player Manager/Utils.cs @@ -1,6 +1,7 @@ using UnityEngine; +using UnityEngine.UI; -namespace Utils { +namespace LAViD.VLibras.Utils { public static class Definitions { diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 48146a6..cf439cd 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; using UnityEngine.UI; using System.Threading; using System.Net; -using Utils; +using LAViD.VLibras.Utils; public class PlayerManager : GenericPlayerManager { @@ -84,7 +84,7 @@ public class PlayerManager : GenericPlayerManager { public void playDict(string word) { - Logger.Log("Requesting dictionary: " + word); + LAViD.VLibras.Utils.Logger.Log("Requesting dictionary: " + word); this.dictWord = word; base.gloss = word; @@ -130,7 +130,7 @@ public class PlayerManager : GenericPlayerManager { protected override WWW loadAssetBundle(string aniName) { - Logger.Log("Requesting bundle: " + BASE_URL + regionPath + aniName); + LAViD.VLibras.Utils.Logger.Log("Requesting bundle: " + BASE_URL + regionPath + aniName); return WWW.LoadFromCacheOrDownload(BASE_URL + regionPath + aniName, this.regionHash); } @@ -156,11 +156,11 @@ public class PlayerManager : GenericPlayerManager { // Called from microphone icon at main interface public void callVoiceRecognizer() { - Logger.Log("Requesting voice recognizer"); + LAViD.VLibras.Utils.Logger.Log("Requesting voice recognizer"); string gloss = voiceRecognizer.callRecognition(); this.translateScreenText.text = gloss; - Logger.Log("Voice recognizer answer: " + gloss); + LAViD.VLibras.Utils.Logger.Log("Voice recognizer answer: " + gloss); this.screenManager.switchScreen("translate"); } @@ -179,11 +179,11 @@ public class PlayerManager : GenericPlayerManager { if (connection.error == null) { if (connection.responseHeaders.Count > 0) - Logger.Log(connection.responseHeaders["STATUS"]); + LAViD.VLibras.Utils.Logger.Log(connection.responseHeaders["STATUS"]); else - Logger.Log("No STATUS"); + LAViD.VLibras.Utils.Logger.Log("No STATUS"); } - else Logger.Log("ERROR: " + connection.error); + else LAViD.VLibras.Utils.Logger.Log("ERROR: " + connection.error); return false;*/ @@ -199,7 +199,7 @@ public class PlayerManager : GenericPlayerManager { { if (e.Response != null) { - Logger.Log(((HttpWebResponse)e.Response).StatusCode); + LAViD.VLibras.Utils.Logger.Log(((HttpWebResponse)e.Response).StatusCode); return ((HttpWebResponse)e.Response).StatusCode == HttpStatusCode.NotFound; } } @@ -215,20 +215,20 @@ public class PlayerManager : GenericPlayerManager { bool returnSuccess = true; bool timeout = false; - Logger.Log("Requesting translator: " + gloss); + LAViD.VLibras.Utils.Logger.Log("Requesting translator: " + gloss); base.randomAnimations.lockFor("translate"); this.screenManager.setLoadingSnippetState(true); WWW glossRequest = new WWW(SERVER_URL + WWW.EscapeURL(gloss)); - Logger.Log("Translate: Request: " + SERVER_URL + WWW.EscapeURL(gloss)); + LAViD.VLibras.Utils.Logger.Log("Translate: Request: " + SERVER_URL + WWW.EscapeURL(gloss)); if (glossRequest != null) { const float timeoutLimit = 10f; float timer = 0; - Logger.Log("Translate: Stating time check."); + LAViD.VLibras.Utils.Logger.Log("Translate: Stating time check."); while (!glossRequest.isDone) { @@ -242,20 +242,20 @@ public class PlayerManager : GenericPlayerManager { yield return null; } - Logger.Log("Translate: Timeout check finished."); + LAViD.VLibras.Utils.Logger.Log("Translate: Timeout check finished."); if (!timeout) { if (glossRequest.error == null) { - Logger.Log("Translate: Request: count=" + glossRequest.responseHeaders.Count + ", status=" + glossRequest.responseHeaders["STATUS"]); + LAViD.VLibras.Utils.Logger.Log("Translate: Request: count=" + glossRequest.responseHeaders.Count + ", status=" + glossRequest.responseHeaders["STATUS"]); returnSuccess = glossRequest.responseHeaders.Count > 0 && glossRequest.responseHeaders["STATUS"].EndsWith("200 OK"); if (returnSuccess) { if (!String.IsNullOrEmpty(glossRequest.text)) { - Logger.Log("Translator answer: " + glossRequest.text); + LAViD.VLibras.Utils.Logger.Log("Translator answer: " + glossRequest.text); base.gloss = glossRequest.text; base.playNow(glossRequest.text); @@ -264,15 +264,15 @@ public class PlayerManager : GenericPlayerManager { yield break; } - else Logger.Log("Error at PlayerManager.translate: empty answer."); + else LAViD.VLibras.Utils.Logger.Log("Error at PlayerManager.translate: empty answer."); } - else Logger.Log("Error at PlayerManager.translate: unsuccessful answer."); + else LAViD.VLibras.Utils.Logger.Log("Error at PlayerManager.translate: unsuccessful answer."); } - else Logger.Log("Error at PlayerManager.translate: (WWW) glosaRequest: " + glossRequest.error); + else LAViD.VLibras.Utils.Logger.Log("Error at PlayerManager.translate: (WWW) glosaRequest: " + glossRequest.error); } - else Logger.Log("Error at PlayerManager.translate: timeout."); + else LAViD.VLibras.Utils.Logger.Log("Error at PlayerManager.translate: timeout."); } - else Logger.Log ("Error at PlayerManager.translate: (WWW) glosaRequest is NULL."); + else LAViD.VLibras.Utils.Logger.Log ("Error at PlayerManager.translate: (WWW) glosaRequest is NULL."); base.gloss = gloss.ToUpper(); diff --git a/Assets/Scripts/UI/InputResizer.cs b/Assets/Scripts/UI/InputResizer.cs new file mode 100644 index 0000000..e9055fb --- /dev/null +++ b/Assets/Scripts/UI/InputResizer.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using UnityEngine.UI; + +public class InputResizer : MonoBehaviour { + + protected void Start() + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + { + text.fontSize = 20; + } + + // 240 + else if (Screen.dpi < 280) + { + text.fontSize = 32; + } + + // 320 + else if (Screen.dpi < 400) + { + text.fontSize = 44; + } + + // 480 + else if (Screen.dpi < 500) + { + text.fontSize = 56; + } + + else + { + text.fontSize = 56; + } + } + +} diff --git a/Assets/Scripts/UI/InputResizer.cs.meta b/Assets/Scripts/UI/InputResizer.cs.meta new file mode 100644 index 0000000..640e481 --- /dev/null +++ b/Assets/Scripts/UI/InputResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f8db495bb0057e14eb35ef4f2df7910e +timeCreated: 1475710064 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- libgit2 0.21.2