From 348b28fa3d4a94c37e126af826bae38a1db4f66c Mon Sep 17 00:00:00 2001
From: 13035516 <13035516@student.uts.edu.au>
Date: Thu, 7 Jan 2021 20:33:50 +1100
Subject: [PATCH] Added the fail conditions monitoring feature for the two
cases: 1) Not finishing in time; 2) Leaving too early
---
Assets/Scripts/.ChangeColour.cs.swp | Bin 12288 -> 0 bytes
Assets/Scripts/.ExperimentController.cs.swp | Bin 12288 -> 0 bytes
Assets/Scripts/.GameController.cs.swp | Bin 28672 -> 0 bytes
Assets/Scripts/.GameController.cs.un~ | Bin 170295 -> 206060 bytes
Assets/Scripts/.TriggerBoundary.cs.swp | Bin 12288 -> 0 bytes
Assets/Scripts/.TriggerBoundary.cs.un~ | Bin 13408 -> 15681 bytes
Assets/Scripts/GameController.cs | 17 ++++++++++-------
Assets/Scripts/GameController.cs~ | 19 +++++++++++--------
Assets/Scripts/TriggerBoundary.cs | 3 +++
Assets/Scripts/TriggerBoundary.cs~ | 2 +-
10 files changed, 25 insertions(+), 16 deletions(-)
delete mode 100644 Assets/Scripts/.ChangeColour.cs.swp
delete mode 100644 Assets/Scripts/.ExperimentController.cs.swp
delete mode 100644 Assets/Scripts/.GameController.cs.swp
delete mode 100644 Assets/Scripts/.TriggerBoundary.cs.swp
diff --git a/Assets/Scripts/.ChangeColour.cs.swp b/Assets/Scripts/.ChangeColour.cs.swp
deleted file mode 100644
index ec7e51864527ee8537cace1ce5f147b182c5a3ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
zcmeI2Pm3Hy7>6sKVl;`Uppr|eC>z<Go}GBu>}-V1tPG1;vt)Ke2}|hdey68RPgPUZ
zGs~Fl#dAEUpr~I!JP3XO5meBl2k*IvAb63W2QT`o?w)_W_QZIMRq*t5ch%He@6%Nc
zyHlO&Yuh_~tx{tsk1+PcFL$n)(;uE>Ot~YkXD;qiE^Y4aUEW=3?p$eKT08e*Y3s(i
z)7GT4lXmQENpH|6k!WYPx8>|A`6hX|Xp1lzIenQ(6_Kk%C<13wYeH4aQ(=tHM$Z)i
zHDn|Qs^aO=fVRRKum&;%gQUB%c8Z;=tyZ6X=4t-eqit)(8n6be0c*e-um-FFYrq<?
z2L5LTlK2?=3pqakHo&nQeAr?QSOeC8HDC=`1J-~wU=3IU)_^r&4Oj#Bi2>JVY<Qfp
zw;n`7`2FAf58&t1jC~8f0H1)5K@0?V9Q=BUv9G{~-~%uKuY>adKQXf3PBQil_!_(e
zZh|3r4*c;jW50vX!AIbI@E*7h-T*Cd9ys6(_~{|Wz6YOzcfldp0?&gJ;LZugZiCOj
zEf9e=cm+HKPJ`RX?MLt(_!8U#Z-bk_<gI}MFMvPc!WL`58n6be0c*e-xL*w%GLDiR
z=g-WQ*9#-R6{|3zD<phUbg%7Ig@oIQ$mbV$*NrsQndz7x<{d5WuYYYWxVpN!U(z4C
zyunPzrV!$=^bChXJ~=hF7I&Gb!FYsdJMA&-@}>Ts3WI>uML7_@t40-Uy^KOg+17at
z`DZ7wrb<mzQ#y*=>v{Uwo%Fcps(_M$o|*brWmA^d9!aOVU-7UdRN*U4X*P$d`H-Hg
ziPzTIOoa5bWOR#S|M!t)IhT!Y^<R(fZtfP1evvtoS=s2S)6q@mhdu}suea2cZq!QL
zgtB>%)emLp^LFgx_EL7=aq?>(YVNs_Ssqe&#A8yttK2@Z^!ZHZP_BA@dKM=n9(jQ8
zUhbGJ#FZu`4cU*Sz~<tO!qk0f>1;g<VV?axnkY6e539FD!@NNhiH-S%oDRUmo>2sG
zDw!HeFJ}aGs4Ermq({6PDxGAa_#hRVC4(2$5SDo%TV52Et%z~!`H@}SKjH%k3OeA0
zcD4On;kciUlo3C=Cg!S(6LPMyIGdRf6c0L4=<#$mj#o4WlwMZ?MI`cUX4}oIuSwex
zMUg!ChsKl1K544RpKBM21flb(jaJn<#}wWaBaRxvE0K37IlxeOm9OyHG8ZzC%N)-W
zZ?<I~NUli7n3Um=q7l2n@}#`T)tb-lW9RF9M+$k7dhRg9zIOast+Dl;r`zFQ7C|Ve
g(%!Bgy*s|u8tH`k>8shqlR{%52vVU}-lER_2L1wE%K!iX
diff --git a/Assets/Scripts/.ExperimentController.cs.swp b/Assets/Scripts/.ExperimentController.cs.swp
deleted file mode 100644
index df0e29288dd997ed2b25b509f18772fdbb358d2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
zcmeI2KWI}y9LKNDRz*P_Peo{k=G9gtG%mF*QfX~y8wab%%gePrdASSkF4_<TXTd=b
zDY&_)lg^GV>gFK0DB>s%f<ssRUh*P&NnWK;5X|r3!~OmJ?(Xxp<Vs^#<`#G^JI+uJ
zF?R3q_6^s3f1I(%uLm2h^OrI|RajXpj9y$=D$eI7&Ze%Op7e@FM8<0-_GWZYs|aO{
zSJ;^G3X#4k0(6Q>+PYWKR!5=mBPG?kH)V{#)N&BXD(czIs)(eEoz}`mIt)dW4NU6B
zG(iRi-9XK*jpl~g#Q2%9QzuXGBZrHFZiMbn2FL&zAOmE843GgbKn4cRfUOR(U%2%?
zupbP?prS$s$N(8217v^<kO4A42FL&zAOmE84E!es{4!(P2N;_?hzsHWfA<@}Pqe>)
zx8MzU1-8H=a2Eui1kM8&cMfF0SLE3O4`Zau3$oxCI0{}5Gxh=e0N=nz@DjWL&%rbB
z1UvxOzy)v`e8<5)gHPZccna==Rd5whAp>N943GgbKnBPF86X2>;GY_}!x%@2t46bP
zOUp7ZR?EH>BN^7cqPy?HTM_9qX}R3a$*5#6d7hrR#6Y6MlaYS<Wcp0|(C&hs7YpIi
z@SrzcD@%MAR4%4kD}^%P&3DkfBV8|}M>4$8{t9tmN$ZfWMA8qJgsFu#-<ee^+h?0*
z($2j)+pUxAxbH5OyQRBW{zpgOTkTb%M4ml8Vf$;sJD*c!v6*KL7JsN9^o{9jm#tnh
uS}m5`qxtKM)ePRr^ULD4)yn8Kn{~7Kc)0nbepanZCE7#Fbz?;(&wc~_=2;~G
diff --git a/Assets/Scripts/.GameController.cs.swp b/Assets/Scripts/.GameController.cs.swp
deleted file mode 100644
index d35dba833d72cf4b1059eeed6d6a601b17143332..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 28672
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
TzH`v|vl?jrddDt36YcyDHIOIe
diff --git a/Assets/Scripts/.GameController.cs.un~ b/Assets/Scripts/.GameController.cs.un~
index af7ba5803a7d6b371cbd7bcf27cb7c359304dc90..cd41cc034fe43cc04803f749f3e5f19e449cc2a8 100644
GIT binary patch
delta 9889
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
ZOi#Z3(D4y)9Nbr31Tp=u#v@l&{SR~5ts?*c
delta 167
zcmaEJl4tuSF7vR=-1(t-F8NOxm?rzoWjG~j(ikRleWrVOcKbym?u*~E<~u%~q}lNC
z2BRng10xdy1A~VG5KLd#%qTrwAc{$FDi0Hnm0n1Ga7j^SUb=>+HBiX{Al3(BMj*-s
z(jX>~hG7PV_-_XpSb(w&^^NVV?TlO7nam4-W^X@Gz|_phSU=sRh^b=x<bO<&Y5+0v
BFJS-x
diff --git a/Assets/Scripts/.TriggerBoundary.cs.swp b/Assets/Scripts/.TriggerBoundary.cs.swp
deleted file mode 100644
index d37ab7f9708bfd10ca665082a6afeeb6869e5c95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12288
zcmeI2KW`H;7>8YED5yxNqe~Ym)VnlAB5Ks3ZAw(BQKKe7VnUZYCo#I%k?o6!q7I19
z!Nd$I3!i|Eg)*_SupxmM7~$vSGJptOnCNTi@%jAkwV&IPw_Uh@P~)Yb$WX2^rayjr
z=$r4B88gu+?)jH<%HdAEc~oDo){a|;rOi8YXYXx=Eh~%-CmV+q9cO)^oDJ)}N?14g
zk%;lqQqqmWzINKAA~H&<Zn$Huz)&MLa)4*k$Zl7dU7e{UGNT~2b7Rr~86X2Nkh#u!
zX_0LfHwvpaSNQd%7HJ^^WPl8i0Wv@a$N(8217zTW8E}II_5*jm1XjR84jxp<02v?y
zWPl8i0Wv@a$N(8217v^<kb(ciK$I|c;|gOhf&c&C{|4~sDr0ZJD{u;)f+wH~?tuWT
zfn~4+J})x%0lWui;5m2(M&JQxfMakMY=Fz)JK}u>U%(l73tod$;Lq{`P$2_kfDDiU
zGC&5%02v?yWPl7@NCPJ)jC0Sd_AMh^W)yd_FUrh!j3@OVYo{{iom5ATSA}c1Xw<}<
zTWf4GKHbL8_bd4}F9e0obOYbHr_)p>!W`H<(OM*!(}`01OO&CO2|rT#oc+hr6)STh
z+}`FsevpXNMZR@jFlVyA#Pat+tl2q>6&~kD{`VI|EaPx3FJ@8=j2uQz<aWKl^3-Z>
zy{&cnM}=eF6|T%@>ygo3#s?j<d|jMI*7Dy{+xZr+X{C2XFB(dn8RYR=B*gPclKj5v
fN`>gtuExkZ(GR>7<k3s5Y)}<S7#Yu>QD#2@i1hvz
diff --git a/Assets/Scripts/.TriggerBoundary.cs.un~ b/Assets/Scripts/.TriggerBoundary.cs.un~
index f881f53701690bdf912f23bc6da8ce2225e3d3ed..c19c65439343237ac2260c55a70386cf9fba66fb 100644
GIT binary patch
delta 680
zcmaEmaj?ohEHih0Xr4>{QwF9po-Pc0o?o*B9^EaIKH|({{myT(?x{XKD+{d|bsvxX
zV_;xV0b+FpC~&RFESWq}UBuK@p`@rZ)fy-#3dBl4%m}4{6qpYZ17U{vZ|8QifMj_#
zHk{O9l-um3dz4X97APPOl7<2~Ak7ZMoSQFlxiYHq0+~`!DG-|j$}WSkfu=5=Y``wU
zstA&q%&jCT2{J+f#DfBm@gRKy5F`13Oqh`%HZ~)df{bKTnp~-_Yod^zT4JqGP?TAg
zSdywx4C2(9HpX87Y6Y1Lwiif)fC3PMj1~slWJQck>%c+6!0=T9s#gX`D^Cs-7S#or
z1mb~14{D<Vj1Qzi0A#xe5G#RgtS83C9mqC<^ojwoG7v-D01^SkC0GP%E3zL!3PCP{
z#W%x$AOOcY1H<MATxN{Ca2b%Q$@)^FI^WLig2X(+3Xr9sB*h5C7|Ck#Ycamf{Q7~c
E0Kn2_iU0rr
delta 124
zcmX?D^&rDIEHih0Xr4>{QwApH+c{R8cY@Ewa9^4Dvor9|z34OI$~UY$+V|NUw&CF@
zV_;xV1Y-HgZ}sH#t${2NAeIASMj)02Vh{k)Fw7AD`C%RlNS1qJ$4MPVhRs2`M;SMN
IFb`w}0LG^w%m4rY
diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs
index fd39e73..7098da6 100644
--- a/Assets/Scripts/GameController.cs
+++ b/Assets/Scripts/GameController.cs
@@ -47,7 +47,7 @@ public class GameController : MonoBehaviour
private const int NumGoals = 2;
// If exceeds this time including hold time, then the player loses
- private const int FailTime = 4000;
+ private const int FailTime = 3500;
// Player must keep their sprite in the goal for this long in order to complete the task
private const int HoldTime = 1000;
// Time the player must spend in the base to be considered end of trial
@@ -139,8 +139,7 @@ public class GameController : MonoBehaviour
// If the player hasn't achieved the hold time in the allotted time
// they fail
- if (Timer > FailTime)
- {
+ if (FailConditions()) {
TrialResult = false;
TrialState = false;
}
@@ -177,7 +176,6 @@ public class GameController : MonoBehaviour
// base position
if ( BaseTriggerBoundary.GetStayTime() >= (float)BaseHoldTime/1e3 ) {
EndTrialSequence();
- Debug.Log("End complete");
}
}
}
@@ -242,8 +240,6 @@ public class GameController : MonoBehaviour
{
GoalsChangeColour[GoalSet].GoalState = 0;
Timer = 0;
- // THERE IS A BUG HERE, LOOK TO FIX, WHY CAN'T I CREATE ARRAYS OF
- // CLASS OBJECTS?
mExperimentCtrl[ExperimentTrial].Index = ExperimentTrial;
mExperimentCtrl[ExperimentTrial].TrialResult = TrialResult;
ExperimentTrial++;
@@ -252,7 +248,14 @@ public class GameController : MonoBehaviour
// Check for any fail conditions here
// Incl: Taking too long to finish, leaving early (disqualification)
private bool FailConditions() {
- return true;
+ float goTime = mTimingSetting.TrialStart + mTimingSetting.TargetOnset +
+ OnsetDev;
+ bool base_exit = BaseTriggerBoundary.ExitColliderIsTriggered;
+ if (Timer > FailTime || (Timer < goTime && base_exit))
+ {
+ return true;
+ }
+ return false;
}
}
diff --git a/Assets/Scripts/GameController.cs~ b/Assets/Scripts/GameController.cs~
index 91c4908..72659e2 100644
--- a/Assets/Scripts/GameController.cs~
+++ b/Assets/Scripts/GameController.cs~
@@ -139,8 +139,7 @@ public class GameController : MonoBehaviour
// If the player hasn't achieved the hold time in the allotted time
// they fail
- if (Timer > FailTime)
- {
+ if (FailConditions()) {
TrialResult = false;
TrialState = false;
}
@@ -156,8 +155,8 @@ public class GameController : MonoBehaviour
+ DestTriggerBoundary.name + "\tDestStayTime: " +
DestTriggerBoundary.GetStayTime().ToString() +
"\nmExpCtrl-1: " +
- mExperimentCtrl[ExperimentTrial].Index.ToString() + "\t" +
- mExperimentCtrl[ExperimentTrial].TrialResult.ToString();
+ mExperimentCtrl[ExperimentTrial-1].Index.ToString() + "\t" +
+ mExperimentCtrl[ExperimentTrial-1].TrialResult.ToString();
}
else
{
@@ -177,7 +176,6 @@ public class GameController : MonoBehaviour
// base position
if ( BaseTriggerBoundary.GetStayTime() >= (float)BaseHoldTime/1e3 ) {
EndTrialSequence();
- Debug.Log("End complete");
}
}
}
@@ -242,8 +240,6 @@ public class GameController : MonoBehaviour
{
GoalsChangeColour[GoalSet].GoalState = 0;
Timer = 0;
- // THERE IS A BUG HERE, LOOK TO FIX, WHY CAN'T I CREATE ARRAYS OF
- // CLASS OBJECTS?
mExperimentCtrl[ExperimentTrial].Index = ExperimentTrial;
mExperimentCtrl[ExperimentTrial].TrialResult = TrialResult;
ExperimentTrial++;
@@ -252,7 +248,14 @@ public class GameController : MonoBehaviour
// Check for any fail conditions here
// Incl: Taking too long to finish, leaving early (disqualification)
private bool FailConditions() {
- return true;
+ float goTime = mTimingSetting.TrialStart + mTimingSetting.TargetOnset +
+ OnsetDev;
+ bool base_exit = BaseTriggerBoundary.ExitColliderIsTriggered;
+ if (Timer > FailTime || (Timer < goTime && base_exit))
+ {
+ return true;
+ }
+ return false;
}
}
diff --git a/Assets/Scripts/TriggerBoundary.cs b/Assets/Scripts/TriggerBoundary.cs
index 98ed631..9cae81b 100644
--- a/Assets/Scripts/TriggerBoundary.cs
+++ b/Assets/Scripts/TriggerBoundary.cs
@@ -5,6 +5,7 @@ using UnityEngine;
public class TriggerBoundary : MonoBehaviour
{
public bool ColliderIsTriggered { get; private set; }
+ public bool ExitColliderIsTriggered { get; private set; }
private float time;
@@ -17,12 +18,14 @@ public class TriggerBoundary : MonoBehaviour
void OnTriggerStay2D(Collider2D collider)
{
ColliderIsTriggered = true;
+ ExitColliderIsTriggered = false;
time += Time.deltaTime;
}
void OnTriggerExit2D()
{
ColliderIsTriggered = false;
+ ExitColliderIsTriggered = true;
time = 0.0f;
}
diff --git a/Assets/Scripts/TriggerBoundary.cs~ b/Assets/Scripts/TriggerBoundary.cs~
index 64bb3d4..98ed631 100644
--- a/Assets/Scripts/TriggerBoundary.cs~
+++ b/Assets/Scripts/TriggerBoundary.cs~
@@ -17,7 +17,7 @@ public class TriggerBoundary : MonoBehaviour
void OnTriggerStay2D(Collider2D collider)
{
ColliderIsTriggered = true;
- time += Time.deltaTime/1e3;
+ time += Time.deltaTime;
}
void OnTriggerExit2D()
--
GitLab