2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
김다솜
f32e7440 1 parent 956280ed

트레이니 tracking 오류 & 트레이너 scale 오류 수정

Inline Side-by-side
Showing 4 changed files with 24 additions and 21 deletions
...@@ -468,7 +468,7 @@ RectTransform: ...@@ -468,7 +468,7 @@ RectTransform:
468 m_AnchorMin: {x: 0.5, y: 0.5} 468 m_AnchorMin: {x: 0.5, y: 0.5}
469 m_AnchorMax: {x: 0.5, y: 0.5} 469 m_AnchorMax: {x: 0.5, y: 0.5}
470 m_AnchoredPosition: {x: 0, y: -80} 470 m_AnchoredPosition: {x: 0, y: -80}
471 - m_SizeDelta: {x: 300, y: 350} 471 + m_SizeDelta: {x: 250, y: 300}
472 m_Pivot: {x: 0.5, y: 0.5} 472 m_Pivot: {x: 0.5, y: 0.5}
473 --- !u!114 &132265374 473 --- !u!114 &132265374
474 MonoBehaviour: 474 MonoBehaviour:
...@@ -582,7 +582,7 @@ Transform: ...@@ -582,7 +582,7 @@ Transform:
582 m_PrefabAsset: {fileID: 0} 582 m_PrefabAsset: {fileID: 0}
583 m_GameObject: {fileID: 241038935} 583 m_GameObject: {fileID: 241038935}
584 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 584 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
585 - m_LocalPosition: {x: 0, y: -4.5, z: -13.2} 585 + m_LocalPosition: {x: 0, y: 1, z: -2}
586 m_LocalScale: {x: 2, y: 2, z: 2} 586 m_LocalScale: {x: 2, y: 2, z: 2}
587 m_Children: [] 587 m_Children: []
588 m_Father: {fileID: 0} 588 m_Father: {fileID: 0}
...@@ -1474,15 +1474,15 @@ PrefabInstance: ...@@ -1474,15 +1474,15 @@ PrefabInstance:
1474 objectReference: {fileID: 0} 1474 objectReference: {fileID: 0}
1475 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1475 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1476 propertyPath: m_LocalPosition.x 1476 propertyPath: m_LocalPosition.x
1477 - value: 6 1477 + value: 0.9
1478 objectReference: {fileID: 0} 1478 objectReference: {fileID: 0}
1479 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1479 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1480 propertyPath: m_LocalPosition.y 1480 propertyPath: m_LocalPosition.y
1481 - value: -8.74 1481 + value: 0
1482 objectReference: {fileID: 0} 1482 objectReference: {fileID: 0}
1483 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1483 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1484 propertyPath: m_LocalPosition.z 1484 propertyPath: m_LocalPosition.z
1485 - value: -1.37 1485 + value: 0
1486 objectReference: {fileID: 0} 1486 objectReference: {fileID: 0}
1487 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1487 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1488 propertyPath: m_LocalRotation.x 1488 propertyPath: m_LocalRotation.x
...@@ -1518,20 +1518,20 @@ PrefabInstance: ...@@ -1518,20 +1518,20 @@ PrefabInstance:
1518 objectReference: {fileID: 0} 1518 objectReference: {fileID: 0}
1519 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1519 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1520 propertyPath: m_LocalScale.x 1520 propertyPath: m_LocalScale.x
1521 - value: 5 1521 + value: 0.9
1522 objectReference: {fileID: 0} 1522 objectReference: {fileID: 0}
1523 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1523 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1524 propertyPath: m_LocalScale.y 1524 propertyPath: m_LocalScale.y
1525 - value: 5 1525 + value: 0.9
1526 objectReference: {fileID: 0} 1526 objectReference: {fileID: 0}
1527 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1527 - target: {fileID: 400000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1528 propertyPath: m_LocalScale.z 1528 propertyPath: m_LocalScale.z
1529 - value: 5 1529 + value: 1
1530 objectReference: {fileID: 0} 1530 objectReference: {fileID: 0}
1531 - target: {fileID: 9500000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1531 - target: {fileID: 9500000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1532 propertyPath: m_Avatar 1532 propertyPath: m_Avatar
1533 value: 1533 value:
1534 - objectReference: {fileID: 9000000, guid: 8c2451cba12610a4b83716d152a35013, type: 3} 1534 + objectReference: {fileID: 9000000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1535 - target: {fileID: 13700000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3} 1535 - target: {fileID: 13700000, guid: ebaf91e845e67ac4f85b03ca6c72bd32, type: 3}
1536 propertyPath: m_Materials.Array.data[0] 1536 propertyPath: m_Materials.Array.data[0]
1537 value: 1537 value:
...@@ -2109,7 +2109,7 @@ RectTransform: ...@@ -2109,7 +2109,7 @@ RectTransform:
2109 m_AnchorMin: {x: 0.5, y: 0.5} 2109 m_AnchorMin: {x: 0.5, y: 0.5}
2110 m_AnchorMax: {x: 0.5, y: 0.5} 2110 m_AnchorMax: {x: 0.5, y: 0.5}
2111 m_AnchoredPosition: {x: 0, y: -80} 2111 m_AnchoredPosition: {x: 0, y: -80}
2112 - m_SizeDelta: {x: 300, y: 350} 2112 + m_SizeDelta: {x: 250, y: 300}
2113 m_Pivot: {x: 0.5, y: 0.5} 2113 m_Pivot: {x: 0.5, y: 0.5}
2114 --- !u!114 &1606945880 2114 --- !u!114 &1606945880
2115 MonoBehaviour: 2115 MonoBehaviour:
...@@ -2292,8 +2292,8 @@ Transform: ...@@ -2292,8 +2292,8 @@ Transform:
2292 m_PrefabAsset: {fileID: 0} 2292 m_PrefabAsset: {fileID: 0}
2293 m_GameObject: {fileID: 1642118724} 2293 m_GameObject: {fileID: 1642118724}
2294 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 2294 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2295 - m_LocalPosition: {x: 0, y: -4, z: 0} 2295 + m_LocalPosition: {x: 0, y: 0.98, z: 2.09}
2296 - m_LocalScale: {x: 5.1, y: 3.5, z: 1} 2296 + m_LocalScale: {x: 1, y: 1, z: 1}
2297 m_Children: [] 2297 m_Children: []
2298 m_Father: {fileID: 0} 2298 m_Father: {fileID: 0}
2299 m_RootOrder: 3 2299 m_RootOrder: 3
...@@ -2589,17 +2589,17 @@ PrefabInstance: ...@@ -2589,17 +2589,17 @@ PrefabInstance:
2589 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2589 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2590 type: 3} 2590 type: 3}
2591 propertyPath: m_LocalPosition.x 2591 propertyPath: m_LocalPosition.x
2592 - value: -5 2592 + value: -0.8
2593 objectReference: {fileID: 0} 2593 objectReference: {fileID: 0}
2594 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2594 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2595 type: 3} 2595 type: 3}
2596 propertyPath: m_LocalPosition.y 2596 propertyPath: m_LocalPosition.y
2597 - value: -8.83 2597 + value: 0
2598 objectReference: {fileID: 0} 2598 objectReference: {fileID: 0}
2599 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2599 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2600 type: 3} 2600 type: 3}
2601 propertyPath: m_LocalPosition.z 2601 propertyPath: m_LocalPosition.z
2602 - value: -2.23 2602 + value: -0.05
2603 objectReference: {fileID: 0} 2603 objectReference: {fileID: 0}
2604 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2604 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2605 type: 3} 2605 type: 3}
...@@ -2644,17 +2644,17 @@ PrefabInstance: ...@@ -2644,17 +2644,17 @@ PrefabInstance:
2644 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2644 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2645 type: 3} 2645 type: 3}
2646 propertyPath: m_LocalScale.x 2646 propertyPath: m_LocalScale.x
2647 - value: 4 2647 + value: 0.8
2648 objectReference: {fileID: 0} 2648 objectReference: {fileID: 0}
2649 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2649 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2650 type: 3} 2650 type: 3}
2651 propertyPath: m_LocalScale.y 2651 propertyPath: m_LocalScale.y
2652 - value: 4 2652 + value: 0.8
2653 objectReference: {fileID: 0} 2653 objectReference: {fileID: 0}
2654 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2654 - target: {fileID: -4216859302048453862, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2655 type: 3} 2655 type: 3}
2656 propertyPath: m_LocalScale.z 2656 propertyPath: m_LocalScale.z
2657 - value: 4 2657 + value: 1
2658 objectReference: {fileID: 0} 2658 objectReference: {fileID: 0}
2659 - target: {fileID: -3033825942568983280, guid: 2fabf5256d4e0f64183020c8a537dc3f, 2659 - target: {fileID: -3033825942568983280, guid: 2fabf5256d4e0f64183020c8a537dc3f,
2660 type: 3} 2660 type: 3}
...@@ -2710,7 +2710,7 @@ RectTransform: ...@@ -2710,7 +2710,7 @@ RectTransform:
2710 m_AnchorMin: {x: 0.5, y: 0.5} 2710 m_AnchorMin: {x: 0.5, y: 0.5}
2711 m_AnchorMax: {x: 0.5, y: 0.5} 2711 m_AnchorMax: {x: 0.5, y: 0.5}
2712 m_AnchoredPosition: {x: 0, y: -80} 2712 m_AnchoredPosition: {x: 0, y: -80}
2713 - m_SizeDelta: {x: 300, y: 350} 2713 + m_SizeDelta: {x: 250, y: 300}
2714 m_Pivot: {x: 0.5, y: 0.5} 2714 m_Pivot: {x: 0.5, y: 0.5}
2715 --- !u!114 &1983785838 2715 --- !u!114 &1983785838
2716 MonoBehaviour: 2716 MonoBehaviour:
......
...@@ -334,7 +334,7 @@ class CharacterSkeleton ...@@ -334,7 +334,7 @@ class CharacterSkeleton
334 { 334 {
335 Vector3 m = joint[JointType_SpineBase]; 335 Vector3 m = joint[JointType_SpineBase];
336 336
337 - if (mirrored) m = new Vector3(-2, m.y-9, -2); 337 + if (mirrored) m = new Vector3(-1, m.y, 1);
338 humanoid.transform.position = m; 338 humanoid.transform.position = m;
339 } 339 }
340 } 340 }
......
...@@ -175,6 +175,10 @@ public class Move : MonoBehaviour ...@@ -175,6 +175,10 @@ public class Move : MonoBehaviour
175 lines_right = File.ReadAllLines(@"Trainer_txt/runzi_right.txt"); 175 lines_right = File.ReadAllLines(@"Trainer_txt/runzi_right.txt");
176 Debug.Log("읽음"); 176 Debug.Log("읽음");
177 } 177 }
178 + else {
179 + lines = File.ReadAllLines(@"Trainer_txt/squart.txt");
180 + Debug.Log("읽음");
181 + }
178 182
179 workout_count = 0; 183 workout_count = 0;
180 workout_flag = 0; 184 workout_flag = 0;
...@@ -398,7 +402,6 @@ public class Move : MonoBehaviour ...@@ -398,7 +402,6 @@ public class Move : MonoBehaviour
398 GCHandle gch3 = GCHandle.Alloc(id1, GCHandleType.Pinned); 402 GCHandle gch3 = GCHandle.Alloc(id1, GCHandleType.Pinned);
399 403
400 int i = -1; 404 int i = -1;
401 -
402 for (Kinect.JointType jt = Kinect.JointType.SpineBase; jt <= Kinect.JointType.ThumbRight; jt++) 405 for (Kinect.JointType jt = Kinect.JointType.SpineBase; jt <= Kinect.JointType.ThumbRight; jt++)
403 { 406 {
404 Kinect.Joint sourceJoint = body.Joints[jt]; 407 Kinect.Joint sourceJoint = body.Joints[jt];
......