diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
index bd72217..9099cc9 100644
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -5,6 +5,8 @@
android:versionCode="1"
android:versionName="1.0">
+
+
6)
+ yield return new WaitForEndOfFrame();
}
while (toPlayQueue.Count > 0)
@@ -637,11 +641,11 @@ public abstract class GenericPlayerManager : MonoBehaviour {
// Gets first animation
AnimationReference reference = this.animQueue.Peek();
- PlayerLogger.Log("GPM", "AW", "Got " + reference.name + ".");
+ // PlayerLogger.Log("GPM", "AW", "Got " + reference.name + ".");
if (COMPONENT_ANIMATION.IsPlaying(reference.name))
{
- PlayerLogger.Log("GPM", "AW", "And its playing!");
+ // PlayerLogger.Log("GPM", "AW", "And its playing!");
this.animationPlaying = this.animQueue.Dequeue();
this.subtitles.setText(reference.subtitle);
@@ -649,8 +653,6 @@ public abstract class GenericPlayerManager : MonoBehaviour {
// Watches transition between current and next animation
while (true)
{
- PlayerLogger.Log("GPM", "AW", "Wating for it to end.");
-
yield return new WaitForEndOfFrame();
// Gets next animation
@@ -658,7 +660,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
if (next != null && COMPONENT_ANIMATION.IsPlaying(next.name))
{
- PlayerLogger.Log("GPM", "AW", "It has a next.");
+ // PlayerLogger.Log("GPM", "AW", "Next: " + next.name + ".");
// Waits next animation starts
while (!COMPONENT_ANIMATION.IsPlaying(next.name))
diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs
index 5f3b00d..0448f31 100644
--- a/Assets/Scripts/PlayerManager.cs
+++ b/Assets/Scripts/PlayerManager.cs
@@ -14,9 +14,9 @@ public class PlayerManager : GenericPlayerManager {
private const string BASE_URL = "http://dicionario.vlibras.gov.br/ANDROID/";
#endif
- //private const string SERVER_URL = "http://vlibras.lavid.ufpb.br/glosa?texto=";//old
- private const string SERVER_URL = "http://traducao.vlibras.gov.br/translate?text=";
- private const int VERSION = 1;
+ //private const string SERVER_URL = "http://vlibras.lavid.ufpb.br/glosa?texto=";//old
+ private const string SERVER_URL = "http://traducao.vlibras.gov.br/translate?text=";
+ private const int VERSION = 1;
public enum ERROR_STATUS_MESSAGE
{
@@ -87,6 +87,7 @@ public class PlayerManager : GenericPlayerManager {
public void playTranslate()
{
stopTranslation();
+ base.stopAll();
string text = translateScreenText.text;
translateScreenText.text = "";
@@ -208,14 +209,14 @@ public class PlayerManager : GenericPlayerManager {
{
PlayerLogger.Log("PM", "WFR", "Stating time check.");
- const float timeoutLimit = 10f;
+ const float timeoutLimit = 20f;
float timer = 0;
while ( ! www.isDone)
{
if (timer > timeoutLimit)
{
- PlayerLogger.Log("PM", "WFR", "Timeout.");
+ PlayerLogger.Log("PM", "WFR", "Timeout (" + timer + ").");
yield break;
}
@@ -228,7 +229,7 @@ public class PlayerManager : GenericPlayerManager {
#endif
}
- PlayerLogger.Log("PM", "WFR", "Done.");
+ PlayerLogger.Log("PM", "WFR", "Done (" + timer + ").");
}
private IEnumerator translate(string gloss)
diff --git a/Assets/Scripts/UI/RotateGameObject.cs b/Assets/Scripts/UI/RotateGameObject.cs
index 018b7df..f664251 100644
--- a/Assets/Scripts/UI/RotateGameObject.cs
+++ b/Assets/Scripts/UI/RotateGameObject.cs
@@ -10,7 +10,6 @@ public class RotateGameObject : MonoBehaviour {
void OnMouseDrag( )
{
-
transform.Rotate(0.0f, -RotateLeftRight, 0.0f);
RotateLeftRight = Input.GetAxis ("Mouse X") * RotationVariable;
}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 0faa31c..355ba65 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -95,7 +95,7 @@ PlayerSettings:
16:9: 1
Others: 1
bundleIdentifier: com.lavid.vlibrasdroid
- bundleVersion: 1.0
+ bundleVersion: 3.0.43
preloadedAssets: []
metroEnableIndependentInputSource: 0
xboxOneDisableKinectGpuReservation: 0
--
libgit2 0.21.2