2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
이상윤
2af526de 1 parent 42f7862f

함수이름 정리

Inline Side-by-side
Showing 15 changed files with 47 additions and 45 deletions

6.94 KB | W: | H:

12.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.03 KB | W: | H:

11.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

6.21 KB | W: | H:

9.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.95 KB | W: | H:

9.89 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

5.68 KB | W: | H:

8.93 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.58 KB | W: | H:

6.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -474,8 +474,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 330, y: 150}
m_SizeDelta: {x: 250, y: 30}
m_AnchoredPosition: {x: 320, y: 150}
m_SizeDelta: {x: 370, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &109009052
MonoBehaviour:
......@@ -858,17 +858,17 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 310358198}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0.2588191, w: 0.9659258}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1679758666}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 30}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 290, y: 100}
m_SizeDelta: {x: 250, y: 30}
m_AnchoredPosition: {x: 200, y: 90}
m_SizeDelta: {x: 370, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &310358200
MonoBehaviour:
......@@ -938,8 +938,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 330, y: 150}
m_SizeDelta: {x: 250, y: 30}
m_AnchoredPosition: {x: 320, y: 210}
m_SizeDelta: {x: 370, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &395084097
MonoBehaviour:
......@@ -1459,7 +1459,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 250}
m_AnchoredPosition: {x: 0, y: -220}
m_SizeDelta: {x: 320, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &779933559
......@@ -1822,7 +1822,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 330, y: 200}
m_SizeDelta: {x: 250, y: 30}
m_SizeDelta: {x: 370, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1089006722
MonoBehaviour:
......@@ -2337,8 +2337,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 330, y: 150}
m_SizeDelta: {x: 250, y: 30}
m_AnchoredPosition: {x: 320, y: 150}
m_SizeDelta: {x: 370, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1484596777
MonoBehaviour:
......
......@@ -195,7 +195,7 @@ class CharacterSkeleton
}
}
public void dasomset(float[] jt, int[] st, int offset, bool mirrored, bool move, Kinect.Joint sourceJoint, Transform jointObj)
public void trainee_set(float[] jt, int[] st, int offset, bool mirrored, bool move, Kinect.Joint sourceJoint, Transform jointObj)
{
if (isSavedPosition == false && jointState[JointType_SpineBase] != TrackingState_NotTracked)
{
......@@ -268,7 +268,7 @@ class CharacterSkeleton
}
public void dasomset_trainer(float[] jt, int[] st, int offset, bool mirrored, bool move)
public void trainer_set(float[] jt, int[] st, int offset, bool mirrored, bool move)
{
if (isSavedPosition == false && jointState[JointType_SpineBase] != TrackingState_NotTracked)
{
......
......@@ -95,11 +95,11 @@ public class ClickExercise : MonoBehaviour
if (pos.x >= 60 && pos.x <= 285 && pos.y >= 335 && pos.y <= 640 && pos.z == 200) {
//스쿼트
timer += Time.deltaTime;
Debug.Log("Timer: " + timer);
//Debug.Log("Timer: " + timer);
if (timer > 2.5)
{
Debug.Log("Clicked");
//Debug.Log("Clicked");
//////
selected_exercise = "Squat"; //Squat 넘겨줌
GameObject tempBtn = btnParent.transform.GetChild(3).gameObject;
......@@ -107,7 +107,7 @@ public class ClickExercise : MonoBehaviour
if (btnImage.name == "Squat")
{
Debug.Log("Squat");
//Debug.Log("Squat");
btnImage.texture = Resources.Load("Squat_on", typeof(Texture2D)) as Texture2D;
}
......@@ -124,11 +124,11 @@ public class ClickExercise : MonoBehaviour
else if(pos.x >= 400 && pos.x <= 625 && pos.y >= 335 && pos.y <= 640 && pos.z == 200){
//사이드하이킥
timer += Time.deltaTime;
Debug.Log("Timer: " + timer);
// Debug.Log("Timer: " + timer);
if (timer > 2.5)
{
Debug.Log("Clicked");
// Debug.Log("Clicked");
/////
selected_exercise = "SideHiKick"; //SideHiKick 넘겨줌
GameObject tempBtn = btnParent.transform.GetChild(2).gameObject;
......@@ -136,7 +136,7 @@ public class ClickExercise : MonoBehaviour
if (btnImage.name == "SideHiKick")
{
Debug.Log("SideHiKick");
// Debug.Log("SideHiKick");
btnImage.texture = Resources.Load("SideHiKick_on", typeof(Texture2D)) as Texture2D;
}
......@@ -154,11 +154,11 @@ public class ClickExercise : MonoBehaviour
{
//런지
timer += Time.deltaTime;
Debug.Log("Timer: " + timer);
//Debug.Log("Timer: " + timer);
if (timer > 2.5)
{
Debug.Log("Clicked");
// Debug.Log("Clicked");
//////
selected_exercise = "Lunge"; //Lunge 넘겨줌
......@@ -167,7 +167,7 @@ public class ClickExercise : MonoBehaviour
if (btnImage.name == "Lunge")
{
Debug.Log("Lunge");
// Debug.Log("Lunge");
btnImage.texture = Resources.Load("Lunge_on", typeof(Texture2D)) as Texture2D;
}
......
......@@ -28,7 +28,7 @@ public class Final : MonoBehaviour
void Update()
{
pos = follow.transform.position;
Debug.Log(pos);
//Debug.Log(pos);
if (pos.x >= 290 && pos.x <= 725 && pos.y >= 265 && pos.y <= 315 && pos.z == 200)
......@@ -37,7 +37,7 @@ public class Final : MonoBehaviour
if (timer1 > 2.5)
{
Debug.Log("Clicked");
//Debug.Log("Clicked");
SceneManager.LoadScene("Start");
}
}
......@@ -50,7 +50,7 @@ public class Final : MonoBehaviour
if (timer2 > 2.5)
{
Debug.Log("Clicked");
// Debug.Log("Clicked");
SceneManager.LoadScene("Intro");
}
......
......@@ -97,7 +97,7 @@ public class Move : MonoBehaviour
trainer_timer += Time.deltaTime;
if (trainer_timer > 3)
{
Debug.Log("3초 됨 운동 끝!!!!!"); //결과씬이나 다른씬으로
//Debug.Log("3초 됨 운동 끝!!!!!"); //결과씬이나 다른씬으로
trainer_check_outside = false;
Squat_Title.SetActive(false);
......@@ -116,21 +116,21 @@ public class Move : MonoBehaviour
if (trainer_count < 20 && exercise == "Squat")
{
trainer_count++;
Debug.Log("카운트 : " + trainer_count);
//Debug.Log("카운트 : " + trainer_count);
trainercnt = trainer_count + "/20";
Trainner_count.text = trainercnt;
}
if (trainer_count < 10 && exercise == "SideHiKick")
{
trainer_count++;
Debug.Log("카운트 : " + trainer_count);
// Debug.Log("카운트 : " + trainer_count);
trainercnt = trainer_count + "/10";
Trainner_count.text = trainercnt;
}
if (trainer_count < 10 && exercise == "Lunge")
{
trainer_count++;
Debug.Log("카운트 : " + trainer_count);
// Debug.Log("카운트 : " + trainer_count);
trainercnt = trainer_count + "/10";
Trainner_count.text = trainercnt;
}
......@@ -209,7 +209,7 @@ public class Move : MonoBehaviour
{
trainer_state[trainer_i - 2] = 1;
}
skeleton_Trainnner.dasomset_trainer(trainer_data1, trainer_state, 0, true, true);
skeleton_Trainnner.trainer_set(trainer_data1, trainer_state, 0, true, true);
trainer_j = trainer_j + 3;
}
if (speed < trainer_speed)
......@@ -253,7 +253,7 @@ public class Move : MonoBehaviour
}
workout_count++;
workout = false;
Debug.Log("트레이니: " + workout_count);
//Debug.Log("트레이니: " + workout_count);
traineecnt = workout_count + "/" + total;
Trainee_count.text = traineecnt;
}
......@@ -276,29 +276,31 @@ public class Move : MonoBehaviour
exercise = ClickExercise.selected_exercise; //ClickExercise에서 선택한 운동이 무엇인지 String으로 넘어옴.
Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기
// Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기
if (exercise == "Squat")
{
lines = File.ReadAllLines(@"Trainer_txt/squart.txt");
Debug.Log("읽음");
// Debug.Log("읽음");
}
else if (exercise == "SideHiKick")
{
lines = File.ReadAllLines(@"Trainer_txt/leg_right.txt");
lines_right = File.ReadAllLines(@"Trainer_txt/leg_left.txt");
Debug.Log("읽음");
//Debug.Log("읽음");
}
else if (exercise == "Lunge")
{
lines = File.ReadAllLines(@"Trainer_txt/runzi_right.txt");
lines_right = File.ReadAllLines(@"Trainer_txt/runzi_left.txt");
Debug.Log("읽음");
// Debug.Log("읽음");
}
else
{
lines = File.ReadAllLines(@"Trainer_txt/squart.txt");
Debug.Log("읽음");
//Debug.Log("읽음");
}
workout_count = 0;
......@@ -553,7 +555,7 @@ public class Move : MonoBehaviour
{
state[i - 2] = 1;
}
skeleton_Trainnne.dasomset(data1, state, 0, true, true, body.Joints[jt], jointObj);
skeleton_Trainnne.trainee_set(data1, state, 0, true, true, body.Joints[jt], jointObj);
/*
LineRenderer lr = jointObj.GetComponent<LineRenderer>();
......
......@@ -200,7 +200,7 @@ public class MoveTrainee : MonoBehaviour
{
state[i - 2] = 1;
}
skeleton.dasomset(data1, state, 0, true, true, body.Joints[jt], jointObj);
skeleton.trainee_set(data1, state, 0, true, true, body.Joints[jt], jointObj);
/*
LineRenderer lr = jointObj.GetComponent<LineRenderer>();
......
......@@ -201,7 +201,7 @@ public class MoveTrainner : MonoBehaviour
{
state[i - 2] = 1;
}
skeleton.dasomset(data1, state, 0, true, true, body.Joints[jt], jointObj);
skeleton.trainee_set(data1, state, 0, true, true, body.Joints[jt], jointObj);
LineRenderer lr = jointObj.GetComponent<LineRenderer>();
if (targetJoint.HasValue)
......
......@@ -16,7 +16,7 @@ public class Result : MonoBehaviour
{
timer = 0;
num = Move.traineecnt;
Debug.Log(num);
//Debug.Log(num);
}
// Update is called once per frame
......
......@@ -15,7 +15,7 @@ public class Title : MonoBehaviour
private void Start()
{
Debug.Log("Start");
// Debug.Log("Start");
follow = GameObject.Find("follow").gameObject;
}
......@@ -26,7 +26,7 @@ public class Title : MonoBehaviour
void Update()
{
Debug.Log("Update");
// Debug.Log("Update");
pos = follow.transform.position;
//Debug.Log(pos);
......@@ -34,10 +34,10 @@ public class Title : MonoBehaviour
if (pos.x >= 360 && pos.x <= 600 && pos.y >= 180 && pos.y <= 200 &&pos.z == 200) {
timer += Time.deltaTime;
Debug.Log("Timer: "+ timer);
// Debug.Log("Timer: "+ timer);
if (timer > 2.5) {
Debug.Log("Clicked");
// Debug.Log("Clicked");
SceneManager.LoadScene(SceneToLoad);
}
......