diff --git a/src/components/Lain/Lain.tsx b/src/components/Lain/Lain.tsx index be475c4..c3892ce 100644 --- a/src/components/Lain/Lain.tsx +++ b/src/components/Lain/Lain.tsx @@ -127,7 +127,7 @@ const Lain = () => { loading...}> {lainMoving ? lainMoveState : } diff --git a/src/components/Level.tsx b/src/components/Level.tsx index 908cef3..af436c0 100644 --- a/src/components/Level.tsx +++ b/src/components/Level.tsx @@ -11,8 +11,8 @@ type LevelProps = { const Level = (props: LevelProps) => { return ( - - + + ); diff --git a/src/components/MainScene/CameraAtom.tsx b/src/components/MainScene/CameraAtom.tsx index aa1e960..a5ea86a 100644 --- a/src/components/MainScene/CameraAtom.tsx +++ b/src/components/MainScene/CameraAtom.tsx @@ -1,10 +1,5 @@ import { atom } from "recoil"; -// export const camPosYAtom = atom({ -// key: "camPosYAtom", -// default: 0, -// }); -// export const camRotYAtom = atom({ key: "camRotYAtom", default: 0, @@ -15,7 +10,3 @@ export const camPosYAtom = atom({ default: 0, }); -// export const camRotYAtom = atom({ -// key: "camRotYAtom", -// default: 0, -// }); diff --git a/src/resources/blue_orb_positions.json b/src/resources/blue_orb_positions.json index cad856b..3825207 100644 --- a/src/resources/blue_orb_positions.json +++ b/src/resources/blue_orb_positions.json @@ -1,105 +1,106 @@ { - "05": { - "position": [0.4, -0.35, 1.1], + "21": { + "position": [0.45, 0.33, 1.1], "rotation": [0, 0.35, 0] }, "13": { - "position": [0.4, 0, 1.1], + "position": [0.45, 0, 1.1], "rotation": [0, 0.35, 0] }, - "21": { - "position": [0.4, 0.35, 1.1], + "05": { + "position": [0.45, -0.33, 1.1], "rotation": [0, 0.35, 0] }, - "14": { - "position": [-0.49, 0, 1.12], - "rotation": [0, -0.37, 0] - }, "22": { "position": [-0.49, 0.33, 1.12], "rotation": [0, -0.37, 0] }, + "14": { + "position": [-0.49, 0, 1.12], + "rotation": [0, -0.37, 0] + }, "06": { "position": [-0.49, -0.33, 1.12], "rotation": [0, -0.37, 0] }, - "07": { - "position": [-1.15, -0.3, 0.72], - "rotation": [0, -1, 0] + "23": { + "position": [-1.15, 0.33, 0.45], + "rotation": [0, -1.17, 0] }, "15": { - "position": [-1.15, 0, 0.72], - "rotation": [0, -1, 0] + "position": [-1.15, 0, 0.45], + "rotation": [0, -1.17, 0] }, - "23": { - "position": [-1.15, 0.3, 0.72], - "rotation": [0, -1, 0] + "07": { + "position": [-1.15, -0.33, 0.45], + "rotation": [0, -1.17, 0] }, - "08": { - "position": [-1.3, 0, 0.3], - "rotation": [0, -1.4, 0] - }, "16": { - "position": [-1.3, 0.3, 0.3], - "rotation": [0, -1.4, 0] + "position": [-1.145, 0.33, -0.5], + "rotation": [0, -1.95, 0] + }, + "08": { + "position": [-1.145, 0, -0.5], + "rotation": [0, -1.95, 0] }, "00": { - "position": [-1.3, -0.25, 0.3], - "rotation": [0, -1.4, 0] - }, - "18": { - "position": [-0.85, 0.3, -1.05], - "rotation": [0, -2.45, 0] - }, - "10": { - "position": [-0.85, 0, -1.05], - "rotation": [0, -2.45, 0] - }, - "02": { - "position": [-0.85, -0.25, -1.05], - "rotation": [0, -2.45, 0] + "position": [-1.145, -0.33, -0.5], + "rotation": [0, -1.95, 0] }, "17": { - "position": [-1.25, 0.3, -0.5], - "rotation": [0, -1.85, 0] + "position": [-0.5, 0.33, -1.15], + "rotation": [0, -2.75, 0] }, "09": { - "position": [-1.25, 0, -0.5], - "rotation": [0, -1.85, 0] + "position": [-0.5, 0, -1.15], + "rotation": [0, -2.75, 0] }, "01": { - "position": [-1.25, -0.25, -0.5], - "rotation": [0, -1.85, 0] + "position": [-0.5, -0.33, -1.15], + "rotation": [0, -2.75, 0] + }, + + "18": { + "position": [0.45, 0.33, -1.15], + "rotation": [0, -3.55, 0] + }, + "10": { + "position": [0.45, 0, -1.15], + "rotation": [0, -3.55, 0] + }, + "02": { + "position": [0.45, -0.33, -1.15], + "rotation": [0, -3.55, 0] + }, + + "19": { + "position": [1.15, 0.33, -0.45], + "rotation": [0, -4.35, 0] + }, + "11": { + "position": [1.15, 0, -0.45], + "rotation": [0, -4.35, 0] + }, + "03": { + "position": [1.15, -0.33, -0.45], + "rotation": [0, -4.35, 0] }, "20": { - "position": [1, 0.3, 0.9], - "rotation": [0, 0.69, 0] + "position": [1.15, 0.33, 0.45], + "rotation": [0, 1.2, 0] }, "12": { - "position": [1, 0, 0.9], - "rotation": [0, 0.69, 0] + "position": [1.15, 0, 0.45], + "rotation": [0, 1.2, 0] }, "04": { - "position": [1, -0.25, 0.9], - "rotation": [0, 0.69, 0] - }, - - "03": { - "position": [-0.15, -0.25, -1.3], - "rotation": [0, -2.45, 0] - }, - "11": { - "position": [-0.15, 0, -1.3], - "rotation": [0, -2.45, 0] - }, - "19": { - "position": [-0.15, 0.3, -1.3], - "rotation": [0, -2.45, 0] + "position": [1.15, -0.33, 0.45], + "rotation": [0, 1.2, 0] }, "?": {