bluebey-studio: 目メニューを再編し、閉じ目にもまぶたを効かせる

閉じ目を眼球の中身として上まぶた・下まぶたで隠せるようにした。まぶた設定を「まぶた」グループに、ハートの色を目の形の直下に、瞳と形の大きさを「大きさ」に統合。こまかい設定は解体し、横位置・手描きは個別の箱に分けた。

1 files changed, 7 insertions, 7 deletions

diff --git a/public/bluebey-studio/src/presets.js b/public/bluebey-studio/src/presets.js
index ca8f048..a8b10ec 100644
--- a/public/bluebey-studio/src/presets.js
+++ b/public/bluebey-studio/src/presets.js
@@ -200,8 +200,8 @@ export function defaultState() {
       eyes: {
         source: 'parametric',    // parametric | opened | closed | ... (hand-drawn)
         linked: true,            // move both eyes together
-        left: { open: 1, lookX: 0, lookY: 0, eyeX: 0, closed: 'line', closedLines: 1, irisShape: 'circle', threeFlip: false, tear: 0.3, tearOn: false, tearY: 0, tearX: 0, tearTilt: 0, white: null, highlight: null, shapeScale: 1, lowerLid: null },
-        right: { open: 1, lookX: 0, lookY: 0, eyeX: 0, closed: 'line', closedLines: 1, irisShape: 'circle', threeFlip: false, tear: 0.3, tearOn: false, tearY: 0, tearX: 0, tearTilt: 0, white: null, highlight: null, shapeScale: 1, lowerLid: null },
+        left: { shape: 'open', open: 1, lookX: 0, lookY: 0, eyeX: 0, closed: 'line', closedLines: 1, irisShape: 'circle', threeFlip: false, tear: 0.3, tearOn: false, tearY: 0, tearX: 0, tearTilt: 0, white: null, highlight: null, shapeScale: 1, lowerLid: null },
+        right: { shape: 'open', open: 1, lookX: 0, lookY: 0, eyeX: 0, closed: 'line', closedLines: 1, irisShape: 'circle', threeFlip: false, tear: 0.3, tearOn: false, tearY: 0, tearX: 0, tearTilt: 0, white: null, highlight: null, shapeScale: 1, lowerLid: null },
         irisScale: 1,
         lookMax: 1.2,
         highlight: true,
@@ -407,8 +407,8 @@ export const FACE_PRESETS = [
     label: 'にっこり',
     face: {
       eyes: {
-        left: { open: 0, lookX: 0, lookY: 0, closed: 'arch' },
-        right: { open: 0, lookX: 0, lookY: 0, closed: 'arch' },
+        left: { shape: 'arch', open: 1, lookX: 0, lookY: 0, closed: 'arch' },
+        right: { shape: 'arch', open: 1, lookX: 0, lookY: 0, closed: 'arch' },
         highlight: false,
       },
       // A laugh is a wide smile with squeezed-shut eyes. An *open* mouth on a
@@ -437,7 +437,7 @@ export const FACE_PRESETS = [
       eyes: {
         // The shut eye is the original `eyes-close-tight` artwork: three strokes
         // sharing one vertex, pointing at the nose.
-        left: { open: 0, lookX: 0, lookY: 0, closed: 'line', closedLines: 3 },
+        left: { shape: 'line3', open: 1, lookX: 0, lookY: 0, closed: 'line', closedLines: 3 },
         right: { open: 1, lookX: 0, lookY: 0, closed: 'line', closedLines: 1 },
         irisScale: 1,
         highlight: true,
@@ -513,8 +513,8 @@ export const FACE_PRESETS = [
     label: 'すき',
     face: {
       eyes: {
-        left: { open: 1, lookX: -0.1, lookY: -0.3, closed: 'line', irisShape: 'heart', white: false },
-        right: { open: 1, lookX: 0.1, lookY: -0.3, closed: 'line', irisShape: 'heart', white: false },
+        left: { shape: 'heart', open: 1, lookX: -0.1, lookY: -0.3, closed: 'line', irisShape: 'heart', white: false },
+        right: { shape: 'heart', open: 1, lookX: 0.1, lookY: -0.3, closed: 'line', irisShape: 'heart', white: false },
         irisScale: 1,
         // The white behind a heart would poke out around its lobes, so hide it.
         heartColor: '#e0344f',