From e494091b2e3dcbb853bce185aef1e0e7a1c64495 Mon Sep 17 00:00:00 2001
From: Alexis Iakovenko <alexis.iakovenko@gmail.com>
Date: Sat, 6 Jan 2018 13:44:30 +0100
Subject: [PATCH] Fix total score computing
---
Assets/Compare/LiveComparer.cs | 14 +++++++-------
Assets/Scenes/Replay.unity | 11 +++++++++++
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/Assets/Compare/LiveComparer.cs b/Assets/Compare/LiveComparer.cs
index c85f9e8..f954aa7 100644
--- a/Assets/Compare/LiveComparer.cs
+++ b/Assets/Compare/LiveComparer.cs
@@ -22,6 +22,12 @@ public class LiveComparer : MonoBehaviour
Vector3 rightPalmPosition = Vector3.zero;
Vector3 rightPalmRotation = Vector3.zero;
+ public void ResetScore()
+ {
+ totalScore = 0.0f;
+ frameScore = 0.0f;
+ sumScore = 0.0f;
+ }
void Update ()
{
@@ -33,12 +39,6 @@ public class LiveComparer : MonoBehaviour
ComputeScore ();
UpdateScoreLabels ();
}
- else
- {
- totalScore = 0.0f;
- frameScore = 0.0f;
- sumScore = 0.0f;
- }
}
void ComputeScore()
@@ -61,7 +61,7 @@ public class LiveComparer : MonoBehaviour
frameScore -= absoluteDifferencePosition + absoluteDifferenceRotation;
sumScore += frameScore;
- totalScore = sumScore / (replay.currentFrame + 1);
+ totalScore = sumScore / (replay.currentFrame);
}
void FetchPalmsCoordinates()
diff --git a/Assets/Scenes/Replay.unity b/Assets/Scenes/Replay.unity
index ca9617c..03e2b89 100644
--- a/Assets/Scenes/Replay.unity
+++ b/Assets/Scenes/Replay.unity
@@ -445,6 +445,17 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
+ - m_Target: {fileID: 1896376827}
+ m_MethodName: ResetScore
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &512389763
--
GitLab