2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
고다경
956280ed 1 parent 90a39221

트레이너 운동 읽기 수정

Inline Side-by-side
Showing 4 changed files with 176 additions and 20 deletions
1 +fileFormatVersion: 2
2 +guid: 236b1154a0a5aad42b48db27aa516c86
3 +TextureImporter:
4 + internalIDToNameTable: []
5 + externalObjects: {}
6 + serializedVersion: 11
7 + mipmaps:
8 + mipMapMode: 0
9 + enableMipMap: 1
10 + sRGBTexture: 1
11 + linearTexture: 0
12 + fadeOut: 0
13 + borderMipMap: 0
14 + mipMapsPreserveCoverage: 0
15 + alphaTestReferenceValue: 0.5
16 + mipMapFadeDistanceStart: 1
17 + mipMapFadeDistanceEnd: 3
18 + bumpmap:
19 + convertToNormalMap: 0
20 + externalNormalMap: 0
21 + heightScale: 0.25
22 + normalMapFilter: 0
23 + isReadable: 0
24 + streamingMipmaps: 0
25 + streamingMipmapsPriority: 0
26 + grayScaleToAlpha: 0
27 + generateCubemap: 6
28 + cubemapConvolution: 0
29 + seamlessCubemap: 0
30 + textureFormat: 1
31 + maxTextureSize: 2048
32 + textureSettings:
33 + serializedVersion: 2
34 + filterMode: -1
35 + aniso: -1
36 + mipBias: -100
37 + wrapU: -1
38 + wrapV: -1
39 + wrapW: -1
40 + nPOTScale: 1
41 + lightmap: 0
42 + compressionQuality: 50
43 + spriteMode: 0
44 + spriteExtrude: 1
45 + spriteMeshType: 1
46 + alignment: 0
47 + spritePivot: {x: 0.5, y: 0.5}
48 + spritePixelsToUnits: 100
49 + spriteBorder: {x: 0, y: 0, z: 0, w: 0}
50 + spriteGenerateFallbackPhysicsShape: 1
51 + alphaUsage: 1
52 + alphaIsTransparency: 0
53 + spriteTessellationDetail: -1
54 + textureType: 0
55 + textureShape: 1
56 + singleChannelComponent: 0
57 + maxTextureSizeSet: 0
58 + compressionQualitySet: 0
59 + textureFormatSet: 0
60 + applyGammaDecoding: 0
61 + platformSettings:
62 + - serializedVersion: 3
63 + buildTarget: DefaultTexturePlatform
64 + maxTextureSize: 2048
65 + resizeAlgorithm: 0
66 + textureFormat: -1
67 + textureCompression: 1
68 + compressionQuality: 50
69 + crunchedCompression: 0
70 + allowsAlphaSplitting: 0
71 + overridden: 0
72 + androidETC2FallbackOverride: 0
73 + forceMaximumCompressionQuality_BC6H_BC7: 0
74 + spriteSheet:
75 + serializedVersion: 2
76 + sprites: []
77 + outline: []
78 + physicsShape: []
79 + bones: []
80 + spriteID:
81 + internalID: 0
82 + vertices: []
83 + indices:
84 + edges: []
85 + weights: []
86 + secondaryTextures: []
87 + spritePackingTag:
88 + pSDRemoveMatte: 0
89 + pSDShowRemoveMatteOption: 0
90 + userData:
91 + assetBundleName:
92 + assetBundleVariant:
...@@ -1205,6 +1205,77 @@ MonoBehaviour: ...@@ -1205,6 +1205,77 @@ MonoBehaviour:
1205 m_VerticalOverflow: 0 1205 m_VerticalOverflow: 0
1206 m_LineSpacing: 1 1206 m_LineSpacing: 1
1207 m_Text: IfSpinelsStraight 1207 m_Text: IfSpinelsStraight
1208 +--- !u!1 &938472432
1209 +GameObject:
1210 + m_ObjectHideFlags: 0
1211 + m_CorrespondingSourceObject: {fileID: 0}
1212 + m_PrefabInstance: {fileID: 0}
1213 + m_PrefabAsset: {fileID: 0}
1214 + serializedVersion: 6
1215 + m_Component:
1216 + - component: {fileID: 938472433}
1217 + - component: {fileID: 938472435}
1218 + - component: {fileID: 938472434}
1219 + m_Layer: 5
1220 + m_Name: Trainee_text6
1221 + m_TagString: Untagged
1222 + m_Icon: {fileID: 0}
1223 + m_NavMeshLayer: 0
1224 + m_StaticEditorFlags: 0
1225 + m_IsActive: 0
1226 +--- !u!224 &938472433
1227 +RectTransform:
1228 + m_ObjectHideFlags: 0
1229 + m_CorrespondingSourceObject: {fileID: 0}
1230 + m_PrefabInstance: {fileID: 0}
1231 + m_PrefabAsset: {fileID: 0}
1232 + m_GameObject: {fileID: 938472432}
1233 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1234 + m_LocalPosition: {x: 0, y: 0, z: 0}
1235 + m_LocalScale: {x: 1, y: 1, z: 1}
1236 + m_Children: []
1237 + m_Father: {fileID: 1679758666}
1238 + m_RootOrder: 23
1239 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1240 + m_AnchorMin: {x: 0.5, y: 0.5}
1241 + m_AnchorMax: {x: 0.5, y: 0.5}
1242 + m_AnchoredPosition: {x: 330, y: 150}
1243 + m_SizeDelta: {x: 250, y: 30}
1244 + m_Pivot: {x: 0.5, y: 0.5}
1245 +--- !u!114 &938472434
1246 +MonoBehaviour:
1247 + m_ObjectHideFlags: 0
1248 + m_CorrespondingSourceObject: {fileID: 0}
1249 + m_PrefabInstance: {fileID: 0}
1250 + m_PrefabAsset: {fileID: 0}
1251 + m_GameObject: {fileID: 938472432}
1252 + m_Enabled: 1
1253 + m_EditorHideFlags: 0
1254 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
1255 + m_Name:
1256 + m_EditorClassIdentifier:
1257 + m_Material: {fileID: 0}
1258 + m_Color: {r: 1, g: 1, b: 1, a: 1}
1259 + m_RaycastTarget: 1
1260 + m_Maskable: 1
1261 + m_OnCullStateChanged:
1262 + m_PersistentCalls:
1263 + m_Calls: []
1264 + m_Texture: {fileID: 2800000, guid: 236b1154a0a5aad42b48db27aa516c86, type: 3}
1265 + m_UVRect:
1266 + serializedVersion: 2
1267 + x: 0
1268 + y: 0
1269 + width: 1
1270 + height: 1
1271 +--- !u!222 &938472435
1272 +CanvasRenderer:
1273 + m_ObjectHideFlags: 0
1274 + m_CorrespondingSourceObject: {fileID: 0}
1275 + m_PrefabInstance: {fileID: 0}
1276 + m_PrefabAsset: {fileID: 0}
1277 + m_GameObject: {fileID: 938472432}
1278 + m_CullTransparentMesh: 0
1208 --- !u!1 &972410871 1279 --- !u!1 &972410871
1209 GameObject: 1280 GameObject:
1210 m_ObjectHideFlags: 0 1281 m_ObjectHideFlags: 0
...@@ -1760,6 +1831,7 @@ MonoBehaviour: ...@@ -1760,6 +1831,7 @@ MonoBehaviour:
1760 LegUp3: {fileID: 1484596775} 1831 LegUp3: {fileID: 1484596775}
1761 SpineStraight4: {fileID: 1089006720} 1832 SpineStraight4: {fileID: 1089006720}
1762 Great5: {fileID: 310358198} 1833 Great5: {fileID: 310358198}
1834 + KneeDown6: {fileID: 938472432}
1763 ex_start: {fileID: 1723072947} 1835 ex_start: {fileID: 1723072947}
1764 --- !u!4 &1461362268 1836 --- !u!4 &1461362268
1765 Transform: 1837 Transform:
...@@ -2279,6 +2351,7 @@ RectTransform: ...@@ -2279,6 +2351,7 @@ RectTransform:
2279 - {fileID: 5836630} 2351 - {fileID: 5836630}
2280 - {fileID: 1373649303} 2352 - {fileID: 1373649303}
2281 - {fileID: 972410872} 2353 - {fileID: 972410872}
2354 + - {fileID: 938472433}
2282 m_Father: {fileID: 0} 2355 m_Father: {fileID: 0}
2283 m_RootOrder: 4 2356 m_RootOrder: 4
2284 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 2357 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......
...@@ -64,7 +64,7 @@ public class Move : MonoBehaviour ...@@ -64,7 +64,7 @@ public class Move : MonoBehaviour
64 public GameObject count3; 64 public GameObject count3;
65 public GameObject count2; 65 public GameObject count2;
66 public GameObject count1; 66 public GameObject count1;
67 - public GameObject HipBalance1, PullHipBack2, LegUp3, SpineStraight4, Great5; 67 + public GameObject HipBalance1, PullHipBack2, LegUp3, SpineStraight4, Great5, KneeDown6;
68 public GameObject ex_start; 68 public GameObject ex_start;
69 69
70 //lsy 70 //lsy
...@@ -169,7 +169,7 @@ public class Move : MonoBehaviour ...@@ -169,7 +169,7 @@ public class Move : MonoBehaviour
169 lines_right = File.ReadAllLines(@"Trainer_txt/leg_right.txt"); 169 lines_right = File.ReadAllLines(@"Trainer_txt/leg_right.txt");
170 Debug.Log("읽음"); 170 Debug.Log("읽음");
171 } 171 }
172 - else 172 + else if (exercise == "Lunge")
173 { 173 {
174 lines = File.ReadAllLines(@"Trainer_txt/runzi_left.txt"); 174 lines = File.ReadAllLines(@"Trainer_txt/runzi_left.txt");
175 lines_right = File.ReadAllLines(@"Trainer_txt/runzi_right.txt"); 175 lines_right = File.ReadAllLines(@"Trainer_txt/runzi_right.txt");
...@@ -186,6 +186,7 @@ public class Move : MonoBehaviour ...@@ -186,6 +186,7 @@ public class Move : MonoBehaviour
186 LegUp3.SetActive(false); 186 LegUp3.SetActive(false);
187 SpineStraight4.SetActive(false); 187 SpineStraight4.SetActive(false);
188 Great5.SetActive(false); 188 Great5.SetActive(false);
189 + KneeDown6.SetActive(false);
189 } 190 }
190 191
191 private Dictionary<Kinect.JointType, Kinect.JointType> _BoneMap = new Dictionary<Kinect.JointType, Kinect.JointType>() 192 private Dictionary<Kinect.JointType, Kinect.JointType> _BoneMap = new Dictionary<Kinect.JointType, Kinect.JointType>()
...@@ -237,6 +238,8 @@ public class Move : MonoBehaviour ...@@ -237,6 +238,8 @@ public class Move : MonoBehaviour
237 LegUp3.SetActive(false); 238 LegUp3.SetActive(false);
238 SpineStraight4.SetActive(false); 239 SpineStraight4.SetActive(false);
239 Great5.SetActive(false); 240 Great5.SetActive(false);
241 + KneeDown6.SetActive(false);
242 +
240 } 243 }
241 else if (timer >= 1 && timer < 2) { 244 else if (timer >= 1 && timer < 2) {
242 count3.SetActive(false); 245 count3.SetActive(false);
...@@ -249,6 +252,8 @@ public class Move : MonoBehaviour ...@@ -249,6 +252,8 @@ public class Move : MonoBehaviour
249 LegUp3.SetActive(false); 252 LegUp3.SetActive(false);
250 SpineStraight4.SetActive(false); 253 SpineStraight4.SetActive(false);
251 Great5.SetActive(false); 254 Great5.SetActive(false);
255 + KneeDown6.SetActive(false);
256 +
252 } 257 }
253 else if (timer >= 2 && timer < 3) 258 else if (timer >= 2 && timer < 3)
254 { 259 {
...@@ -262,6 +267,8 @@ public class Move : MonoBehaviour ...@@ -262,6 +267,8 @@ public class Move : MonoBehaviour
262 LegUp3.SetActive(false); 267 LegUp3.SetActive(false);
263 SpineStraight4.SetActive(false); 268 SpineStraight4.SetActive(false);
264 Great5.SetActive(false); 269 Great5.SetActive(false);
270 + KneeDown6.SetActive(false);
271 +
265 } 272 }
266 else 273 else
267 { 274 {
...@@ -500,11 +507,13 @@ public class Move : MonoBehaviour ...@@ -500,11 +507,13 @@ public class Move : MonoBehaviour
500 { 507 {
501 great = "GREAT!"; 508 great = "GREAT!";
502 Great5.SetActive(true); 509 Great5.SetActive(true);
510 + KneeDown6.SetActive(false);
503 } 511 }
504 else 512 else
505 { 513 {
506 great = ""; 514 great = "";
507 Great5.SetActive(false); 515 Great5.SetActive(false);
516 + KneeDown6.SetActive(true);
508 } 517 }
509 518
510 //////////////운동 횟수 카운트////////////////// 519 //////////////운동 횟수 카운트//////////////////
...@@ -543,18 +552,6 @@ public class Move : MonoBehaviour ...@@ -543,18 +552,6 @@ public class Move : MonoBehaviour
543 } 552 }
544 553
545 554
546 -
547 - IfSpineIsStraight.text =spinestraight;
548 - HipBalance.text = hipbal;
549 - //AngleLeftKnee.text = "왼쪽 무릎 각도: " + ReadAngles[3].ToString();
550 - //AngleRightKnee.text = "오른쪽 무릎 각도: " + ReadAngles[4].ToString();
551 - //KneeToeLeft.text = "올바르지 않은 자세: " + leftkneewarning;
552 - //KneeToeRight.text = "올바르지 않은 자세: " + rightkneewarning;
553 - PullHipBack.text = pullhipback;
554 - LeftLegUp.text = leftsidehighkick;
555 - RightLegUp.text = rightsidehighkick;
556 - Great.text = great;
557 -
558 /////////////////////////// 555 ///////////////////////////
559 556
560 if (_BoneMap.ContainsKey(jt)) 557 if (_BoneMap.ContainsKey(jt))
...@@ -652,12 +649,6 @@ public class Move : MonoBehaviour ...@@ -652,12 +649,6 @@ public class Move : MonoBehaviour
652 Vector3 FootRight = new Vector3(body.Joints[Kinect.JointType.FootRight].Position.X, body.Joints[Kinect.JointType.FootRight].Position.Y, body.Joints[Kinect.JointType.FootRight].Position.Z); 649 Vector3 FootRight = new Vector3(body.Joints[Kinect.JointType.FootRight].Position.X, body.Joints[Kinect.JointType.FootRight].Position.Y, body.Joints[Kinect.JointType.FootRight].Position.Z);
653 Vector3 FootLeft = new Vector3(body.Joints[Kinect.JointType.FootLeft].Position.X, body.Joints[Kinect.JointType.FootLeft].Position.Y, body.Joints[Kinect.JointType.FootLeft].Position.Z); 650 Vector3 FootLeft = new Vector3(body.Joints[Kinect.JointType.FootLeft].Position.X, body.Joints[Kinect.JointType.FootLeft].Position.Y, body.Joints[Kinect.JointType.FootLeft].Position.Z);
654 651
655 - /*
656 - double AngleRightElbow = AngleBetweenTwoVectors(RightElbow - RightShoulder, RightElbow - RightWrist);
657 - double AngleRightShoulder = AngleBetweenTwoVectors(UpVector, RightShoulder - RightElbow);
658 - double AngleLeftElbow = AngleBetweenTwoVectors(LeftElbow - LeftShoulder, LeftElbow - LeftWrist);
659 - double AngleLeftShoulder = AngleBetweenTwoVectors(UpVector, LeftShoulder - LeftElbow);
660 - */
661 652
662 double StraightSpine = AngleBetweenTwoVectors(SpineShoulder - SpineMid, SpineBase - SpineMid); //스쿼트, 런지 - Joint 3개로도 가능 653 double StraightSpine = AngleBetweenTwoVectors(SpineShoulder - SpineMid, SpineBase - SpineMid); //스쿼트, 런지 - Joint 3개로도 가능
663 654
......