Skip to content

B
ButtonPusher
Commit fe260daa authored by 16이상민's avatar 16이상민
Browse files
Options

Fixed some motion recognition problems

parent 16e4f7a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2353 additions and 361 deletions
Assets/Editor/MotionDiscriminatorTests.cs
View file @ fe260daa
......@@ -131,7 +131,7 @@ public class ClapBodyStub_Prepare : BodyFake
Joints = new Dictionary<JointType, KinectModule.IJoint>
{
{ JointType.HandLeft, new JointStub() },
{ JointType.HandRight, new JointStub(x: MotionDiscriminator.itvPrepare + 1) },
{ JointType.HandRight, new JointStub(x: MotionDiscriminator.itvClap + 1) },
{ JointType.SpineShoulder, new JointStub(y: -1) }
};
}
......@@ -144,7 +144,7 @@ public class ClapBodyStub_Done : BodyFake
Joints = new Dictionary<JointType, KinectModule.IJoint>
{
{ JointType.HandLeft, new JointStub() },
{ JointType.HandRight, new JointStub(x: MotionDiscriminator.itvDone / 2) },
{ JointType.HandRight, new JointStub(x: MotionDiscriminator.itvClap / 2) },
{ JointType.SpineShoulder, new JointStub(y: -1) }
};
}
......
Assets/MotionAnalysis/DistItvExtractor.cs
View file @ fe260daa
......@@ -24,6 +24,19 @@ namespace MotionAnalysis
{ "HandLeftRecent", null },
{ "HandRightRecent", null }
};
private readonly JointType[] joints = new JointType[]
{
JointType.Head,
JointType.HandLeft,
JointType.HandRight,
JointType.SpineShoulder,
JointType.SpineMid,
JointType.ElbowLeft,
JointType.ElbowRight,
JointType.KneeLeft,
JointType.KneeRight
};
private float Table;
......@@ -82,12 +95,10 @@ namespace MotionAnalysis
private void UpdatePosition(KinectModule.IBody body)
{
Points.Keys.Where(x => !x.Contains("Recent"))
.Select(x => (JointType)Enum.Parse(typeof(JointType), x))
.ToList()
.ForEach(x => Points[x.ToString()] =
body.Joints.ContainsKey(x) ?
(CameraSpacePoint?)body.Joints[x].Position : null);
foreach (var x in joints)
Points[x.ToString()] =
body.Joints.ContainsKey(x) ?
(CameraSpacePoint?)body.Joints[x].Position : null;
}
private void SaveRecent()
......
Assets/MotionAnalysis/MotionDiscriminator.cs
View file @ fe260daa
......@@ -13,10 +13,8 @@ namespace MotionAnalysis
public bool IsPreseted
{ get; private set; }
public const float itvPrepare = 0.3f,
itvDone = 0.1f,
distPrepare = 0.05f,
distDone = 0.0f,
public const float itvClap = 0.3f,
distJump = 0.05f,
distBase = 0.5f,
distUp = 0.2f,
distJesus = 0.5f,
......@@ -86,17 +84,17 @@ namespace MotionAnalysis
if (Extractor.DistHandBaseSpineShoulder <= 0.0f)
return;
if (Extractor.ItvHand > itvPrepare)
if (Extractor.ItvHand > itvClap)
Motion |= MotionState.CLAP_PREPARE;
else if (Extractor.ItvHand < itvDone)
else
Motion |= MotionState.CLAP_DONE;
}
private void Jump()
{
if (Extractor.DistSpine < distPrepare)
if (Extractor.DistSpine < distJump)
Motion |= MotionState.JUMP_PREPARE;
else if (Extractor.DistSpine > distDone)
else
Motion |= MotionState.JUMP_DONE;
}
......
Assets/Scene/test.unity
View file @ fe260daa
This diff is collapsed.
Assets/Scene/test.unity.meta
View file @ fe260daa
fileFormatVersion: 2
guid: 6c36c432c541722448589b2dbad13896
timeCreated: 1519199131
timeCreated: 1519607365
licenseType: Free
DefaultImporter:
externalObjects: {}
......
Assets/Script/GameManager.cs
View file @ fe260daa
......@@ -16,7 +16,7 @@ public class GameManager : MonoBehaviour {
instance = new GameObject().AddComponent<GameManager>();
instance.CurrentTrack
= new TrackInfo("Assets/Tracks/Tutorial/temp2.bpe");
= new TrackInfo("Assets/Tracks/Tutorial/tmp2.bpe");
}
return instance;
......
Assets/Script/JudgeTextManager.cs
View file @ fe260daa
......@@ -3,24 +3,24 @@ using UnityEngine.UI;
public class JudgeTextManager : MonoBehaviour
{
private float start;
private Text text;
private float start;
private Text text;
private void Start()
{
text = gameObject.GetComponent<Text>();
}
private void Start()
{
text = gameObject.GetComponent<Text>();
}
private void OnEnable()
{
start = Time.time;
Debug.Log("Judge: " + text.text + "(" + start * 1000 + "ms)");
}
private void OnEnable()
{
start = Time.time;
Debug.Log("Judge: " + text.text + "(" + start * 1000 + "ms)");
}
// Update is called once per frame
private void Update ()
{
if (Time.time - start > 0.5)
gameObject.SetActive(false);
// Update is called once per frame
private void Update ()
{
if (Time.time - start > 0.5)
gameObject.SetActive(false);
}
}
Assets/Script/MotionTextManager.cs 0 → 100644
View file @ fe260daa
using StatusConvert;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class MotionTextManager : MonoBehaviour
{
private InputManager input;
private Text textShort,
textLong;
private readonly string[] listShort = new string[]
{
"Clap",
"Jump",
"PushUpLeft",
"PushUpRight",
"PushUpBoth",
"JumpPushUpLeft",
"JumpPushUpRight",
"JumpPushUpBoth",
"GuardLeft",
"GuardRight",
"GuardBoth"
},
listLong = new string[]
{
"HandUpLeft",
"HandUpRight",
"HandUpBoth",
"HandDownLeft",
"HandDownRight",
"HandDownBoth",
"Jesus",
"HeadphoneLeft",
"HeadphoneRight",
"HeadphoneBoth",
"OnTheTable"
},
printShort = new string[]
{
"Clap: ",
"Jump: ",
"PushUpLeft: ",
"PushUpRight: ",
"PushUpBoth: ",
"JumpPushUpLeft: ",
"JumpPushUpRight: ",
"JumpPushUpBoth: ",
"GuardLeft: ",
"GuardRight: ",
"GuardBoth: "
},
printLong = new string[]
{
"HandUpLeft: ",
"HandUpRight: ",
"HandUpBoth: ",
"HandDownLeft: ",
"HandDownRight: ",
"HandDownBoth: ",
"Jesus: ",
"HeadphoneLeft: ",
"HeadphoneRight: ",
"HeadphoneBoth: ",
"OnTheTable: "
};
private Dictionary<string, Dictionary<InputStatus, bool>> check =
new Dictionary<string, Dictionary<InputStatus, bool>>();
private void Start()
{
textShort = GameObject.Find("ShortMotion").GetComponent<Text>();
textLong = GameObject.Find("LongMotion") .GetComponent<Text>();
input = GameObject.Find("InGameManagers").GetComponent<InputManager>();
foreach (var x in listShort)
check[x] = new Dictionary<InputStatus, bool>
{
{ InputStatus.Entered, false },
{ InputStatus.Continuing, false },
{ InputStatus.Stopped, false }
};
foreach (var x in listLong)
check[x] = new Dictionary<InputStatus, bool>
{
{ InputStatus.Entered, false },
{ InputStatus.Continuing, false },
{ InputStatus.Stopped, false }
};
}
// Update is called once per frame
private void Update()
{
UpdateText(textShort, listShort, printShort, "short");
UpdateText(textLong, listLong, printLong, "long");
}
private void UpdateText(Text text, string[] list, string[] print, string type)
{
text.text = "";
for (int i = 0; i < list.Length; ++i)
{
var status = input.MotionToInput(list[i], type);
if (status != InputStatus.None)
check[list[i]][status] = true;
text.text += (print[i] + checktostr(check[list[i]]) + "\n");
}
}
private string checktostr(Dictionary<InputStatus, bool> chk)
{
string str = "";
str += (chk[InputStatus.Entered] ? "E" : " ");
str += (chk[InputStatus.Continuing] ? "C" : " ");
str += (chk[InputStatus.Stopped] ? "S" : " ");
return str;
}
}
Assets/Script/MotionTextManager.cs.meta 0 → 100644
View file @ fe260daa
fileFormatVersion: 2
guid: 0a8f91784ca444444b6d0a2cddacc9c1
timeCreated: 1519607651
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Script/MotionView.cs
View file @ fe260daa
......@@ -7,7 +7,7 @@ public class MotionView : MonoBehaviour
{
private CoordinateMapperManager Manager;
private InputManager Input;
private IEnumerable<KinectModule.IBody> Body;
private List<KinectModule.IBody> Body;
private MotionDiscriminator Discriminator = new MotionDiscriminator();
// Use this for initialization
......@@ -16,10 +16,10 @@ public class MotionView : MonoBehaviour
var ingameManager = GameObject.Find("InGameManagers");
Manager = ingameManager.GetComponent<CoordinateMapperManager>();
Input = ingameManager.GetComponent<InputManager>();
}
// Update is called once per frame
void Update ()
}
// Update is called once per frame
void Update ()
{
if (InitDiscriminator())
Input.CurrentMotionState = DetermineState();
......@@ -30,9 +30,9 @@ public class MotionView : MonoBehaviour
if (Discriminator.IsPreseted)
return true;
Body = Manager.BodyBuffer;
Body = Manager.BodyBuffer.ToList();
var body0 = Body.ToList()[0];
var body0 = Body[0];
if (body0 == null)
return false;
......@@ -43,8 +43,9 @@ public class MotionView : MonoBehaviour
return true;
}
MotionState DetermineState()
{
MotionState DetermineState()
{
Body = Manager.BodyBuffer.ToList();
var tracked = Body.Where(x => x != null &&
x.IsTracked)
.ToList();
......@@ -55,5 +56,5 @@ public class MotionView : MonoBehaviour
Discriminator.Update(tracked[0]);
return Discriminator.Motion;
}
}
}
Assets/StatusConvert/MotionStatusExtractor.cs
View file @ fe260daa
......@@ -102,10 +102,10 @@ namespace StatusConvert
private static MotionStatus ExtractShort(string name, MotionState state)
{
if (IsContain(state, ShortStates[name]["prepare"]))
return MotionStatus.Prepared;
if (IsContain(state, ShortStates[name]["done"]))
return MotionStatus.Done;
if (IsContain(state, ShortStates[name]["prepare"]))
return MotionStatus.Prepared;
return MotionStatus.None;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment