From e06acaad0e8b86507b8dcc04e696b6c15b9a8276 Mon Sep 17 00:00:00 2001 From: Alexis Iakovenko <alexis.iakovenko@gmail.com> Date: Sat, 16 Dec 2017 17:07:07 +0100 Subject: [PATCH] Implement time normalization for gesture --- Assets/Compare/CompareGestureMean.cs | 9 +- Assets/Gesture/Gesture.cs | 56 ++++-- Assets/Record/Recorded/gesture/1.txt | 199 +++++++++++++++------- Assets/Record/Recorded/gesture/1.txt.meta | 2 +- Assets/Record/Recorded/gesture/2.txt | 163 ++++++++++++++---- Assets/Record/Recorded/gesture/2.txt.meta | 2 +- Assets/Record/Recorded/gesture/3.txt | 152 ++++++++++++++--- Assets/Record/Recorded/gesture/3.txt.meta | 2 +- Assets/Replay/Replay.cs | 6 +- Assets/Scenes/Replay.unity | 84 ++++++++- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 27 ++- 12 files changed, 550 insertions(+), 153 deletions(-) diff --git a/Assets/Compare/CompareGestureMean.cs b/Assets/Compare/CompareGestureMean.cs index 5779383..3874bdc 100644 --- a/Assets/Compare/CompareGestureMean.cs +++ b/Assets/Compare/CompareGestureMean.cs @@ -17,12 +17,11 @@ public class CompareGestureMean : MonoBehaviour void LoadGestures () { //gesture to compare - gestureToCompare = new Gesture ("swing/1"); + gestureToCompare = new Gesture ("gesture/0"); //gestures from data - gestures.Add (new Gesture ("swing/2")); - gestures.Add (new Gesture ("swing/3")); - gestures.Add (new Gesture ("swing/4")); - gestures.Add (new Gesture ("swing/5")); + gestures.Add (new Gesture ("gesture/1")); + gestures.Add (new Gesture ("gesture/2")); + gestures.Add (new Gesture ("gesture/3")); } Gesture ComputeMeanGesture() diff --git a/Assets/Gesture/Gesture.cs b/Assets/Gesture/Gesture.cs index dacb960..b9a5855 100644 --- a/Assets/Gesture/Gesture.cs +++ b/Assets/Gesture/Gesture.cs @@ -52,32 +52,52 @@ public class Gesture //time normalization: have 100 points. - /*float timeNormalizationFactor = 100.0f / states.Count; + int pointNumber = 100; + float timeNormalizationFactor = pointNumber * 1.0f / states.Count; + Debug.Log ("Time normalization, factor: " + timeNormalizationFactor); List<GestureState> normalizedStates = new List<GestureState>(); - for(int i = 0; i < states.Count; i ++) + + float timestampStep = (states [states.Count - 1].timestamp - states [0].timestamp) / (states.Count - 1); + float normalizedTimestamp = states [0].timestamp; + for (int i = 0; i < pointNumber; i++) { GestureState normalizedState = new GestureState (); - if (i == 0 || i == states.Count - 1) //first and last elements have the same values - { - normalizedState.position = states [i].position; - normalizedState.timestamp = states [i].timestamp; - } - else + + int stateID = (int)Mathf.Floor(i / timeNormalizationFactor); + GestureState currentState = states [stateID]; + Vector3 normalizedPosition = states [stateID].position; + Vector3 normalizedRotation = states [stateID].rotation; + + if (stateID > 0 && stateID < states.Count - 1) { - GestureState statePrevious = states [i - 1]; - GestureState stateCurrent = states [i]; - float timestampDifference = stateCurrent.timestamp - statePrevious.timestamp; - Vector3 positionDifference = stateCurrent.position - statePrevious.position; - - float newTimeStamp = normalizedStates [normalizedStates.Count - 1].timestamp + timestampDifference * timeNormalizationFactor; - Vector3 newPosition = normalizedStates [normalizedStates.Count - 1].position + positionDifference * timeNormalizationFactor; - normalizedState.timestamp = newTimeStamp; - normalizedState.position = newPosition; + GestureState nextState = states [stateID + 1]; + float smallTimestamp = (normalizedTimestamp - currentState.timestamp); + if (smallTimestamp != 0) + { + float smallFactor = (nextState.timestamp - currentState.timestamp) / smallTimestamp; + + Vector3 positionToNextState = nextState.position - currentState.position; + normalizedPosition = currentState.position + positionToNextState * smallFactor; + + Vector3 rotationToNextState = nextState.rotation - currentState.rotation; + normalizedRotation = currentState.rotation + rotationToNextState * smallFactor; + } } + + normalizedState.position = normalizedPosition; + normalizedState.rotation = normalizedRotation; + normalizedState.timestamp = normalizedTimestamp; normalizedStates.Add (normalizedState); + + normalizedTimestamp += timestampStep; + + //Debug.Log ("i: " + i + ", state id: " + stateID + " of " + states.Count); + //Debug.Log ("currentstate T: " + currentState.timestamp + ", pos: " + currentState.position); + //Debug.Log ("normstate T: " + normalizedState.timestamp + ", pos: " + normalizedState.position); } + states = normalizedStates; - Debug.Log ("Time normalization done: " + normalizedStates.Count);*/ + //Debug.Log ("Time normalization done\n"); } public void VerifyNormalization () diff --git a/Assets/Record/Recorded/gesture/1.txt b/Assets/Record/Recorded/gesture/1.txt index c518313..1fa4501 100644 --- a/Assets/Record/Recorded/gesture/1.txt +++ b/Assets/Record/Recorded/gesture/1.txt @@ -1,68 +1,135 @@ Gesture: gesture; Author: user; Recorded: timestamp l_palm_pos_x l_palm_pos_y l_palm_pos_z r_palm_pos_x r_palm_pos_y r_palm_pos_z -12.19871 0 0 0 0 0 0 -12.21576 0 0 0 0 0 0 -12.23171 0 0 0 0 0 0 -12.24882 0 0 0 0 0 0 -12.26487 0 0 0 0 0 0 -12.28186 0 0 0 0 0 0 -12.29798 0 0 0 0 0 0 -12.31454 0 0 0 0 0 0 -12.33111 0 0 0 0 0 0 -12.3479 0 0 0 0 0 0 -12.36424 0 0 0 0 0 0 -12.38092 0 0 0 0 0 0 -12.39794 0 0 0 0 0 0 -12.41395 0 0 0 0 0 0 -12.43052 0 0 0 0 0 0 -12.44708 0 0 0 0 0 0 -12.46399 0 0 0 0 0 0 -12.48022 0 0 0 0 0 0 -12.49703 0 0 0 0 0 0 -12.51336 0 0 0 0 0 0 -12.53005 0 0 0 0 0 0 -12.54704 0 0 0 0 0 0 -12.5631 0 0 0 0 0 0 -12.5801 0 0 0 0 0 0 -12.59712 0 0 0 0 0 0 -12.61315 0 0 0 0 0 0 -12.62932 0 0 0 0 0 0 -12.64588 0 0 0 0 0 0 -12.66245 0 0 0 0 0 0 -12.67923 0 0 0 0 0 0 -12.69559 0 0 0 0 0 0 -12.71224 0 0 0 0 0 0 -12.72927 0 0 0 0 0 0 -12.74532 0 0 0 0 0 0 -12.76185 0 0 0 0 0 0 -12.77842 0 0 0 0 0 0 -12.79532 0 0 0 0 0 0 -12.81156 0 0 0 0 0 0 -12.82838 0 0 0 0 0 0 -12.84468 0 0 0 0 0 0 -12.86142 0 0 0 0 0 0 -12.87781 0 0 0 0 0 0 -12.89448 0 0 0 0 0 0 -12.91095 0 0 0 0 0 0 -12.9276 0 0 0 0 0 0 -12.94418 0 0 0 0 0 0 -12.96065 0 0 0 0 0 0 -12.97721 0 0 0 0 0 0 -12.99378 0 0 0 0 0 0 -13.0106 0 0 0 0 0 0 -13.02692 0 0 0 0 0 0 -13.04368 0 0 0 0 0 0 -13.06005 0 0 0 0 0 0 -13.07667 0 0 0 0 0 0 -13.09319 0 0 0 0 0 0 -13.10985 0 0 0 0 0 0 -13.12678 0 0 0 0 0 0 -13.14288 0 0 0 0 0 0 -13.15987 0 0 0 0 0 0 -13.17686 0 0 0 0 0 0 -13.19259 0 0 0 0 0 0 -13.22866 0 0 0 0 0 0 -13.24524 0 0 0 0 0 0 -13.26189 0 0 0 0 0 0 -13.27892 0 0 0 0 0 0 -13.29493 0 0 0 0 0 0 +8.335104 -0.0117327 -0.002831608 0.2362472 -0.5239148 0.440441 0.4761149 0 0 0 0 0 0 +8.351527 -0.01173361 -0.002761424 0.2362288 -0.5239809 0.4403611 0.4760591 0 0 0 0 0 0 +8.368251 -0.01173379 -0.002830088 0.2362466 -0.5240141 0.4402403 0.4760155 0 0 0 0 0 0 +8.385167 -0.01173422 -0.002870411 0.2362569 -0.5240623 0.4401109 0.4759611 0 0 0 0 0 0 +8.401217 -0.01174609 -0.002872258 0.2362317 -0.5242275 0.4401864 0.4758735 0 0 0 0 0 0 +8.418187 -0.01175577 -0.002836913 0.2362166 -0.5241616 0.4401516 0.475994 0 0 0 0 0 0 +8.434347 -0.01176549 -0.002801538 0.2362015 -0.5240959 0.4401166 0.4761145 0 0 0 0 0 0 +8.451313 -0.01178064 -0.002734214 0.2361939 -0.5241071 0.4401245 0.476185 0 0 0 0 0 0 +8.467489 -0.01178669 -0.002714336 0.2362063 -0.5240384 0.4401591 0.4761834 0 0 0 0 0 0 +8.484363 -0.01179032 -0.002706081 0.2362242 -0.523957 0.4402032 0.4761573 0 0 0 0 0 0 +8.501385 -0.01179735 -0.002714932 0.236258 -0.523897 0.4402314 0.4761999 0 0 0 0 0 0 +8.517391 -0.01180355 -0.002720743 0.2362879 -0.5238361 0.4402611 0.47623 0 0 0 0 0 0 +8.533864 -0.01181758 -0.002709866 0.2363141 -0.5238124 0.4403508 0.4762167 0 0 0 0 0 0 +8.550396 -0.01183203 -0.002720952 0.2363369 -0.523797 0.4405157 0.4763409 0 0 0 0 0 0 +8.56739 -0.01184776 -0.00273338 0.2363613 -0.5237809 0.4406968 0.4764785 0 0 0 0 0 0 +8.583453 -0.01185919 -0.002750188 0.2364081 -0.5236347 0.4408257 0.4764963 0 0 0 0 0 0 +8.600492 -0.01187217 -0.002766401 0.2364506 -0.523518 0.440973 0.4765466 0 0 0 0 0 0 +8.617591 -0.01190492 -0.002775401 0.2364695 -0.5240266 0.4405968 0.4762784 0 0 0 0 0 0 +8.63315 -0.01191357 -0.002798587 0.2365181 -0.5238793 0.4407782 0.476342 0 0 0 0 0 0 +8.650595 -0.0119258 -0.002824277 0.2365725 -0.5237587 0.4409459 0.4763903 0 0 0 0 0 0 +8.666621 -0.0119229 -0.002827257 0.2366038 -0.5234547 0.4411403 0.4764335 0 0 0 0 0 0 +8.682858 -0.01192458 -0.002836704 0.2366398 -0.5232227 0.4413149 0.4764756 0 0 0 0 0 0 +8.699721 -0.01199217 -0.002854615 0.2368725 -0.5219102 0.4422785 0.4774553 0 0 0 0 0 0 +8.715984 -0.01202958 -0.002864093 0.2369812 -0.5194517 0.4435329 0.4786254 0 0 0 0 0 0 +8.732786 -0.01206635 -0.002874076 0.2370928 -0.5172624 0.4446703 0.4796845 0 0 0 0 0 0 +8.749125 -0.01197944 -0.002527922 0.2372925 -0.510258 0.448432 0.4806528 0 0 0 0 0 0 +8.765854 -0.01155063 -0.002944589 0.2376827 -0.497594 0.4511056 0.4848731 0 0 0 0 0 0 +8.782248 -0.01107126 -0.003445089 0.2381025 -0.483841 0.4536559 0.4894066 0 0 0 0 0 0 +8.798944 -0.0101608 -0.004030794 0.2385091 -0.466029 0.4590972 0.4952853 0 0 0 0 0 0 +8.815392 -0.008859413 -0.003902167 0.2388014 -0.4443547 0.4647132 0.4998339 0 0 0 0 0 0 +8.831986 -0.007233174 -0.003427118 0.2392605 -0.4224057 0.4696354 0.5065436 0 0 0 0 0 0 +8.848526 -0.00489344 -0.001402348 0.2396813 -0.4013987 0.4746518 0.5076383 0 0 0 0 0 0 +8.865096 -0.002041347 -0.000390023 0.2404467 -0.3739963 0.4748663 0.5018052 0 0 0 0 0 0 +8.882012 0.001152615 -0.001363128 0.2414585 -0.3556286 0.4764552 0.4842488 0 0 0 0 0 0 +8.899035 0.004532257 -0.003755718 0.2423341 -0.3340511 0.4822338 0.468009 0 0 0 0 0 0 +8.915014 0.008074562 -0.005613923 0.2429347 -0.314576 0.4925049 0.4509746 0 0 0 0 0 0 +8.932081 0.01139471 -0.007554501 0.2433573 -0.2852523 0.5023153 0.4397658 0 0 0 0 0 0 +8.948052 0.01477883 -0.009016186 0.243354 -0.2595818 0.5180776 0.4241498 0 0 0 0 0 0 +8.965074 0.01802134 -0.009824812 0.2434208 -0.2395007 0.5316714 0.4092098 0 0 0 0 0 0 +8.981071 0.02128289 -0.009306192 0.2435455 -0.2189555 0.5431016 0.4001485 0 0 0 0 0 0 +8.997614 0.02454069 -0.008623987 0.2432796 -0.2020343 0.5547017 0.3885663 0 0 0 0 0 0 +9.01548 0.02942936 -0.01100755 0.2444893 -0.1755443 0.5667692 0.3757099 0 0 0 0 0 0 +9.031249 0.03415949 -0.01264077 0.2453306 -0.1542082 0.5778459 0.3594428 0 0 0 0 0 0 +9.047325 0.03856847 -0.01788211 0.245103 -0.131219 0.5890007 0.3323667 0 0 0 0 0 0 +9.064116 0.0408958 -0.02390707 0.2442257 -0.1200872 0.5986961 0.3045602 0 0 0 0 0 0 +9.081174 0.04280347 -0.02877021 0.2435284 -0.0971271 0.6042451 0.2903855 0 0 0 0 0 0 +9.097169 0.04393119 -0.0339303 0.243271 -0.07492728 0.6056006 0.2557246 0 0 0 0 0 0 +9.11359 0.04501566 -0.0389756 0.2429539 -0.05534944 0.6074091 0.2235829 0 0 0 0 0 0 +9.130241 0.04597767 -0.04444709 0.2428903 -0.03514645 0.6103862 0.2031043 0 0 0 0 0 0 +9.146717 0.04603471 -0.0511021 0.2426495 -0.02025302 0.6130419 0.1776294 0 0 0 0 0 0 +9.163288 0.04382234 -0.0572827 0.2418314 -0.003197643 0.6095154 0.1580335 0 0 0 0 0 0 +9.180223 0.04203641 -0.06217013 0.2407305 0.01755645 0.6083366 0.1399171 0 0 0 0 0 0 +9.196415 0.04093423 -0.06669764 0.2400576 0.02471045 0.6095227 0.1289951 0 0 0 0 0 0 +9.213237 0.04040087 -0.07183753 0.2396913 0.04442364 0.6113715 0.1270957 0 0 0 0 0 0 +9.229556 0.0395962 -0.07774535 0.2394238 0.07445849 0.6137083 0.1053958 0 0 0 0 0 0 +9.246262 0.04038857 -0.08534876 0.2398358 0.1264773 0.6177652 0.07184719 0 0 0 0 0 0 +9.262682 0.04153616 -0.09219572 0.2397829 0.1776512 0.6155618 0.05480097 0 0 0 0 0 0 +9.279284 0.04283178 -0.09809278 0.2391658 0.2415659 0.6090528 0.05014908 0 0 0 0 0 0 +9.295824 0.04301018 -0.1005513 0.2389686 0.2795788 0.5938956 0.0392415 0 0 0 0 0 0 +9.312384 0.04239942 -0.1020618 0.2392245 0.2919941 0.5838266 0.02487479 0 0 0 0 0 0 +9.32932 0.04160379 -0.1048571 0.2399854 0.2862723 0.583648 0.01902349 0 0 0 0 0 0 +9.345518 0.04133128 -0.1062886 0.2401497 0.2944049 0.5797189 0.02152982 0 0 0 0 0 0 +9.362333 0.04121233 -0.1069865 0.2401011 0.3044813 0.5744942 0.02113247 0 0 0 0 0 0 +9.378656 0.04093881 -0.1076953 0.2401238 0.3111812 0.569731 0.01763162 0 0 0 0 0 0 +9.395386 0.04084389 -0.1082876 0.2402193 0.3174782 0.5651005 0.01885083 0 0 0 0 0 0 +9.412384 0.04094492 -0.1084671 0.2402978 0.3185734 0.5639788 0.02189124 0 0 0 0 0 0 +9.428396 0.04115953 -0.108355 0.2403815 0.3180398 0.5645257 0.02771047 0 0 0 0 0 0 +9.445596 0.04135553 -0.108208 0.2404947 0.3151532 0.5670304 0.03406914 0 0 0 0 0 0 +9.461494 0.0414726 -0.107763 0.2405443 0.3098727 0.5703028 0.0384327 0 0 0 0 0 0 +9.478504 0.04151811 -0.1073116 0.2405975 0.3052729 0.5736673 0.04554684 0 0 0 0 0 0 +9.494623 0.04186595 -0.1059862 0.2406721 0.3125208 0.5671895 0.05499027 0 0 0 0 0 0 +9.5115 0.04226707 -0.1041101 0.2408103 0.3047875 0.569006 0.06625921 0 0 0 0 0 0 +9.528542 0.0427452 -0.1024121 0.2409189 0.2817687 0.5894142 0.092402 0 0 0 0 0 0 +9.544544 0.0432154 -0.1005993 0.2410789 0.2650361 0.6010434 0.111671 0 0 0 0 0 0 +9.561534 0.04376226 -0.09731707 0.2411644 0.2419559 0.6102192 0.1286593 0 0 0 0 0 0 +9.577605 0.04383205 -0.09480593 0.2414296 0.2182871 0.6159362 0.1506827 0 0 0 0 0 0 +9.594545 0.0437767 -0.09228443 0.2414021 0.1885165 0.6282372 0.1697975 0 0 0 0 0 0 +9.610583 0.04395916 -0.08842918 0.2417035 0.1498275 0.6381945 0.1770232 0 0 0 0 0 0 +9.62758 0.0445608 -0.08198035 0.2422429 0.1006271 0.643841 0.196109 0 0 0 0 0 0 +9.643713 0.0444959 -0.07654978 0.2427723 0.07395716 0.6402416 0.1995995 0 0 0 0 0 0 +9.660617 0.04459513 -0.06998654 0.2434072 0.04760179 0.6348275 0.2048977 0 0 0 0 0 0 +9.676847 0.04459113 -0.06222785 0.2437302 0.01710118 0.627134 0.2068943 0 0 0 0 0 0 +9.693621 0.04512168 -0.05549274 0.2445501 0.003121328 0.6192858 0.2194095 0 0 0 0 0 0 +9.710002 0.04517727 -0.05014703 0.2453233 -0.007648339 0.614724 0.2313095 0 0 0 0 0 0 +9.726671 0.04522881 -0.04379848 0.2461618 -0.02677732 0.6124185 0.2543413 0 0 0 0 0 0 +9.743116 0.04495258 -0.03718325 0.2467476 -0.0546906 0.6076495 0.2862619 0 0 0 0 0 0 +9.759685 0.04412968 -0.03138182 0.2478895 -0.0779827 0.6028799 0.3228903 0 0 0 0 0 0 +9.776688 0.04342745 -0.0240916 0.2492622 -0.1092751 0.59772 0.3553329 0 0 0 0 0 0 +9.792813 0.04133713 -0.01992431 0.2495593 -0.1226078 0.5895371 0.3720483 0 0 0 0 0 0 +9.809705 0.03786065 -0.01557079 0.2501596 -0.1404413 0.5786697 0.3930401 0 0 0 0 0 0 +9.826698 0.03543337 -0.0119192 0.2505322 -0.1556047 0.5716543 0.4020036 0 0 0 0 0 0 +9.842535 0.03275563 -0.008085966 0.2506817 -0.164931 0.5662652 0.4011087 0 0 0 0 0 0 +9.859079 0.02978899 -0.006418258 0.2510045 -0.1804517 0.5600552 0.4100977 0 0 0 0 0 0 +9.875765 0.02544167 -0.007103503 0.2508384 -0.1925198 0.5523477 0.4248987 0 0 0 0 0 0 +9.892763 0.02085443 -0.008701116 0.2507246 -0.2097607 0.5378898 0.4400188 0 0 0 0 0 0 +9.908787 0.01639585 -0.008389175 0.2506545 -0.2307124 0.519536 0.4509734 0 0 0 0 0 0 +9.925353 0.01302679 -0.006866902 0.2503129 -0.2460183 0.5066118 0.458311 0 0 0 0 0 0 +9.941914 0.01020207 -0.003746301 0.2502609 -0.2657257 0.4936309 0.4680251 0 0 0 0 0 0 +9.958896 0.007108287 -0.0001608729 0.250331 -0.2813219 0.4828543 0.4848568 0 0 0 0 0 0 +9.975053 0.004105531 0.003739953 0.2506114 -0.3041826 0.4723031 0.4994708 0 0 0 0 0 0 +9.991805 0.001095646 0.005634725 0.2511529 -0.3254332 0.4609925 0.5134501 0 0 0 0 0 0 +10.00818 -0.00302676 0.006233275 0.2511668 -0.3487844 0.447594 0.5288706 0 0 0 0 0 0 +10.02475 -0.007088827 0.006736279 0.2504647 -0.3709557 0.4383657 0.5430504 0 0 0 0 0 0 +10.04132 -0.0105012 0.008082181 0.2495487 -0.3954623 0.4292923 0.5458407 0 0 0 0 0 0 +10.05788 -0.01391882 0.008458048 0.2478679 -0.4321799 0.4200373 0.5380629 0 0 0 0 0 0 +10.07489 -0.01685878 0.008523196 0.246742 -0.4556507 0.4163111 0.5357949 0 0 0 0 0 0 +10.09103 -0.01895327 0.00886777 0.2465058 -0.4715337 0.4150555 0.5302283 0 0 0 0 0 0 +10.10795 -0.02102022 0.008869261 0.2462344 -0.4841289 0.4138303 0.5270363 0 0 0 0 0 0 +10.12415 -0.02246883 0.008482367 0.2461816 -0.4850191 0.4168597 0.5296286 0 0 0 0 0 0 +10.14096 -0.02363006 0.008062094 0.2460514 -0.4823216 0.4200583 0.5322489 0 0 0 0 0 0 +10.15798 -0.02413896 0.007725835 0.2458452 -0.4813842 0.4216473 0.5328615 0 0 0 0 0 0 +10.17395 -0.02456435 0.007439107 0.2455956 -0.4822323 0.4209761 0.5312928 0 0 0 0 0 0 +10.19096 -0.02474849 0.007356972 0.2455167 -0.4836826 0.4204168 0.5293747 0 0 0 0 0 0 +10.207 -0.02494615 0.007391006 0.2454747 -0.4847983 0.4206025 0.5279025 0 0 0 0 0 0 +10.224 -0.02498651 0.007285923 0.2455093 -0.4844654 0.4211575 0.5273529 0 0 0 0 0 0 +10.24012 -0.02493634 0.007157326 0.245565 -0.483576 0.4214906 0.5275691 0 0 0 0 0 0 +10.25702 -0.02483866 0.00704962 0.2456235 -0.4828439 0.4213746 0.5274689 0 0 0 0 0 0 +10.27325 -0.02468827 0.006819785 0.2456703 -0.4830012 0.4213758 0.5267987 0 0 0 0 0 0 +10.29006 -0.02452409 0.006527245 0.2457443 -0.4838236 0.4203701 0.5254088 0 0 0 0 0 0 +10.30639 -0.0244418 0.00630945 0.2458699 -0.4843224 0.419746 0.5245725 0 0 0 0 0 0 +10.32309 -0.02438943 0.006102711 0.2459696 -0.4845207 0.4196973 0.5243672 0 0 0 0 0 0 +10.33953 -0.02434243 0.006031305 0.2459604 -0.4840054 0.420031 0.5246379 0 0 0 0 0 0 +10.35612 -0.02433953 0.006032586 0.2459316 -0.4836981 0.4203093 0.5251074 0 0 0 0 0 0 +10.37265 -0.02429806 0.006129682 0.2458655 -0.4833046 0.4205739 0.5257388 0 0 0 0 0 0 +10.38922 -0.02430054 0.006297648 0.245775 -0.4837969 0.4204977 0.5252106 0 0 0 0 0 0 +10.40578 -0.02431636 0.006433815 0.2457108 -0.4844112 0.4204054 0.5250281 0 0 0 0 0 0 +10.42235 -0.02435343 0.006663918 0.2456261 -0.4848869 0.4203307 0.524872 0 0 0 0 0 0 +10.43891 -0.02440365 0.006931365 0.245505 -0.4856417 0.4205892 0.5244116 0 0 0 0 0 0 +10.45548 -0.02445341 0.007191658 0.2453851 -0.4863915 0.4208755 0.5239371 0 0 0 0 0 0 +10.47221 -0.02445339 0.007344753 0.2452502 -0.4862964 0.4204709 0.5242854 0 0 0 0 0 0 +10.48861 -0.02453782 0.007551938 0.2451843 -0.4866068 0.4203277 0.5244845 0 0 0 0 0 0 +10.50524 -0.02460982 0.007749617 0.2451118 -0.4868927 0.4201885 0.5246543 0 0 0 0 0 0 +10.52225 -0.02471195 0.007873833 0.2450805 -0.4876444 0.4202519 0.5245988 0 0 0 0 0 0 diff --git a/Assets/Record/Recorded/gesture/1.txt.meta b/Assets/Record/Recorded/gesture/1.txt.meta index 9ac59f9..4e0ee4e 100644 --- a/Assets/Record/Recorded/gesture/1.txt.meta +++ b/Assets/Record/Recorded/gesture/1.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 29a153f021d9ba640a2e1c50642a8ade -timeCreated: 1512568694 +timeCreated: 1513439369 licenseType: Free TextScriptImporter: externalObjects: {} diff --git a/Assets/Record/Recorded/gesture/2.txt b/Assets/Record/Recorded/gesture/2.txt index 3f6d708..1fa4501 100644 --- a/Assets/Record/Recorded/gesture/2.txt +++ b/Assets/Record/Recorded/gesture/2.txt @@ -1,32 +1,135 @@ Gesture: gesture; Author: user; Recorded: timestamp l_palm_pos_x l_palm_pos_y l_palm_pos_z r_palm_pos_x r_palm_pos_y r_palm_pos_z -13.8085 0 0 0 0 0 0 -13.8254 0 0 0 0 0 0 -13.84163 0 0 0 0 0 0 -13.8582 0 0 0 0 0 0 -13.87476 0 0 0 0 0 0 -13.89138 0 0 0 0 0 0 -13.9079 0 0 0 0 0 0 -13.9245 0 0 0 0 0 0 -13.94151 0 0 0 0 0 0 -13.95853 0 0 0 0 0 0 -13.97453 0 0 0 0 0 0 -13.99074 0 0 0 0 0 0 -14.00756 0 0 0 0 0 0 -14.02387 0 0 0 0 0 0 -14.04055 0 0 0 0 0 0 -14.057 0 0 0 0 0 0 -14.07357 0 0 0 0 0 0 -14.09013 0 0 0 0 0 0 -14.1067 0 0 0 0 0 0 -14.12327 0 0 0 0 0 0 -14.13983 0 0 0 0 0 0 -14.15658 0 0 0 0 0 0 -14.17297 0 0 0 0 0 0 -14.18959 0 0 0 0 0 0 -14.20664 0 0 0 0 0 0 -14.22266 0 0 0 0 0 0 -14.23966 0 0 0 0 0 0 -14.25909 0 0 0 0 0 0 -14.27567 0 0 0 0 0 0 -14.29222 0 0 0 0 0 0 +8.335104 -0.0117327 -0.002831608 0.2362472 -0.5239148 0.440441 0.4761149 0 0 0 0 0 0 +8.351527 -0.01173361 -0.002761424 0.2362288 -0.5239809 0.4403611 0.4760591 0 0 0 0 0 0 +8.368251 -0.01173379 -0.002830088 0.2362466 -0.5240141 0.4402403 0.4760155 0 0 0 0 0 0 +8.385167 -0.01173422 -0.002870411 0.2362569 -0.5240623 0.4401109 0.4759611 0 0 0 0 0 0 +8.401217 -0.01174609 -0.002872258 0.2362317 -0.5242275 0.4401864 0.4758735 0 0 0 0 0 0 +8.418187 -0.01175577 -0.002836913 0.2362166 -0.5241616 0.4401516 0.475994 0 0 0 0 0 0 +8.434347 -0.01176549 -0.002801538 0.2362015 -0.5240959 0.4401166 0.4761145 0 0 0 0 0 0 +8.451313 -0.01178064 -0.002734214 0.2361939 -0.5241071 0.4401245 0.476185 0 0 0 0 0 0 +8.467489 -0.01178669 -0.002714336 0.2362063 -0.5240384 0.4401591 0.4761834 0 0 0 0 0 0 +8.484363 -0.01179032 -0.002706081 0.2362242 -0.523957 0.4402032 0.4761573 0 0 0 0 0 0 +8.501385 -0.01179735 -0.002714932 0.236258 -0.523897 0.4402314 0.4761999 0 0 0 0 0 0 +8.517391 -0.01180355 -0.002720743 0.2362879 -0.5238361 0.4402611 0.47623 0 0 0 0 0 0 +8.533864 -0.01181758 -0.002709866 0.2363141 -0.5238124 0.4403508 0.4762167 0 0 0 0 0 0 +8.550396 -0.01183203 -0.002720952 0.2363369 -0.523797 0.4405157 0.4763409 0 0 0 0 0 0 +8.56739 -0.01184776 -0.00273338 0.2363613 -0.5237809 0.4406968 0.4764785 0 0 0 0 0 0 +8.583453 -0.01185919 -0.002750188 0.2364081 -0.5236347 0.4408257 0.4764963 0 0 0 0 0 0 +8.600492 -0.01187217 -0.002766401 0.2364506 -0.523518 0.440973 0.4765466 0 0 0 0 0 0 +8.617591 -0.01190492 -0.002775401 0.2364695 -0.5240266 0.4405968 0.4762784 0 0 0 0 0 0 +8.63315 -0.01191357 -0.002798587 0.2365181 -0.5238793 0.4407782 0.476342 0 0 0 0 0 0 +8.650595 -0.0119258 -0.002824277 0.2365725 -0.5237587 0.4409459 0.4763903 0 0 0 0 0 0 +8.666621 -0.0119229 -0.002827257 0.2366038 -0.5234547 0.4411403 0.4764335 0 0 0 0 0 0 +8.682858 -0.01192458 -0.002836704 0.2366398 -0.5232227 0.4413149 0.4764756 0 0 0 0 0 0 +8.699721 -0.01199217 -0.002854615 0.2368725 -0.5219102 0.4422785 0.4774553 0 0 0 0 0 0 +8.715984 -0.01202958 -0.002864093 0.2369812 -0.5194517 0.4435329 0.4786254 0 0 0 0 0 0 +8.732786 -0.01206635 -0.002874076 0.2370928 -0.5172624 0.4446703 0.4796845 0 0 0 0 0 0 +8.749125 -0.01197944 -0.002527922 0.2372925 -0.510258 0.448432 0.4806528 0 0 0 0 0 0 +8.765854 -0.01155063 -0.002944589 0.2376827 -0.497594 0.4511056 0.4848731 0 0 0 0 0 0 +8.782248 -0.01107126 -0.003445089 0.2381025 -0.483841 0.4536559 0.4894066 0 0 0 0 0 0 +8.798944 -0.0101608 -0.004030794 0.2385091 -0.466029 0.4590972 0.4952853 0 0 0 0 0 0 +8.815392 -0.008859413 -0.003902167 0.2388014 -0.4443547 0.4647132 0.4998339 0 0 0 0 0 0 +8.831986 -0.007233174 -0.003427118 0.2392605 -0.4224057 0.4696354 0.5065436 0 0 0 0 0 0 +8.848526 -0.00489344 -0.001402348 0.2396813 -0.4013987 0.4746518 0.5076383 0 0 0 0 0 0 +8.865096 -0.002041347 -0.000390023 0.2404467 -0.3739963 0.4748663 0.5018052 0 0 0 0 0 0 +8.882012 0.001152615 -0.001363128 0.2414585 -0.3556286 0.4764552 0.4842488 0 0 0 0 0 0 +8.899035 0.004532257 -0.003755718 0.2423341 -0.3340511 0.4822338 0.468009 0 0 0 0 0 0 +8.915014 0.008074562 -0.005613923 0.2429347 -0.314576 0.4925049 0.4509746 0 0 0 0 0 0 +8.932081 0.01139471 -0.007554501 0.2433573 -0.2852523 0.5023153 0.4397658 0 0 0 0 0 0 +8.948052 0.01477883 -0.009016186 0.243354 -0.2595818 0.5180776 0.4241498 0 0 0 0 0 0 +8.965074 0.01802134 -0.009824812 0.2434208 -0.2395007 0.5316714 0.4092098 0 0 0 0 0 0 +8.981071 0.02128289 -0.009306192 0.2435455 -0.2189555 0.5431016 0.4001485 0 0 0 0 0 0 +8.997614 0.02454069 -0.008623987 0.2432796 -0.2020343 0.5547017 0.3885663 0 0 0 0 0 0 +9.01548 0.02942936 -0.01100755 0.2444893 -0.1755443 0.5667692 0.3757099 0 0 0 0 0 0 +9.031249 0.03415949 -0.01264077 0.2453306 -0.1542082 0.5778459 0.3594428 0 0 0 0 0 0 +9.047325 0.03856847 -0.01788211 0.245103 -0.131219 0.5890007 0.3323667 0 0 0 0 0 0 +9.064116 0.0408958 -0.02390707 0.2442257 -0.1200872 0.5986961 0.3045602 0 0 0 0 0 0 +9.081174 0.04280347 -0.02877021 0.2435284 -0.0971271 0.6042451 0.2903855 0 0 0 0 0 0 +9.097169 0.04393119 -0.0339303 0.243271 -0.07492728 0.6056006 0.2557246 0 0 0 0 0 0 +9.11359 0.04501566 -0.0389756 0.2429539 -0.05534944 0.6074091 0.2235829 0 0 0 0 0 0 +9.130241 0.04597767 -0.04444709 0.2428903 -0.03514645 0.6103862 0.2031043 0 0 0 0 0 0 +9.146717 0.04603471 -0.0511021 0.2426495 -0.02025302 0.6130419 0.1776294 0 0 0 0 0 0 +9.163288 0.04382234 -0.0572827 0.2418314 -0.003197643 0.6095154 0.1580335 0 0 0 0 0 0 +9.180223 0.04203641 -0.06217013 0.2407305 0.01755645 0.6083366 0.1399171 0 0 0 0 0 0 +9.196415 0.04093423 -0.06669764 0.2400576 0.02471045 0.6095227 0.1289951 0 0 0 0 0 0 +9.213237 0.04040087 -0.07183753 0.2396913 0.04442364 0.6113715 0.1270957 0 0 0 0 0 0 +9.229556 0.0395962 -0.07774535 0.2394238 0.07445849 0.6137083 0.1053958 0 0 0 0 0 0 +9.246262 0.04038857 -0.08534876 0.2398358 0.1264773 0.6177652 0.07184719 0 0 0 0 0 0 +9.262682 0.04153616 -0.09219572 0.2397829 0.1776512 0.6155618 0.05480097 0 0 0 0 0 0 +9.279284 0.04283178 -0.09809278 0.2391658 0.2415659 0.6090528 0.05014908 0 0 0 0 0 0 +9.295824 0.04301018 -0.1005513 0.2389686 0.2795788 0.5938956 0.0392415 0 0 0 0 0 0 +9.312384 0.04239942 -0.1020618 0.2392245 0.2919941 0.5838266 0.02487479 0 0 0 0 0 0 +9.32932 0.04160379 -0.1048571 0.2399854 0.2862723 0.583648 0.01902349 0 0 0 0 0 0 +9.345518 0.04133128 -0.1062886 0.2401497 0.2944049 0.5797189 0.02152982 0 0 0 0 0 0 +9.362333 0.04121233 -0.1069865 0.2401011 0.3044813 0.5744942 0.02113247 0 0 0 0 0 0 +9.378656 0.04093881 -0.1076953 0.2401238 0.3111812 0.569731 0.01763162 0 0 0 0 0 0 +9.395386 0.04084389 -0.1082876 0.2402193 0.3174782 0.5651005 0.01885083 0 0 0 0 0 0 +9.412384 0.04094492 -0.1084671 0.2402978 0.3185734 0.5639788 0.02189124 0 0 0 0 0 0 +9.428396 0.04115953 -0.108355 0.2403815 0.3180398 0.5645257 0.02771047 0 0 0 0 0 0 +9.445596 0.04135553 -0.108208 0.2404947 0.3151532 0.5670304 0.03406914 0 0 0 0 0 0 +9.461494 0.0414726 -0.107763 0.2405443 0.3098727 0.5703028 0.0384327 0 0 0 0 0 0 +9.478504 0.04151811 -0.1073116 0.2405975 0.3052729 0.5736673 0.04554684 0 0 0 0 0 0 +9.494623 0.04186595 -0.1059862 0.2406721 0.3125208 0.5671895 0.05499027 0 0 0 0 0 0 +9.5115 0.04226707 -0.1041101 0.2408103 0.3047875 0.569006 0.06625921 0 0 0 0 0 0 +9.528542 0.0427452 -0.1024121 0.2409189 0.2817687 0.5894142 0.092402 0 0 0 0 0 0 +9.544544 0.0432154 -0.1005993 0.2410789 0.2650361 0.6010434 0.111671 0 0 0 0 0 0 +9.561534 0.04376226 -0.09731707 0.2411644 0.2419559 0.6102192 0.1286593 0 0 0 0 0 0 +9.577605 0.04383205 -0.09480593 0.2414296 0.2182871 0.6159362 0.1506827 0 0 0 0 0 0 +9.594545 0.0437767 -0.09228443 0.2414021 0.1885165 0.6282372 0.1697975 0 0 0 0 0 0 +9.610583 0.04395916 -0.08842918 0.2417035 0.1498275 0.6381945 0.1770232 0 0 0 0 0 0 +9.62758 0.0445608 -0.08198035 0.2422429 0.1006271 0.643841 0.196109 0 0 0 0 0 0 +9.643713 0.0444959 -0.07654978 0.2427723 0.07395716 0.6402416 0.1995995 0 0 0 0 0 0 +9.660617 0.04459513 -0.06998654 0.2434072 0.04760179 0.6348275 0.2048977 0 0 0 0 0 0 +9.676847 0.04459113 -0.06222785 0.2437302 0.01710118 0.627134 0.2068943 0 0 0 0 0 0 +9.693621 0.04512168 -0.05549274 0.2445501 0.003121328 0.6192858 0.2194095 0 0 0 0 0 0 +9.710002 0.04517727 -0.05014703 0.2453233 -0.007648339 0.614724 0.2313095 0 0 0 0 0 0 +9.726671 0.04522881 -0.04379848 0.2461618 -0.02677732 0.6124185 0.2543413 0 0 0 0 0 0 +9.743116 0.04495258 -0.03718325 0.2467476 -0.0546906 0.6076495 0.2862619 0 0 0 0 0 0 +9.759685 0.04412968 -0.03138182 0.2478895 -0.0779827 0.6028799 0.3228903 0 0 0 0 0 0 +9.776688 0.04342745 -0.0240916 0.2492622 -0.1092751 0.59772 0.3553329 0 0 0 0 0 0 +9.792813 0.04133713 -0.01992431 0.2495593 -0.1226078 0.5895371 0.3720483 0 0 0 0 0 0 +9.809705 0.03786065 -0.01557079 0.2501596 -0.1404413 0.5786697 0.3930401 0 0 0 0 0 0 +9.826698 0.03543337 -0.0119192 0.2505322 -0.1556047 0.5716543 0.4020036 0 0 0 0 0 0 +9.842535 0.03275563 -0.008085966 0.2506817 -0.164931 0.5662652 0.4011087 0 0 0 0 0 0 +9.859079 0.02978899 -0.006418258 0.2510045 -0.1804517 0.5600552 0.4100977 0 0 0 0 0 0 +9.875765 0.02544167 -0.007103503 0.2508384 -0.1925198 0.5523477 0.4248987 0 0 0 0 0 0 +9.892763 0.02085443 -0.008701116 0.2507246 -0.2097607 0.5378898 0.4400188 0 0 0 0 0 0 +9.908787 0.01639585 -0.008389175 0.2506545 -0.2307124 0.519536 0.4509734 0 0 0 0 0 0 +9.925353 0.01302679 -0.006866902 0.2503129 -0.2460183 0.5066118 0.458311 0 0 0 0 0 0 +9.941914 0.01020207 -0.003746301 0.2502609 -0.2657257 0.4936309 0.4680251 0 0 0 0 0 0 +9.958896 0.007108287 -0.0001608729 0.250331 -0.2813219 0.4828543 0.4848568 0 0 0 0 0 0 +9.975053 0.004105531 0.003739953 0.2506114 -0.3041826 0.4723031 0.4994708 0 0 0 0 0 0 +9.991805 0.001095646 0.005634725 0.2511529 -0.3254332 0.4609925 0.5134501 0 0 0 0 0 0 +10.00818 -0.00302676 0.006233275 0.2511668 -0.3487844 0.447594 0.5288706 0 0 0 0 0 0 +10.02475 -0.007088827 0.006736279 0.2504647 -0.3709557 0.4383657 0.5430504 0 0 0 0 0 0 +10.04132 -0.0105012 0.008082181 0.2495487 -0.3954623 0.4292923 0.5458407 0 0 0 0 0 0 +10.05788 -0.01391882 0.008458048 0.2478679 -0.4321799 0.4200373 0.5380629 0 0 0 0 0 0 +10.07489 -0.01685878 0.008523196 0.246742 -0.4556507 0.4163111 0.5357949 0 0 0 0 0 0 +10.09103 -0.01895327 0.00886777 0.2465058 -0.4715337 0.4150555 0.5302283 0 0 0 0 0 0 +10.10795 -0.02102022 0.008869261 0.2462344 -0.4841289 0.4138303 0.5270363 0 0 0 0 0 0 +10.12415 -0.02246883 0.008482367 0.2461816 -0.4850191 0.4168597 0.5296286 0 0 0 0 0 0 +10.14096 -0.02363006 0.008062094 0.2460514 -0.4823216 0.4200583 0.5322489 0 0 0 0 0 0 +10.15798 -0.02413896 0.007725835 0.2458452 -0.4813842 0.4216473 0.5328615 0 0 0 0 0 0 +10.17395 -0.02456435 0.007439107 0.2455956 -0.4822323 0.4209761 0.5312928 0 0 0 0 0 0 +10.19096 -0.02474849 0.007356972 0.2455167 -0.4836826 0.4204168 0.5293747 0 0 0 0 0 0 +10.207 -0.02494615 0.007391006 0.2454747 -0.4847983 0.4206025 0.5279025 0 0 0 0 0 0 +10.224 -0.02498651 0.007285923 0.2455093 -0.4844654 0.4211575 0.5273529 0 0 0 0 0 0 +10.24012 -0.02493634 0.007157326 0.245565 -0.483576 0.4214906 0.5275691 0 0 0 0 0 0 +10.25702 -0.02483866 0.00704962 0.2456235 -0.4828439 0.4213746 0.5274689 0 0 0 0 0 0 +10.27325 -0.02468827 0.006819785 0.2456703 -0.4830012 0.4213758 0.5267987 0 0 0 0 0 0 +10.29006 -0.02452409 0.006527245 0.2457443 -0.4838236 0.4203701 0.5254088 0 0 0 0 0 0 +10.30639 -0.0244418 0.00630945 0.2458699 -0.4843224 0.419746 0.5245725 0 0 0 0 0 0 +10.32309 -0.02438943 0.006102711 0.2459696 -0.4845207 0.4196973 0.5243672 0 0 0 0 0 0 +10.33953 -0.02434243 0.006031305 0.2459604 -0.4840054 0.420031 0.5246379 0 0 0 0 0 0 +10.35612 -0.02433953 0.006032586 0.2459316 -0.4836981 0.4203093 0.5251074 0 0 0 0 0 0 +10.37265 -0.02429806 0.006129682 0.2458655 -0.4833046 0.4205739 0.5257388 0 0 0 0 0 0 +10.38922 -0.02430054 0.006297648 0.245775 -0.4837969 0.4204977 0.5252106 0 0 0 0 0 0 +10.40578 -0.02431636 0.006433815 0.2457108 -0.4844112 0.4204054 0.5250281 0 0 0 0 0 0 +10.42235 -0.02435343 0.006663918 0.2456261 -0.4848869 0.4203307 0.524872 0 0 0 0 0 0 +10.43891 -0.02440365 0.006931365 0.245505 -0.4856417 0.4205892 0.5244116 0 0 0 0 0 0 +10.45548 -0.02445341 0.007191658 0.2453851 -0.4863915 0.4208755 0.5239371 0 0 0 0 0 0 +10.47221 -0.02445339 0.007344753 0.2452502 -0.4862964 0.4204709 0.5242854 0 0 0 0 0 0 +10.48861 -0.02453782 0.007551938 0.2451843 -0.4866068 0.4203277 0.5244845 0 0 0 0 0 0 +10.50524 -0.02460982 0.007749617 0.2451118 -0.4868927 0.4201885 0.5246543 0 0 0 0 0 0 +10.52225 -0.02471195 0.007873833 0.2450805 -0.4876444 0.4202519 0.5245988 0 0 0 0 0 0 diff --git a/Assets/Record/Recorded/gesture/2.txt.meta b/Assets/Record/Recorded/gesture/2.txt.meta index df718be..bdcf320 100644 --- a/Assets/Record/Recorded/gesture/2.txt.meta +++ b/Assets/Record/Recorded/gesture/2.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 306b38e3b743b5d41ae75140ce67e2ce -timeCreated: 1512568694 +timeCreated: 1513439369 licenseType: Free TextScriptImporter: externalObjects: {} diff --git a/Assets/Record/Recorded/gesture/3.txt b/Assets/Record/Recorded/gesture/3.txt index 1a1426b..1fa4501 100644 --- a/Assets/Record/Recorded/gesture/3.txt +++ b/Assets/Record/Recorded/gesture/3.txt @@ -1,21 +1,135 @@ Gesture: gesture; Author: user; Recorded: timestamp l_palm_pos_x l_palm_pos_y l_palm_pos_z r_palm_pos_x r_palm_pos_y r_palm_pos_z -5.578866 0 0 0 0 0 0 -5.59561 0 0 0 0 0 0 -5.611999 0 0 0 0 0 0 -5.62861 0 0 0 0 0 0 -5.645133 0 0 0 0 0 0 -5.661699 0 0 0 0 0 0 -5.678266 0 0 0 0 0 0 -5.694832 0 0 0 0 0 0 -5.71169 0 0 0 0 0 0 -5.727967 0 0 0 0 0 0 -5.744714 0 0 0 0 0 0 -5.761724 0 0 0 0 0 0 -5.777735 0 0 0 0 0 0 -5.794234 0 0 0 0 0 0 -5.810799 0 0 0 0 0 0 -5.827775 0 0 0 0 0 0 -5.843933 0 0 0 0 0 0 -5.8605 0 0 0 0 0 0 -5.877066 0 0 0 0 0 0 +8.335104 -0.0117327 -0.002831608 0.2362472 -0.5239148 0.440441 0.4761149 0 0 0 0 0 0 +8.351527 -0.01173361 -0.002761424 0.2362288 -0.5239809 0.4403611 0.4760591 0 0 0 0 0 0 +8.368251 -0.01173379 -0.002830088 0.2362466 -0.5240141 0.4402403 0.4760155 0 0 0 0 0 0 +8.385167 -0.01173422 -0.002870411 0.2362569 -0.5240623 0.4401109 0.4759611 0 0 0 0 0 0 +8.401217 -0.01174609 -0.002872258 0.2362317 -0.5242275 0.4401864 0.4758735 0 0 0 0 0 0 +8.418187 -0.01175577 -0.002836913 0.2362166 -0.5241616 0.4401516 0.475994 0 0 0 0 0 0 +8.434347 -0.01176549 -0.002801538 0.2362015 -0.5240959 0.4401166 0.4761145 0 0 0 0 0 0 +8.451313 -0.01178064 -0.002734214 0.2361939 -0.5241071 0.4401245 0.476185 0 0 0 0 0 0 +8.467489 -0.01178669 -0.002714336 0.2362063 -0.5240384 0.4401591 0.4761834 0 0 0 0 0 0 +8.484363 -0.01179032 -0.002706081 0.2362242 -0.523957 0.4402032 0.4761573 0 0 0 0 0 0 +8.501385 -0.01179735 -0.002714932 0.236258 -0.523897 0.4402314 0.4761999 0 0 0 0 0 0 +8.517391 -0.01180355 -0.002720743 0.2362879 -0.5238361 0.4402611 0.47623 0 0 0 0 0 0 +8.533864 -0.01181758 -0.002709866 0.2363141 -0.5238124 0.4403508 0.4762167 0 0 0 0 0 0 +8.550396 -0.01183203 -0.002720952 0.2363369 -0.523797 0.4405157 0.4763409 0 0 0 0 0 0 +8.56739 -0.01184776 -0.00273338 0.2363613 -0.5237809 0.4406968 0.4764785 0 0 0 0 0 0 +8.583453 -0.01185919 -0.002750188 0.2364081 -0.5236347 0.4408257 0.4764963 0 0 0 0 0 0 +8.600492 -0.01187217 -0.002766401 0.2364506 -0.523518 0.440973 0.4765466 0 0 0 0 0 0 +8.617591 -0.01190492 -0.002775401 0.2364695 -0.5240266 0.4405968 0.4762784 0 0 0 0 0 0 +8.63315 -0.01191357 -0.002798587 0.2365181 -0.5238793 0.4407782 0.476342 0 0 0 0 0 0 +8.650595 -0.0119258 -0.002824277 0.2365725 -0.5237587 0.4409459 0.4763903 0 0 0 0 0 0 +8.666621 -0.0119229 -0.002827257 0.2366038 -0.5234547 0.4411403 0.4764335 0 0 0 0 0 0 +8.682858 -0.01192458 -0.002836704 0.2366398 -0.5232227 0.4413149 0.4764756 0 0 0 0 0 0 +8.699721 -0.01199217 -0.002854615 0.2368725 -0.5219102 0.4422785 0.4774553 0 0 0 0 0 0 +8.715984 -0.01202958 -0.002864093 0.2369812 -0.5194517 0.4435329 0.4786254 0 0 0 0 0 0 +8.732786 -0.01206635 -0.002874076 0.2370928 -0.5172624 0.4446703 0.4796845 0 0 0 0 0 0 +8.749125 -0.01197944 -0.002527922 0.2372925 -0.510258 0.448432 0.4806528 0 0 0 0 0 0 +8.765854 -0.01155063 -0.002944589 0.2376827 -0.497594 0.4511056 0.4848731 0 0 0 0 0 0 +8.782248 -0.01107126 -0.003445089 0.2381025 -0.483841 0.4536559 0.4894066 0 0 0 0 0 0 +8.798944 -0.0101608 -0.004030794 0.2385091 -0.466029 0.4590972 0.4952853 0 0 0 0 0 0 +8.815392 -0.008859413 -0.003902167 0.2388014 -0.4443547 0.4647132 0.4998339 0 0 0 0 0 0 +8.831986 -0.007233174 -0.003427118 0.2392605 -0.4224057 0.4696354 0.5065436 0 0 0 0 0 0 +8.848526 -0.00489344 -0.001402348 0.2396813 -0.4013987 0.4746518 0.5076383 0 0 0 0 0 0 +8.865096 -0.002041347 -0.000390023 0.2404467 -0.3739963 0.4748663 0.5018052 0 0 0 0 0 0 +8.882012 0.001152615 -0.001363128 0.2414585 -0.3556286 0.4764552 0.4842488 0 0 0 0 0 0 +8.899035 0.004532257 -0.003755718 0.2423341 -0.3340511 0.4822338 0.468009 0 0 0 0 0 0 +8.915014 0.008074562 -0.005613923 0.2429347 -0.314576 0.4925049 0.4509746 0 0 0 0 0 0 +8.932081 0.01139471 -0.007554501 0.2433573 -0.2852523 0.5023153 0.4397658 0 0 0 0 0 0 +8.948052 0.01477883 -0.009016186 0.243354 -0.2595818 0.5180776 0.4241498 0 0 0 0 0 0 +8.965074 0.01802134 -0.009824812 0.2434208 -0.2395007 0.5316714 0.4092098 0 0 0 0 0 0 +8.981071 0.02128289 -0.009306192 0.2435455 -0.2189555 0.5431016 0.4001485 0 0 0 0 0 0 +8.997614 0.02454069 -0.008623987 0.2432796 -0.2020343 0.5547017 0.3885663 0 0 0 0 0 0 +9.01548 0.02942936 -0.01100755 0.2444893 -0.1755443 0.5667692 0.3757099 0 0 0 0 0 0 +9.031249 0.03415949 -0.01264077 0.2453306 -0.1542082 0.5778459 0.3594428 0 0 0 0 0 0 +9.047325 0.03856847 -0.01788211 0.245103 -0.131219 0.5890007 0.3323667 0 0 0 0 0 0 +9.064116 0.0408958 -0.02390707 0.2442257 -0.1200872 0.5986961 0.3045602 0 0 0 0 0 0 +9.081174 0.04280347 -0.02877021 0.2435284 -0.0971271 0.6042451 0.2903855 0 0 0 0 0 0 +9.097169 0.04393119 -0.0339303 0.243271 -0.07492728 0.6056006 0.2557246 0 0 0 0 0 0 +9.11359 0.04501566 -0.0389756 0.2429539 -0.05534944 0.6074091 0.2235829 0 0 0 0 0 0 +9.130241 0.04597767 -0.04444709 0.2428903 -0.03514645 0.6103862 0.2031043 0 0 0 0 0 0 +9.146717 0.04603471 -0.0511021 0.2426495 -0.02025302 0.6130419 0.1776294 0 0 0 0 0 0 +9.163288 0.04382234 -0.0572827 0.2418314 -0.003197643 0.6095154 0.1580335 0 0 0 0 0 0 +9.180223 0.04203641 -0.06217013 0.2407305 0.01755645 0.6083366 0.1399171 0 0 0 0 0 0 +9.196415 0.04093423 -0.06669764 0.2400576 0.02471045 0.6095227 0.1289951 0 0 0 0 0 0 +9.213237 0.04040087 -0.07183753 0.2396913 0.04442364 0.6113715 0.1270957 0 0 0 0 0 0 +9.229556 0.0395962 -0.07774535 0.2394238 0.07445849 0.6137083 0.1053958 0 0 0 0 0 0 +9.246262 0.04038857 -0.08534876 0.2398358 0.1264773 0.6177652 0.07184719 0 0 0 0 0 0 +9.262682 0.04153616 -0.09219572 0.2397829 0.1776512 0.6155618 0.05480097 0 0 0 0 0 0 +9.279284 0.04283178 -0.09809278 0.2391658 0.2415659 0.6090528 0.05014908 0 0 0 0 0 0 +9.295824 0.04301018 -0.1005513 0.2389686 0.2795788 0.5938956 0.0392415 0 0 0 0 0 0 +9.312384 0.04239942 -0.1020618 0.2392245 0.2919941 0.5838266 0.02487479 0 0 0 0 0 0 +9.32932 0.04160379 -0.1048571 0.2399854 0.2862723 0.583648 0.01902349 0 0 0 0 0 0 +9.345518 0.04133128 -0.1062886 0.2401497 0.2944049 0.5797189 0.02152982 0 0 0 0 0 0 +9.362333 0.04121233 -0.1069865 0.2401011 0.3044813 0.5744942 0.02113247 0 0 0 0 0 0 +9.378656 0.04093881 -0.1076953 0.2401238 0.3111812 0.569731 0.01763162 0 0 0 0 0 0 +9.395386 0.04084389 -0.1082876 0.2402193 0.3174782 0.5651005 0.01885083 0 0 0 0 0 0 +9.412384 0.04094492 -0.1084671 0.2402978 0.3185734 0.5639788 0.02189124 0 0 0 0 0 0 +9.428396 0.04115953 -0.108355 0.2403815 0.3180398 0.5645257 0.02771047 0 0 0 0 0 0 +9.445596 0.04135553 -0.108208 0.2404947 0.3151532 0.5670304 0.03406914 0 0 0 0 0 0 +9.461494 0.0414726 -0.107763 0.2405443 0.3098727 0.5703028 0.0384327 0 0 0 0 0 0 +9.478504 0.04151811 -0.1073116 0.2405975 0.3052729 0.5736673 0.04554684 0 0 0 0 0 0 +9.494623 0.04186595 -0.1059862 0.2406721 0.3125208 0.5671895 0.05499027 0 0 0 0 0 0 +9.5115 0.04226707 -0.1041101 0.2408103 0.3047875 0.569006 0.06625921 0 0 0 0 0 0 +9.528542 0.0427452 -0.1024121 0.2409189 0.2817687 0.5894142 0.092402 0 0 0 0 0 0 +9.544544 0.0432154 -0.1005993 0.2410789 0.2650361 0.6010434 0.111671 0 0 0 0 0 0 +9.561534 0.04376226 -0.09731707 0.2411644 0.2419559 0.6102192 0.1286593 0 0 0 0 0 0 +9.577605 0.04383205 -0.09480593 0.2414296 0.2182871 0.6159362 0.1506827 0 0 0 0 0 0 +9.594545 0.0437767 -0.09228443 0.2414021 0.1885165 0.6282372 0.1697975 0 0 0 0 0 0 +9.610583 0.04395916 -0.08842918 0.2417035 0.1498275 0.6381945 0.1770232 0 0 0 0 0 0 +9.62758 0.0445608 -0.08198035 0.2422429 0.1006271 0.643841 0.196109 0 0 0 0 0 0 +9.643713 0.0444959 -0.07654978 0.2427723 0.07395716 0.6402416 0.1995995 0 0 0 0 0 0 +9.660617 0.04459513 -0.06998654 0.2434072 0.04760179 0.6348275 0.2048977 0 0 0 0 0 0 +9.676847 0.04459113 -0.06222785 0.2437302 0.01710118 0.627134 0.2068943 0 0 0 0 0 0 +9.693621 0.04512168 -0.05549274 0.2445501 0.003121328 0.6192858 0.2194095 0 0 0 0 0 0 +9.710002 0.04517727 -0.05014703 0.2453233 -0.007648339 0.614724 0.2313095 0 0 0 0 0 0 +9.726671 0.04522881 -0.04379848 0.2461618 -0.02677732 0.6124185 0.2543413 0 0 0 0 0 0 +9.743116 0.04495258 -0.03718325 0.2467476 -0.0546906 0.6076495 0.2862619 0 0 0 0 0 0 +9.759685 0.04412968 -0.03138182 0.2478895 -0.0779827 0.6028799 0.3228903 0 0 0 0 0 0 +9.776688 0.04342745 -0.0240916 0.2492622 -0.1092751 0.59772 0.3553329 0 0 0 0 0 0 +9.792813 0.04133713 -0.01992431 0.2495593 -0.1226078 0.5895371 0.3720483 0 0 0 0 0 0 +9.809705 0.03786065 -0.01557079 0.2501596 -0.1404413 0.5786697 0.3930401 0 0 0 0 0 0 +9.826698 0.03543337 -0.0119192 0.2505322 -0.1556047 0.5716543 0.4020036 0 0 0 0 0 0 +9.842535 0.03275563 -0.008085966 0.2506817 -0.164931 0.5662652 0.4011087 0 0 0 0 0 0 +9.859079 0.02978899 -0.006418258 0.2510045 -0.1804517 0.5600552 0.4100977 0 0 0 0 0 0 +9.875765 0.02544167 -0.007103503 0.2508384 -0.1925198 0.5523477 0.4248987 0 0 0 0 0 0 +9.892763 0.02085443 -0.008701116 0.2507246 -0.2097607 0.5378898 0.4400188 0 0 0 0 0 0 +9.908787 0.01639585 -0.008389175 0.2506545 -0.2307124 0.519536 0.4509734 0 0 0 0 0 0 +9.925353 0.01302679 -0.006866902 0.2503129 -0.2460183 0.5066118 0.458311 0 0 0 0 0 0 +9.941914 0.01020207 -0.003746301 0.2502609 -0.2657257 0.4936309 0.4680251 0 0 0 0 0 0 +9.958896 0.007108287 -0.0001608729 0.250331 -0.2813219 0.4828543 0.4848568 0 0 0 0 0 0 +9.975053 0.004105531 0.003739953 0.2506114 -0.3041826 0.4723031 0.4994708 0 0 0 0 0 0 +9.991805 0.001095646 0.005634725 0.2511529 -0.3254332 0.4609925 0.5134501 0 0 0 0 0 0 +10.00818 -0.00302676 0.006233275 0.2511668 -0.3487844 0.447594 0.5288706 0 0 0 0 0 0 +10.02475 -0.007088827 0.006736279 0.2504647 -0.3709557 0.4383657 0.5430504 0 0 0 0 0 0 +10.04132 -0.0105012 0.008082181 0.2495487 -0.3954623 0.4292923 0.5458407 0 0 0 0 0 0 +10.05788 -0.01391882 0.008458048 0.2478679 -0.4321799 0.4200373 0.5380629 0 0 0 0 0 0 +10.07489 -0.01685878 0.008523196 0.246742 -0.4556507 0.4163111 0.5357949 0 0 0 0 0 0 +10.09103 -0.01895327 0.00886777 0.2465058 -0.4715337 0.4150555 0.5302283 0 0 0 0 0 0 +10.10795 -0.02102022 0.008869261 0.2462344 -0.4841289 0.4138303 0.5270363 0 0 0 0 0 0 +10.12415 -0.02246883 0.008482367 0.2461816 -0.4850191 0.4168597 0.5296286 0 0 0 0 0 0 +10.14096 -0.02363006 0.008062094 0.2460514 -0.4823216 0.4200583 0.5322489 0 0 0 0 0 0 +10.15798 -0.02413896 0.007725835 0.2458452 -0.4813842 0.4216473 0.5328615 0 0 0 0 0 0 +10.17395 -0.02456435 0.007439107 0.2455956 -0.4822323 0.4209761 0.5312928 0 0 0 0 0 0 +10.19096 -0.02474849 0.007356972 0.2455167 -0.4836826 0.4204168 0.5293747 0 0 0 0 0 0 +10.207 -0.02494615 0.007391006 0.2454747 -0.4847983 0.4206025 0.5279025 0 0 0 0 0 0 +10.224 -0.02498651 0.007285923 0.2455093 -0.4844654 0.4211575 0.5273529 0 0 0 0 0 0 +10.24012 -0.02493634 0.007157326 0.245565 -0.483576 0.4214906 0.5275691 0 0 0 0 0 0 +10.25702 -0.02483866 0.00704962 0.2456235 -0.4828439 0.4213746 0.5274689 0 0 0 0 0 0 +10.27325 -0.02468827 0.006819785 0.2456703 -0.4830012 0.4213758 0.5267987 0 0 0 0 0 0 +10.29006 -0.02452409 0.006527245 0.2457443 -0.4838236 0.4203701 0.5254088 0 0 0 0 0 0 +10.30639 -0.0244418 0.00630945 0.2458699 -0.4843224 0.419746 0.5245725 0 0 0 0 0 0 +10.32309 -0.02438943 0.006102711 0.2459696 -0.4845207 0.4196973 0.5243672 0 0 0 0 0 0 +10.33953 -0.02434243 0.006031305 0.2459604 -0.4840054 0.420031 0.5246379 0 0 0 0 0 0 +10.35612 -0.02433953 0.006032586 0.2459316 -0.4836981 0.4203093 0.5251074 0 0 0 0 0 0 +10.37265 -0.02429806 0.006129682 0.2458655 -0.4833046 0.4205739 0.5257388 0 0 0 0 0 0 +10.38922 -0.02430054 0.006297648 0.245775 -0.4837969 0.4204977 0.5252106 0 0 0 0 0 0 +10.40578 -0.02431636 0.006433815 0.2457108 -0.4844112 0.4204054 0.5250281 0 0 0 0 0 0 +10.42235 -0.02435343 0.006663918 0.2456261 -0.4848869 0.4203307 0.524872 0 0 0 0 0 0 +10.43891 -0.02440365 0.006931365 0.245505 -0.4856417 0.4205892 0.5244116 0 0 0 0 0 0 +10.45548 -0.02445341 0.007191658 0.2453851 -0.4863915 0.4208755 0.5239371 0 0 0 0 0 0 +10.47221 -0.02445339 0.007344753 0.2452502 -0.4862964 0.4204709 0.5242854 0 0 0 0 0 0 +10.48861 -0.02453782 0.007551938 0.2451843 -0.4866068 0.4203277 0.5244845 0 0 0 0 0 0 +10.50524 -0.02460982 0.007749617 0.2451118 -0.4868927 0.4201885 0.5246543 0 0 0 0 0 0 +10.52225 -0.02471195 0.007873833 0.2450805 -0.4876444 0.4202519 0.5245988 0 0 0 0 0 0 diff --git a/Assets/Record/Recorded/gesture/3.txt.meta b/Assets/Record/Recorded/gesture/3.txt.meta index 3fdd98a..1121f84 100644 --- a/Assets/Record/Recorded/gesture/3.txt.meta +++ b/Assets/Record/Recorded/gesture/3.txt.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4252a63cbe8a5b548a843bb15ccaae1e -timeCreated: 1512568694 +timeCreated: 1513439369 licenseType: Free TextScriptImporter: externalObjects: {} diff --git a/Assets/Replay/Replay.cs b/Assets/Replay/Replay.cs index 7f832e2..d36091b 100644 --- a/Assets/Replay/Replay.cs +++ b/Assets/Replay/Replay.cs @@ -9,6 +9,7 @@ public class Replay: MonoBehaviour public float rotationFactor = 2.0f; public GameObject handModel; public Dropdown dropdown; + public Text textFrame; Gesture gestureToReplay; int currentFrame = -1; @@ -52,7 +53,7 @@ public class Replay: MonoBehaviour { if (startReplay) { - if (currentFrame < gestureToReplay.states.Count - 2) + if (currentFrame < gestureToReplay.states.Count - 1) { //if replay not finished //compute criteria to go to the next frame @@ -77,6 +78,9 @@ public class Replay: MonoBehaviour handModel.transform.rotation = Quaternion.Euler (rot); lastTimestamp = Time.unscaledTime; + + //update UI + textFrame.text = "Frame: " + currentFrame; } } else diff --git a/Assets/Scenes/Replay.unity b/Assets/Scenes/Replay.unity index 6381837..aed2425 100644 --- a/Assets/Scenes/Replay.unity +++ b/Assets/Scenes/Replay.unity @@ -211,7 +211,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 512389760} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -530.5, y: 216.5, z: 0} + m_LocalPosition: {x: -407, y: 159, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 886768371} @@ -884,7 +884,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1475768281} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 523.5, y: 261, z: 0} + m_LocalPosition: {x: 400, y: 203.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 409326028} @@ -1074,12 +1074,13 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1487093060} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 634.5, y: 296.5, z: 0} + m_LocalPosition: {x: 511, y: 239, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1882596558} - {fileID: 512389761} - {fileID: 1475768282} + - {fileID: 2041325545} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1570,7 +1571,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1882596557} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -530.5, y: 261, z: 0} + m_LocalPosition: {x: -407, y: 203.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1741226554} @@ -1846,6 +1847,7 @@ MonoBehaviour: rotationFactor: 2 handModel: {fileID: 1805769538} dropdown: {fileID: 1882596559} + textFrame: {fileID: 2041325546} --- !u!4 &2026651520 Transform: m_ObjectHideFlags: 0 @@ -1859,6 +1861,80 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2041325544 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2041325545} + - component: {fileID: 2041325547} + - component: {fileID: 2041325546} + m_Layer: 5 + m_Name: TextFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2041325545 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2041325544} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -220, y: 203.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1487093064} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 291, y: -35.5} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2041325546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2041325544} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Frame: 0' +--- !u!222 &2041325547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2041325544} --- !u!1 &2108048836 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 74d7b53..d74737e 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,7 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8ddafc0..f38a8f4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,9 +3,10 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 productGUID: 4e569f17fa3fa4345806fb96197d737d AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 @@ -38,8 +39,6 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_SplashScreenBackgroundLandscape: {fileID: 0} - m_SplashScreenBackgroundPortrait: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 @@ -49,7 +48,6 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 - m_MobileMTRendering: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -64,8 +62,10 @@ PlayerSettings: useOSAutorotation: 1 use32BitDisplayBuffer: 1 disableDepthAndStencilBuffers: 0 + androidBlitType: 0 defaultIsFullScreen: 1 defaultIsNativeResolution: 1 + macRetinaSupport: 1 runInBackground: 0 captureSingleScreen: 0 muteOtherAudioSources: 0 @@ -95,6 +95,7 @@ PlayerSettings: xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 + metalFramebufferOnly: 0 n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 @@ -103,6 +104,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOnePresentImmediateThreshold: 0 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 @@ -134,12 +136,17 @@ PlayerSettings: daydream: depthFormat: 0 useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 hololens: depthFormat: 1 protectGraphicsMemory: 0 useHDRDisplay: 0 + m_ColorGamuts: 00000000 targetPixelDensity: 0 resolutionScalingMode: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 @@ -160,10 +167,10 @@ PlayerSettings: serializedVersion: 2 m_Bits: 238 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: + iOSTargetOSVersionString: 7.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: + tvOSTargetOSVersionString: 9.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -220,7 +227,9 @@ PlayerSettings: AndroidKeyaliasName: AndroidTVCompatibility: 1 AndroidIsGame: 1 + AndroidEnableTango: 0 androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 m_AndroidBanners: - width: 320 height: 180 @@ -231,10 +240,14 @@ PlayerSettings: m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] + m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 - webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + mobileMTRendering: + Android: 1 + iPhone: 1 + tvOS: 1 wiiUTitleID: 0005000011000000 wiiUGroupID: 00010000 wiiUCommonSaveSize: 4096 -- GitLab