From c9b81581d0b3d83a24440b1a7643a09b390c3f67 Mon Sep 17 00:00:00 2001
From: ics-sawada-h <haruka.sawada@ics-web.jp>
Date: Fri, 23 Aug 2024 19:32:24 +0900
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=BB=A2=E5=BA=A6=E5=90=88=E3=81=84?=
 =?UTF-8?q?=E3=81=8C=E3=82=8F=E3=81=8B=E3=82=8A=E3=82=84=E3=81=99=E3=81=8F?=
 =?UTF-8?q?=E3=81=AA=E3=82=8B=E3=82=88=E3=81=86=E3=83=97=E3=83=AD=E3=83=91?=
 =?UTF-8?q?=E3=83=86=E3=82=A3=E3=81=AE=E5=80=A4=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...nimationProject.theatre-project-state.json | 30 ++++++-------------
 src/multiple-animation/main.js                | 16 +++++-----
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/assets/MultipleAnimationProject.theatre-project-state.json b/src/assets/MultipleAnimationProject.theatre-project-state.json
index b811893..4841d71 100644
--- a/src/assets/MultipleAnimationProject.theatre-project-state.json
+++ b/src/assets/MultipleAnimationProject.theatre-project-state.json
@@ -99,7 +99,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": -2
+                    "value": -1
                   },
                   {
                     "id": "uG3Q9aZe4E",
@@ -113,19 +113,6 @@
                     ],
                     "type": "bezier",
                     "value": 0
-                  },
-                  {
-                    "id": "pexKV_qg-n",
-                    "position": 2,
-                    "connectedRight": true,
-                    "handles": [
-                      0.5,
-                      1,
-                      0.5,
-                      0
-                    ],
-                    "type": "bezier",
-                    "value": 0
                   }
                 ]
               },
@@ -202,7 +189,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": 4
+                    "value": 2
                   },
                   {
                     "id": "njNXWkmj48",
@@ -215,7 +202,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": 4
+                    "value": 2
                   },
                   {
                     "id": "0JDDjHwwK_",
@@ -228,7 +215,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": 5.5
+                    "value": 2.75
                   }
                 ]
               },
@@ -260,7 +247,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": -0.27848101265822783
+                    "value": -0.139
                   },
                   {
                     "id": "BFVtLG3d0n",
@@ -273,7 +260,7 @@
                       -0.02
                     ],
                     "type": "bezier",
-                    "value": -0.27848101265822783
+                    "value": -0.139
                   },
                   {
                     "id": "EAhPMZoH5q",
@@ -286,7 +273,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": -0.5
+                    "value": -0.25
                   }
                 ]
               },
@@ -1764,7 +1751,7 @@
                       0
                     ],
                     "type": "bezier",
-                    "value": -1.72
+                    "value": -0.86
                   }
                 ]
               }
@@ -1865,6 +1852,7 @@
   },
   "definitionVersion": "0.4.0",
   "revisionHistory": [
+    "55nBwzuhxGE92wKj",
     "cuiNsTpzVE9K6MTV",
     "N0LTynzKmgTeiF7Z",
     "pCYik0kypfye7Lmu",
diff --git a/src/multiple-animation/main.js b/src/multiple-animation/main.js
index 741c286..4fd714a 100644
--- a/src/multiple-animation/main.js
+++ b/src/multiple-animation/main.js
@@ -136,9 +136,9 @@ scene.add(textGroup);
 // GUIから入力ができるよう変更させる回転を定義
 const textObjProps = {
   rotation: types.compound({
-    x: types.number(0, { range: [-2, 2] }), // −360 〜 360度 の想定
-    y: types.number(0, { range: [-2, 2] }),
-    z: types.number(0, { range: [-2, 2] }),
+    x: types.number(0, { range: [-1, 1] }), // −1回転 〜 1回転 の想定
+    y: types.number(0, { range: [-1, 1] }),
+    z: types.number(0, { range: [-1, 1] }),
   }),
   position: types.compound({
     px: types.number(0, { range: [-100, 100] }),
@@ -175,7 +175,7 @@ text2Obj.onValuesChange((values) => {
 const textGroupObj = scrollAnimSheet.object("TextGroup", textObjProps);
 textGroupObj.onValuesChange((values) => {
   const { x, y, z } = values.rotation;
-  textGroup.rotation.set(x * Math.PI, y * Math.PI, z * Math.PI);
+  textGroup.rotation.set(x * 2 * Math.PI, y * 2 * Math.PI, z * 2 * Math.PI);
   const { px, py, pz } = values.position;
   textGroup.position.set(px, py, pz);
 });
@@ -204,9 +204,9 @@ scene.add(cube); // Three.jsのシーンに追加
 // GUIから入力できるよう、変更させたいプロパティを定義
 const cubeObj = kvSheet.object("Cube", {
   rotation: types.compound({
-    x: types.number(cube.rotation.x, { range: [-2, 2] }),
-    y: types.number(cube.rotation.y, { range: [-2, 10] }),
-    z: types.number(cube.rotation.z, { range: [-2, 2] }),
+    x: types.number(cube.rotation.x, { range: [-1, 1] }),
+    y: types.number(cube.rotation.y, { range: [-1, 5] }),
+    z: types.number(cube.rotation.z, { range: [-1, 1] }),
   }),
   position: types.compound({
     px: types.number(cube.position.x, { range: [-100, 100] }),
@@ -224,7 +224,7 @@ const cubeObj = kvSheet.object("Cube", {
 // GUIからの入力をオブジェクトに反映
 cubeObj.onValuesChange((values) => {
   const { x, y, z } = values.rotation;
-  cube.rotation.set(x * Math.PI, y * Math.PI, z * Math.PI);
+  cube.rotation.set(x * 2 * Math.PI, y * 2 * Math.PI, z * 2 * Math.PI);
   const { px, py, pz } = values.position;
   cube.position.set(px, py, pz);
   const { sx, sy, sz } = values.scale;