diff --git a/live2d/emotions/defaults.json b/live2d/emotions/_defaults.json similarity index 100% rename from live2d/emotions/defaults.json rename to live2d/emotions/_defaults.json diff --git a/live2d/emotions/grief.json b/live2d/emotions/grief.json new file mode 100644 index 0000000..4edaa16 --- /dev/null +++ b/live2d/emotions/grief.json @@ -0,0 +1,48 @@ +{ + "grief": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": -0.484, + "iris_rotation_y_index": -0.01100000000000001, + "head_x_index": -1.0, + "head_y_index": 0.0, + "neck_z_index": 0.0, + "body_y_index": 0.0, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/grief.png b/live2d/emotions/grief.png new file mode 100644 index 0000000..3ed29f3 Binary files /dev/null and b/live2d/emotions/grief.png differ diff --git a/live2d/emotions/joy.json b/live2d/emotions/joy.json new file mode 100644 index 0000000..c762085 --- /dev/null +++ b/live2d/emotions/joy.json @@ -0,0 +1,48 @@ +{ + "joy": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 1.0, + "eyebrow_happy_right_index": 1.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 1.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.1160000000000001, + "iris_rotation_y_index": -0.01100000000000001, + "head_x_index": -0.263, + "head_y_index": -0.02100000000000002, + "neck_z_index": -0.02100000000000002, + "body_y_index": 0.0, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/joy.png b/live2d/emotions/joy.png new file mode 100644 index 0000000..8f4734f Binary files /dev/null and b/live2d/emotions/joy.png differ diff --git a/live2d/emotions/love.json b/live2d/emotions/love.json new file mode 100644 index 0000000..5863307 --- /dev/null +++ b/live2d/emotions/love.json @@ -0,0 +1,48 @@ +{ + "love": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.4, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.0, + "iris_rotation_y_index": 0.0, + "head_x_index": 0.0, + "head_y_index": 0.0, + "neck_z_index": -0.389, + "body_y_index": 0.0, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/love.png b/live2d/emotions/love.png new file mode 100644 index 0000000..c6f41ff Binary files /dev/null and b/live2d/emotions/love.png differ diff --git a/live2d/emotions/nervousness.json b/live2d/emotions/nervousness.json new file mode 100644 index 0000000..e180ecd --- /dev/null +++ b/live2d/emotions/nervousness.json @@ -0,0 +1,48 @@ +{ + "nervousness": { + "eyebrow_troubled_left_index": 1.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.4, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.0, + "iris_rotation_y_index": 0.0, + "head_x_index": 0.0, + "head_y_index": 0.0, + "neck_z_index": -0.389, + "body_y_index": 0.0, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/nervousness.png b/live2d/emotions/nervousness.png new file mode 100644 index 0000000..4872032 Binary files /dev/null and b/live2d/emotions/nervousness.png differ diff --git a/live2d/emotions/neutral.json b/live2d/emotions/neutral.json new file mode 100644 index 0000000..aaecf60 --- /dev/null +++ b/live2d/emotions/neutral.json @@ -0,0 +1,48 @@ +{ + "neutral": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.0, + "iris_rotation_y_index": 0.0, + "head_x_index": 0.0, + "head_y_index": 0.0, + "neck_z_index": 0.0, + "body_y_index": 0.0, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/neutral.png b/live2d/emotions/neutral.png new file mode 100644 index 0000000..532ad44 Binary files /dev/null and b/live2d/emotions/neutral.png differ diff --git a/live2d/emotions/optimism.json b/live2d/emotions/optimism.json new file mode 100644 index 0000000..dd6a12d --- /dev/null +++ b/live2d/emotions/optimism.json @@ -0,0 +1,48 @@ +{ + "optimism": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.216, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.0, + "iris_rotation_y_index": 0.0, + "head_x_index": 0.0, + "head_y_index": 0.0, + "neck_z_index": 0.0, + "body_y_index": 0.0, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/optimism.png b/live2d/emotions/optimism.png new file mode 100644 index 0000000..29a4e55 Binary files /dev/null and b/live2d/emotions/optimism.png differ diff --git a/live2d/emotions/pride.json b/live2d/emotions/pride.json new file mode 100644 index 0000000..1313da0 --- /dev/null +++ b/live2d/emotions/pride.json @@ -0,0 +1,48 @@ +{ + "pride": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.2945, + "eye_wink_right_index": 0.3, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.5735, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.0, + "iris_rotation_y_index": 0.0, + "head_x_index": 0.0, + "head_y_index": 0.0, + "neck_z_index": 0.0, + "body_y_index": 0.010999999999999899, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/pride.png b/live2d/emotions/pride.png new file mode 100644 index 0000000..fb7cccd Binary files /dev/null and b/live2d/emotions/pride.png differ diff --git a/live2d/emotions/realization.json b/live2d/emotions/realization.json new file mode 100644 index 0000000..c889af9 --- /dev/null +++ b/live2d/emotions/realization.json @@ -0,0 +1,48 @@ +{ + "realization": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 0.9, + "eyebrow_raised_right_index": 0.9, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.2945, + "eye_surprised_right_index": 0.3, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.5735, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": -0.23199999999999998, + "iris_rotation_y_index": -0.15800000000000003, + "head_x_index": 0.31600000000000006, + "head_y_index": 0.821, + "neck_z_index": -0.516, + "body_y_index": 0.010999999999999899, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/realization.png b/live2d/emotions/realization.png new file mode 100644 index 0000000..e9cf2d4 Binary files /dev/null and b/live2d/emotions/realization.png differ diff --git a/live2d/emotions/relief.json b/live2d/emotions/relief.json new file mode 100644 index 0000000..80c362d --- /dev/null +++ b/live2d/emotions/relief.json @@ -0,0 +1,48 @@ +{ + "relief": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.9, + "eyebrow_lowered_right_index": 0.9, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.0, + "iris_small_right_index": 0.0, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.121, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 0.0, + "mouth_lowered_corner_right_index": 0.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": -0.23199999999999998, + "iris_rotation_y_index": -0.15800000000000003, + "head_x_index": -0.347, + "head_y_index": 0.020999999999999908, + "neck_z_index": 0.020999999999999908, + "body_y_index": 0.010999999999999899, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/relief.png b/live2d/emotions/relief.png new file mode 100644 index 0000000..ac558e4 Binary files /dev/null and b/live2d/emotions/relief.png differ diff --git a/live2d/emotions/remorse.json b/live2d/emotions/remorse.json new file mode 100644 index 0000000..22953f7 --- /dev/null +++ b/live2d/emotions/remorse.json @@ -0,0 +1,48 @@ +{ + "remorse": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.9, + "eyebrow_lowered_right_index": 0.9, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.284, + "iris_small_right_index": 0.3105, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 1.0, + "mouth_lowered_corner_right_index": 1.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": 0.04200000000000004, + "iris_rotation_y_index": 0.020999999999999908, + "head_x_index": -0.347, + "head_y_index": 0.020999999999999908, + "neck_z_index": 0.020999999999999908, + "body_y_index": 0.010999999999999899, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/remorse.png b/live2d/emotions/remorse.png new file mode 100644 index 0000000..c00b215 Binary files /dev/null and b/live2d/emotions/remorse.png differ diff --git a/live2d/emotions/sadness.json b/live2d/emotions/sadness.json new file mode 100644 index 0000000..9f48692 --- /dev/null +++ b/live2d/emotions/sadness.json @@ -0,0 +1,48 @@ +{ + "sadness": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.9, + "eyebrow_lowered_right_index": 0.9, + "eyebrow_raised_left_index": 0.0, + "eyebrow_raised_right_index": 0.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 0.0, + "eye_surprised_right_index": 0.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.6265, + "iris_small_right_index": 0.563, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 1.0, + "mouth_lowered_corner_right_index": 1.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": -0.558, + "iris_rotation_y_index": 0.579, + "head_x_index": -1.0, + "head_y_index": 0.020999999999999908, + "neck_z_index": 0.020999999999999908, + "body_y_index": 0.010999999999999899, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/sadness.png b/live2d/emotions/sadness.png new file mode 100644 index 0000000..c826bfa Binary files /dev/null and b/live2d/emotions/sadness.png differ diff --git a/live2d/emotions/surprise.json b/live2d/emotions/surprise.json new file mode 100644 index 0000000..4368ed3 --- /dev/null +++ b/live2d/emotions/surprise.json @@ -0,0 +1,48 @@ +{ + "surprise": { + "eyebrow_troubled_left_index": 0.0, + "eyebrow_troubled_right_index": 0.0, + "eyebrow_angry_left_index": 0.0, + "eyebrow_angry_right_index": 0.0, + "eyebrow_lowered_left_index": 0.0, + "eyebrow_lowered_right_index": 0.0, + "eyebrow_raised_left_index": 1.0, + "eyebrow_raised_right_index": 1.0, + "eyebrow_happy_left_index": 0.0, + "eyebrow_happy_right_index": 0.0, + "eyebrow_serious_left_index": 0.0, + "eyebrow_serious_right_index": 0.0, + "eye_wink_left_index": 0.0, + "eye_wink_right_index": 0.0, + "eye_happy_wink_left_index": 0.0, + "eye_happy_wink_right_index": 0.0, + "eye_surprised_left_index": 1.0, + "eye_surprised_right_index": 1.0, + "eye_relaxed_left_index": 0.0, + "eye_relaxed_right_index": 0.0, + "eye_unimpressed": 0.0, + "eye_raised_lower_eyelid_left_index": 0.0, + "eye_raised_lower_eyelid_right_index": 0.0, + "iris_small_left_index": 0.6265, + "iris_small_right_index": 0.563, + "mouth_aaa_index": 0.0, + "mouth_iii_index": 0.0, + "mouth_uuu_index": 0.0, + "mouth_eee_index": 0.0, + "mouth_ooo_index": 0.0, + "mouth_delta": 0.0, + "mouth_lowered_corner_left_index": 1.0, + "mouth_lowered_corner_right_index": 1.0, + "mouth_raised_corner_left_index": 0.0, + "mouth_raised_corner_right_index": 0.0, + "mouth_smirk": 0.0, + "iris_rotation_x_index": -0.21099999999999997, + "iris_rotation_y_index": -0.02100000000000002, + "head_x_index": 1.0, + "head_y_index": 1.0, + "neck_z_index": 0.020999999999999908, + "body_y_index": 0.010999999999999899, + "body_z_index": 0.0, + "breathing_index": 0.0 + } +} \ No newline at end of file diff --git a/live2d/emotions/surprise.png b/live2d/emotions/surprise.png new file mode 100644 index 0000000..03c8bcc Binary files /dev/null and b/live2d/emotions/surprise.png differ diff --git a/live2d/tha3/app/app.py b/live2d/tha3/app/app.py index ea4deb9..27da6dd 100644 --- a/live2d/tha3/app/app.py +++ b/live2d/tha3/app/app.py @@ -38,7 +38,7 @@ global_reload = None is_talking_override = False is_talking = False global_timer_paused = False -emotion = "joy" +emotion = "neutral" fps = 0 current_pose = None storepath = os.path.join(os.getcwd(), "live2d", "emotions") @@ -313,14 +313,13 @@ class MainFrame(wx.Frame): def get_emotion_values(self, emotion): # Place to define emotion presets global storepath - - - + #print(emotion) file_path = os.path.join(storepath, emotion + ".json") + #print("trying: ", file_path) if not os.path.exists(file_path): print("using backup") - file_path = os.path.join(storepath, "defaults.json") + file_path = os.path.join(storepath, "_defaults.json") with open(file_path, 'r') as json_file: @@ -774,33 +773,32 @@ class MainFrame(wx.Frame): #current_posesaved = self.pose_converter.convert(ifacialmocap_pose) #combined_posesaved = current_posesaved - #NEW METHOD - ifacialmocap_pose = self.animationMain() #CREATES THE DEFAULT POSE AND STORES OBJ IN STRING + #NEW METHOD + #CREATES THE DEFAULT POSE AND STORES OBJ IN STRING + ifacialmocap_pose = self.animationMain() #GET EMOTION SETTING emotion_pose = self.get_emotion_values(emotion) - #print("emotion_pose: ", emotion_pose) #MERGE EMOTION SETTING WITH CURRENT OUTPUT updated_pose = self.update_ifacualmocap_pose(ifacialmocap_pose, emotion_pose) - #print("updated_pose: ", updated_pose) #CONVERT RESULT TO FORMAT NN CAN USE current_pose = self.pose_converter.convert(updated_pose) - #print("current_pose: ", current_pose) - - - #SEND THROUGH CONVERT current_pose = self.pose_converter.convert(ifacialmocap_pose) - + #ADD LABELS/NAMES TO THE POSE names_current_pose = MainFrame.addNamestoConvert(current_pose) - adjusted_pose = self.get_emotion_values(emotion) # APPLY EMOTION VALUES + + #GET THE EMOTION VALUES + adjusted_pose = self.get_emotion_values(emotion) + + #APPLY VALUES TO THE POSE tranisitiondPose = self.animateToEmotion(names_current_pose, adjusted_pose) - + #reformate the data correctly parsed_data = [] for item in tranisitiondPose: key, value_str = item.split(': ') @@ -808,14 +806,13 @@ class MainFrame(wx.Frame): parsed_data.append((key, value)) tranisitiondPosenew = [value for _, value in parsed_data] + #Set the pose for future updates ifacialmocap_pose = tranisitiondPosenew - combined_pose = tranisitiondPosenew #print("current_pose", current_pose[12]) #print("tranisitiondPosenew ", tranisitiondPosenew[12]) - if self.torch_source_image is None: dc = wx.MemoryDC() dc.SelectObject(self.result_image_bitmap) @@ -823,7 +820,7 @@ class MainFrame(wx.Frame): del dc return - pose = torch.tensor(combined_pose, device=self.device, dtype=self.poser.get_dtype()) + pose = torch.tensor(tranisitiondPosenew, device=self.device, dtype=self.poser.get_dtype()) with torch.no_grad(): output_image = self.poser.pose(self.torch_source_image, pose)[0].float()