diff --git a/Gaze.xcodeproj/project.pbxproj b/Gaze.xcodeproj/project.pbxproj index fd93e84..24a6364 100644 --- a/Gaze.xcodeproj/project.pbxproj +++ b/Gaze.xcodeproj/project.pbxproj @@ -334,7 +334,6 @@ ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; - ENFORCE_READY = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -357,7 +356,6 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TRACK_READY = YES; }; name = Debug; }; @@ -400,7 +398,6 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; - ENFORCE_READY = NO; GCC_C_LANGUAGE_STANDARD = gnu17; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -415,7 +412,6 @@ MTL_FAST_MATH = YES; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; - TRACK_READY = NO; }; name = Release; }; @@ -433,7 +429,6 @@ ENABLE_APP_SANDBOX = YES; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; - ENFORCE_READY = YES; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = Gaze/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Gaze; @@ -452,9 +447,9 @@ SWIFT_APPROACHABLE_CONCURRENCY = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; - TRACK_READY = YES; }; name = Debug; }; @@ -472,7 +467,6 @@ ENABLE_APP_SANDBOX = YES; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; - ENFORCE_READY = NO; GENERATE_INFOPLIST_FILE = NO; INFOPLIST_FILE = Gaze/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Gaze; @@ -491,9 +485,9 @@ SWIFT_APPROACHABLE_CONCURRENCY = YES; SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor; SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_TREAT_WARNINGS_AS_ERRORS = YES; SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 5.0; - TRACK_READY = NO; }; name = Release; }; diff --git a/Gaze/Animations/posture.json b/Gaze/Animations/posture.json index 5e6b9d2..a1f1ec5 100644 --- a/Gaze/Animations/posture.json +++ b/Gaze/Animations/posture.json @@ -5,7 +5,7 @@ "op": 180, "w": 300, "h": 300, - "nm": "Posture Correction - Side View", + "nm": "Posture 3 - Arrow Up", "ddd": 0, "assets": [], "layers": [ @@ -13,15 +13,31 @@ "ddd": 0, "ind": 1, "ty": 4, - "nm": "Head", - "parent": 2, + "nm": "Arrow", "sr": 1, "ks": { "o": { "a": 0, "k": 100 }, "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, -38, 0] }, + "p": { + "a": 1, + "k": [ + { "t": 0, "s": [150, 180, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, + { "t": 40, "s": [150, 120, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, + { "t": 80, "s": [150, 140, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, + { "t": 120, "s": [150, 120, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, + { "t": 160, "s": [150, 140, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, + { "t": 180, "s": [150, 130, 0] } + ] + }, "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } + "s": { + "a": 1, + "k": [ + { "t": 0, "s": [80, 80, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, + { "t": 40, "s": [100, 100, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, + { "t": 180, "s": [100, 100, 100] } + ] + } }, "ao": 0, "shapes": [ @@ -29,16 +45,23 @@ "ty": "gr", "it": [ { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [36, 36] }, - "nm": "Head" + "ty": "sh", + "ks": { + "a": 0, + "k": { + "i": [[0, 0], [0, 0], [0, 0]], + "o": [[0, 0], [0, 0], [0, 0]], + "v": [[-40, 30], [0, -30], [40, 30]], + "c": false + } + }, + "nm": "Arrow Head" }, { "ty": "st", "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, + "w": { "a": 0, "k": 12 }, "lc": 2, "lj": 2, "nm": "Stroke" @@ -52,7 +75,43 @@ "o": { "a": 0, "k": 100 } } ], - "nm": "Head Shape" + "nm": "Arrow Head Shape" + }, + { + "ty": "gr", + "it": [ + { + "ty": "sh", + "ks": { + "a": 0, + "k": { + "i": [[0, 0], [0, 0]], + "o": [[0, 0], [0, 0]], + "v": [[0, -20], [0, 70]], + "c": false + } + }, + "nm": "Arrow Stem" + }, + { + "ty": "st", + "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, + "o": { "a": 0, "k": 100 }, + "w": { "a": 0, "k": 12 }, + "lc": 2, + "lj": 2, + "nm": "Stroke" + }, + { + "ty": "tr", + "p": { "a": 0, "k": [0, 0] }, + "a": { "a": 0, "k": [0, 0] }, + "s": { "a": 0, "k": [100, 100] }, + "r": { "a": 0, "k": 0 }, + "o": { "a": 0, "k": 100 } + } + ], + "nm": "Arrow Stem Shape" } ], "ip": 0, @@ -64,22 +123,29 @@ "ddd": 0, "ind": 2, "ty": 4, - "nm": "Neck", - "parent": 3, + "nm": "Circle Pulse 1", "sr": 1, "ks": { - "o": { "a": 0, "k": 100 }, - "r": { + "o": { "a": 1, "k": [ - { "t": 0, "s": [30], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 70, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, + { "t": 30, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, + { "t": 50, "s": [60], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, + { "t": 100, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, { "t": 180, "s": [0] } ] }, - "p": { "a": 0, "k": [0, -50, 0] }, - "a": { "a": 0, "k": [0, 20, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } + "r": { "a": 0, "k": 0 }, + "p": { "a": 0, "k": [150, 130, 0] }, + "a": { "a": 0, "k": [0, 0, 0] }, + "s": { + "a": 1, + "k": [ + { "t": 30, "s": [50, 50, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, + { "t": 100, "s": [150, 150, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, + { "t": 180, "s": [150, 150, 100] } + ] + } }, "ao": 0, "shapes": [ @@ -87,23 +153,16 @@ "ty": "gr", "it": [ { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, -20], [0, 20]], - "c": false - } - }, - "nm": "Neck Path" + "ty": "el", + "p": { "a": 0, "k": [0, 0] }, + "s": { "a": 0, "k": [120, 120] }, + "nm": "Circle" }, { "ty": "st", "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, + "w": { "a": 0, "k": 4 }, "lc": 2, "lj": 2, "nm": "Stroke" @@ -117,7 +176,7 @@ "o": { "a": 0, "k": 100 } } ], - "nm": "Neck Shape" + "nm": "Circle Shape" } ], "ip": 0, @@ -129,288 +188,29 @@ "ddd": 0, "ind": 3, "ty": 4, - "nm": "Torso", - "parent": 7, + "nm": "Circle Pulse 2", "sr": 1, "ks": { - "o": { "a": 0, "k": 100 }, - "r": { + "o": { "a": 1, "k": [ - { "t": 0, "s": [25], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 70, "s": [-5], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 180, "s": [-5] } + { "t": 90, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, + { "t": 110, "s": [60], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, + { "t": 160, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, + { "t": 180, "s": [0] } ] }, - "p": { "a": 0, "k": [0, 0, 0] }, - "a": { "a": 0, "k": [0, 50, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, -50], [0, 50]], - "c": false - } - }, - "nm": "Torso Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Torso Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 4, - "ty": 4, - "nm": "Upper Arm", - "parent": 3, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { - "a": 1, - "k": [ - { "t": 0, "s": [40], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 70, "s": [70], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 180, "s": [70] } - ] - }, - "p": { "a": 0, "k": [0, -40, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [0, 35]], - "c": false - } - }, - "nm": "Upper Arm Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Upper Arm Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 5, - "ty": 4, - "nm": "Forearm", - "parent": 4, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { - "a": 1, - "k": [ - { "t": 0, "s": [-80], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 70, "s": [-110], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 180, "s": [-110] } - ] - }, - "p": { "a": 0, "k": [0, 35, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [0, 30]], - "c": false - } - }, - "nm": "Forearm Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Forearm Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 6, - "ty": 4, - "nm": "Thigh", - "parent": 7, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 90 }, - "p": { "a": 0, "k": [0, 0, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [0, 50]], - "c": false - } - }, - "nm": "Thigh Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Thigh Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 7, - "ty": 4, - "nm": "Hip (Root)", - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [150, 200, 0] }, + "p": { "a": 0, "k": [150, 130, 0] }, "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 8, - "ty": 4, - "nm": "Lower Leg", - "parent": 6, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": -90 }, - "p": { "a": 0, "k": [0, 50, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } + "s": { + "a": 1, + "k": [ + { "t": 90, "s": [50, 50, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, + { "t": 160, "s": [150, 150, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, + { "t": 180, "s": [150, 150, 100] } + ] + } }, "ao": 0, "shapes": [ @@ -418,23 +218,16 @@ "ty": "gr", "it": [ { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [0, 45]], - "c": false - } - }, - "nm": "Lower Leg Path" + "ty": "el", + "p": { "a": 0, "k": [0, 0] }, + "s": { "a": 0, "k": [120, 120] }, + "nm": "Circle" }, { "ty": "st", "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, + "w": { "a": 0, "k": 4 }, "lc": 2, "lj": 2, "nm": "Stroke" @@ -448,107 +241,7 @@ "o": { "a": 0, "k": 100 } } ], - "nm": "Lower Leg Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 9, - "ty": 4, - "nm": "Chair Seat", - "sr": 1, - "ks": { - "o": { "a": 0, "k": 50 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [125, 208, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "rc", - "d": 1, - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [70, 8] }, - "r": { "a": 0, "k": 4 }, - "nm": "Seat" - }, - { - "ty": "fl", - "c": { "a": 0, "k": [0.5, 0.5, 0.5, 1] }, - "o": { "a": 0, "k": 100 }, - "r": 1, - "nm": "Fill" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Seat Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 10, - "ty": 4, - "nm": "Chair Back", - "sr": 1, - "ks": { - "o": { "a": 0, "k": 50 }, - "r": { "a": 0, "k": -5 }, - "p": { "a": 0, "k": [92, 160, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "rc", - "d": 1, - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [8, 90] }, - "r": { "a": 0, "k": 4 }, - "nm": "Back" - }, - { - "ty": "fl", - "c": { "a": 0, "k": [0.5, 0.5, 0.5, 1] }, - "o": { "a": 0, "k": 100 }, - "r": 1, - "nm": "Fill" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Back Shape" + "nm": "Circle Shape" } ], "ip": 0, diff --git a/Gaze/Animations/posture2.json b/Gaze/Animations/posture2.json deleted file mode 100644 index ecb803f..0000000 --- a/Gaze/Animations/posture2.json +++ /dev/null @@ -1,345 +0,0 @@ -{ - "v": "5.7.4", - "fr": 60, - "ip": 0, - "op": 180, - "w": 300, - "h": 300, - "nm": "Posture 2 - Spine Only", - "ddd": 0, - "assets": [], - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "Head", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, -25, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [40, 40] }, - "nm": "Head" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 8 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Head Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 2, - "ty": 4, - "nm": "Spine Curve", - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [150, 150, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 1, - "k": [ - { - "t": 0, - "s": [{ - "i": [[0, 0], [20, 0], [25, 0], [0, 0]], - "o": [[0, 0], [-20, 0], [-25, 0], [0, 0]], - "v": [[40, -80], [50, -30], [45, 40], [0, 90]], - "c": false - }], - "i": { "x": 0.3, "y": 1 }, - "o": { "x": 0.7, "y": 0 } - }, - { - "t": 70, - "s": [{ - "i": [[0, 0], [0, 0], [0, 0], [0, 0]], - "o": [[0, 0], [0, 0], [0, 0], [0, 0]], - "v": [[0, -80], [0, -30], [0, 40], [0, 90]], - "c": false - }], - "i": { "x": 0.3, "y": 1 }, - "o": { "x": 0.7, "y": 0 } - }, - { - "t": 180, - "s": [{ - "i": [[0, 0], [0, 0], [0, 0], [0, 0]], - "o": [[0, 0], [0, 0], [0, 0], [0, 0]], - "v": [[0, -80], [0, -30], [0, 40], [0, 90]], - "c": false - }] - } - ] - }, - "nm": "Spine Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 8 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Spine Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 3, - "ty": 4, - "nm": "Vertebrae 1", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, 10, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [14, 14] }, - "nm": "Dot" - }, - { - "ty": "fl", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "r": 1, - "nm": "Fill" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Vertebra" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 4, - "ty": 4, - "nm": "Vertebrae 2", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, 45, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [14, 14] }, - "nm": "Dot" - }, - { - "ty": "fl", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "r": 1, - "nm": "Fill" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Vertebra" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 5, - "ty": 4, - "nm": "Vertebrae 3", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, 80, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [14, 14] }, - "nm": "Dot" - }, - { - "ty": "fl", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "r": 1, - "nm": "Fill" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Vertebra" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 6, - "ty": 4, - "nm": "Vertebrae 4", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, 115, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [14, 14] }, - "nm": "Dot" - }, - { - "ty": "fl", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "r": 1, - "nm": "Fill" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Vertebra" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - } - ], - "markers": [] -} diff --git a/Gaze/Animations/posture3.json b/Gaze/Animations/posture3.json deleted file mode 100644 index a1f1ec5..0000000 --- a/Gaze/Animations/posture3.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "v": "5.7.4", - "fr": 60, - "ip": 0, - "op": 180, - "w": 300, - "h": 300, - "nm": "Posture 3 - Arrow Up", - "ddd": 0, - "assets": [], - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "Arrow", - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { - "a": 1, - "k": [ - { "t": 0, "s": [150, 180, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 40, "s": [150, 120, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 80, "s": [150, 140, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 120, "s": [150, 120, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 160, "s": [150, 140, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 180, "s": [150, 130, 0] } - ] - }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { - "a": 1, - "k": [ - { "t": 0, "s": [80, 80, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 40, "s": [100, 100, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 180, "s": [100, 100, 100] } - ] - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0], [0, 0]], - "o": [[0, 0], [0, 0], [0, 0]], - "v": [[-40, 30], [0, -30], [40, 30]], - "c": false - } - }, - "nm": "Arrow Head" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 12 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Arrow Head Shape" - }, - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, -20], [0, 70]], - "c": false - } - }, - "nm": "Arrow Stem" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 12 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Arrow Stem Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 2, - "ty": 4, - "nm": "Circle Pulse 1", - "sr": 1, - "ks": { - "o": { - "a": 1, - "k": [ - { "t": 30, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 50, "s": [60], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 100, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 180, "s": [0] } - ] - }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [150, 130, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { - "a": 1, - "k": [ - { "t": 30, "s": [50, 50, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 100, "s": [150, 150, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 180, "s": [150, 150, 100] } - ] - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [120, 120] }, - "nm": "Circle" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 4 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Circle Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 3, - "ty": 4, - "nm": "Circle Pulse 2", - "sr": 1, - "ks": { - "o": { - "a": 1, - "k": [ - { "t": 90, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 110, "s": [60], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 160, "s": [0], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 180, "s": [0] } - ] - }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [150, 130, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { - "a": 1, - "k": [ - { "t": 90, "s": [50, 50, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 160, "s": [150, 150, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 180, "s": [150, 150, 100] } - ] - } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [120, 120] }, - "nm": "Circle" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 4 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Circle Shape" - } - ], - "ip": 0, - "op": 180, - "st": 0, - "bm": 0 - } - ], - "markers": [] -} diff --git a/Gaze/Animations/posture4.json b/Gaze/Animations/posture4.json deleted file mode 100644 index cb12c06..0000000 --- a/Gaze/Animations/posture4.json +++ /dev/null @@ -1,407 +0,0 @@ -{ - "v": "5.7.4", - "fr": 60, - "ip": 0, - "op": 150, - "w": 300, - "h": 300, - "nm": "Posture 4 - Shoulders Back Launch", - "ddd": 0, - "assets": [], - "layers": [ - { - "ddd": 0, - "ind": 1, - "ty": 4, - "nm": "Head", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, -55, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "el", - "p": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [50, 50] }, - "nm": "Head" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Head Shape" - } - ], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 2, - "ty": 4, - "nm": "Torso", - "parent": 7, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { "a": 0, "k": [0, 0, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, -30], [0, 80]], - "c": false - } - }, - "nm": "Torso Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Torso Shape" - } - ], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 3, - "ty": 4, - "nm": "Left Shoulder", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { - "a": 1, - "k": [ - { "t": 0, "s": [30], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 50, "s": [-20], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 150, "s": [-20] } - ] - }, - "p": { "a": 0, "k": [-5, -20, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [-50, 20]], - "c": false - } - }, - "nm": "Shoulder Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Shoulder Shape" - } - ], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 4, - "ty": 4, - "nm": "Right Shoulder", - "parent": 2, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { - "a": 1, - "k": [ - { "t": 0, "s": [-30], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 50, "s": [20], "i": { "x": [0.3], "y": [1] }, "o": { "x": [0.7], "y": [0] } }, - { "t": 150, "s": [20] } - ] - }, - "p": { "a": 0, "k": [5, -20, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [50, 20]], - "c": false - } - }, - "nm": "Shoulder Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Shoulder Shape" - } - ], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 5, - "ty": 4, - "nm": "Left Leg", - "parent": 7, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": -20 }, - "p": { "a": 0, "k": [-5, 80, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [0, 50]], - "c": false - } - }, - "nm": "Leg Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Leg Shape" - } - ], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 6, - "ty": 4, - "nm": "Right Leg", - "parent": 7, - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 20 }, - "p": { "a": 0, "k": [5, 80, 0] }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { "a": 0, "k": [100, 100, 100] } - }, - "ao": 0, - "shapes": [ - { - "ty": "gr", - "it": [ - { - "ty": "sh", - "ks": { - "a": 0, - "k": { - "i": [[0, 0], [0, 0]], - "o": [[0, 0], [0, 0]], - "v": [[0, 0], [0, 50]], - "c": false - } - }, - "nm": "Leg Path" - }, - { - "ty": "st", - "c": { "a": 0, "k": [0.298, 0.686, 0.314, 1] }, - "o": { "a": 0, "k": 100 }, - "w": { "a": 0, "k": 6 }, - "lc": 2, - "lj": 2, - "nm": "Stroke" - }, - { - "ty": "tr", - "p": { "a": 0, "k": [0, 0] }, - "a": { "a": 0, "k": [0, 0] }, - "s": { "a": 0, "k": [100, 100] }, - "r": { "a": 0, "k": 0 }, - "o": { "a": 0, "k": 100 } - } - ], - "nm": "Leg Shape" - } - ], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - }, - { - "ddd": 0, - "ind": 7, - "ty": 4, - "nm": "Root", - "sr": 1, - "ks": { - "o": { "a": 0, "k": 100 }, - "r": { "a": 0, "k": 0 }, - "p": { - "a": 1, - "k": [ - { "t": 0, "s": [150, 150, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 50, "s": [150, 150, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 70, "s": [150, 160, 0], "i": { "x": 0.1, "y": 1 }, "o": { "x": 0.5, "y": 0 } }, - { "t": 120, "s": [150, -200, 0], "i": { "x": 0.3, "y": 1 }, "o": { "x": 0.7, "y": 0 } }, - { "t": 150, "s": [150, -200, 0] } - ] - }, - "a": { "a": 0, "k": [0, 0, 0] }, - "s": { - "a": 1, - "k": [ - { "t": 0, "s": [100, 100, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 50, "s": [100, 100, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 70, "s": [110, 90, 100], "i": { "x": [0.1, 0.1, 0.1], "y": [1, 1, 1] }, "o": { "x": [0.5, 0.5, 0.5], "y": [0, 0, 0] } }, - { "t": 120, "s": [60, 60, 100], "i": { "x": [0.3, 0.3, 0.3], "y": [1, 1, 1] }, "o": { "x": [0.7, 0.7, 0.7], "y": [0, 0, 0] } }, - { "t": 150, "s": [60, 60, 100] } - ] - } - }, - "ao": 0, - "shapes": [], - "ip": 0, - "op": 150, - "st": 0, - "bm": 0 - } - ], - "markers": [] -} diff --git a/Gaze/Models/AnimationAsset.swift b/Gaze/Models/AnimationAsset.swift index d7690c8..91779d5 100644 --- a/Gaze/Models/AnimationAsset.swift +++ b/Gaze/Models/AnimationAsset.swift @@ -10,7 +10,7 @@ import Foundation enum AnimationAsset: String { case blink = "blink" case lookAway = "look-away" - case posture = "posture4" + case posture = "posture" case ring = "ring" var fileName: String { diff --git a/Gaze/Models/SettingsSection.swift b/Gaze/Models/SettingsSection.swift index f5cfd3b..7257294 100644 --- a/Gaze/Models/SettingsSection.swift +++ b/Gaze/Models/SettingsSection.swift @@ -13,7 +13,7 @@ enum SettingsSection: Int, CaseIterable, Identifiable { case blink = 2 case posture = 3 case userTimers = 4 - #if ENFORCE_READY + #if DEBUG case enforceMode = 5 #endif case smartMode = 6 @@ -26,7 +26,7 @@ enum SettingsSection: Int, CaseIterable, Identifiable { case .lookAway: return "Look Away" case .blink: return "Blink" case .posture: return "Posture" - #if ENFORCE_READY + #if DEBUG case .enforceMode: return "Enforce Mode" #endif case .userTimers: return "User Timers" @@ -40,7 +40,7 @@ enum SettingsSection: Int, CaseIterable, Identifiable { case .lookAway: return "eye.fill" case .blink: return "eye.circle.fill" case .posture: return "figure.stand" - #if ENFORCE_READY + #if DEBUG case .enforceMode: return "video.fill" #endif case .userTimers: return "plus.circle" diff --git a/Gaze/Views/Containers/AdditionalModifiersView.swift b/Gaze/Views/Containers/AdditionalModifiersView.swift index 26b0077..a3e2839 100644 --- a/Gaze/Views/Containers/AdditionalModifiersView.swift +++ b/Gaze/Views/Containers/AdditionalModifiersView.swift @@ -39,7 +39,7 @@ struct AdditionalModifiersView: View { .font(isCompact ? .subheadline : .title3) .foregroundStyle(.secondary) .multilineTextAlignment(.center) - #if !ENFORCE_READY + #if !DEBUG Text("More to come soon") .font(isCompact ? .subheadline : .title3) .foregroundStyle(.secondary) @@ -49,7 +49,7 @@ struct AdditionalModifiersView: View { Spacer() ZStack { - #if ENFORCE_READY + #if DEBUG cardView(for: 0, width: cardWidth, height: cardHeight) .zIndex(zIndex(for: 0)) .scaleEffect(scale(for: 0)) @@ -65,7 +65,7 @@ struct AdditionalModifiersView: View { Spacer() - #if ENFORCE_READY + #if DEBUG HStack(spacing: isCompact ? 12 : 20) { Button(action: { swapCards() }) { Image(systemName: "chevron.left") @@ -375,7 +375,7 @@ struct AdditionalModifiersView: View { isOn: $settingsManager.settings.smartMode.autoPauseOnIdle ) - #if TRACK_READY + #if DEBUG smartModeToggle( icon: "chart.line.uptrend.xyaxis", iconColor: .green, diff --git a/Gaze/Views/Setup/SmartModeSetupView.swift b/Gaze/Views/Setup/SmartModeSetupView.swift index 425cb4d..14f9d14 100644 --- a/Gaze/Views/Setup/SmartModeSetupView.swift +++ b/Gaze/Views/Setup/SmartModeSetupView.swift @@ -25,7 +25,7 @@ struct SmartModeSetupView: View { VStack(spacing: 24) { fullscreenSection idleSection - #if TRACK_READY + #if DEBUG usageTrackingSection #endif }