gaesup-world 0.1.2 → 0.1.4

package/dist/gaesup/camera/control/normal.d.ts

@@ -1,2 +1,4 @@
 import { cameraPropType } from "../../physics/type";
+import { activeStateType, cameraOptionType } from "../../world/context/type";
+export declare const makeNormalCameraPosition: (activeState: activeStateType, cameraOption: cameraOptionType) => import("three").Vector3;
 export default function normal(prop: cameraPropType): void;

package/dist/gaesup/camera/control/normal.js

@@ -1,11 +1,18 @@
 import { V3 } from "../../utils/vector";
+export var makeNormalCameraPosition = function (activeState, cameraOption) {
+    var YDistance = cameraOption.YDistance, ZDistance = cameraOption.ZDistance;
+    var cameraPosition = activeState.position
+        .clone()
+        .add(V3(0, YDistance, ZDistance));
+    return cameraPosition;
+};
 export default function normal(prop) {
     var state = prop.state, _a = prop.worldContext, activeState = _a.activeState, cameraOption = _a.cameraOption;
     if (!state || !state.camera)
         return;
     var cameraPosition = activeState.position
         .clone()
-        .add(V3(0, cameraOption.YDistance, cameraOption.XZDistance));
+        .add(V3(0, cameraOption.YDistance, cameraOption.ZDistance));
     state.camera.position.lerp(cameraPosition, 1);
     state.camera.lookAt(activeState.position.clone());
 }

package/dist/gaesup/camera/control/orbit.d.ts

@@ -1,4 +1,4 @@
 import { cameraPropType } from "../../physics/type";
 import { activeStateType, cameraOptionType } from "../../world/context/type";
-export declare const makeCameraPosition: (activeState: activeStateType, cameraOption: cameraOptionType) => import("three").Vector3;
+export declare const makeOrbitCameraPosition: (activeState: activeStateType, cameraOption: cameraOptionType) => import("three").Vector3;
 export default function orbit(prop: cameraPropType): void;

package/dist/gaesup/camera/control/orbit.js

@@ -1,6 +1,6 @@
 import { quat } from "@react-three/rapier";
 import { V3 } from "../../utils/vector";
-export var makeCameraPosition = function (activeState, cameraOption) {
+export var makeOrbitCameraPosition = function (activeState, cameraOption) {
     var XDistance = cameraOption.XDistance, YDistance = cameraOption.YDistance, ZDistance = cameraOption.ZDistance;
     var cameraPosition = activeState.position.clone().add(V3(Math.sin(activeState.euler.y), 1, Math.cos(activeState.euler.y))
         .normalize()
@@ -12,10 +12,11 @@ export default function orbit(prop) {
     var state = prop.state, _a = prop.worldContext, activeState = _a.activeState, cameraOption = _a.cameraOption;
     if (!state || !state.camera)
         return;
-    var cameraPosition = makeCameraPosition(activeState, cameraOption);
+    var cameraPosition = makeOrbitCameraPosition(activeState, cameraOption);
     state.camera.position.lerp(cameraPosition, 1);
     state.camera.quaternion.copy(activeState.quat
         .clone()
         .multiply(quat().setFromAxisAngle(V3(0, 1, 0), Math.PI)));
+    state.camera.rotation.copy(activeState.euler);
     state.camera.lookAt(activeState.position.clone());
 }

package/dist/gaesup/camera/index.js

@@ -112,13 +112,26 @@ export default function Camera(_a) {
             switch (_a.label) {
                 case 0:
                     camera.position.copy(position);
+                    if (!(mode.control === "orbit")) return [3 /*break*/, 2];
                     return [4 /*yield*/, Promise.all([
                             cameraRef.current.setPosition(position.x, position.y, position.z, true),
+                            camera.rotation.copy(worldContext.activeState.euler),
                             cameraRef.current.setLookAt(position.x, position.y, position.z, target.x, target.y, target.z, true),
                         ])];
                 case 1:
                     _a.sent();
-                    return [2 /*return*/];
+                    return [3 /*break*/, 4];
+                case 2:
+                    if (!(mode.control === "normal")) return [3 /*break*/, 4];
+                    return [4 /*yield*/, Promise.all([
+                            cameraRef.current.setPosition(0, position.y, position.z, true),
+                            camera.rotation.copy(worldContext.activeState.euler),
+                            cameraRef.current.setLookAt(0, position.y, position.z, target.x, target.y, target.z, true),
+                        ])];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
             }
         });
     }); };

package/dist/gaesup/component/active/vehicle/wheels.js

@@ -5,7 +5,7 @@ import { WheelRegidBodyRef } from "./wheel";
 export function Wheels(_a) {
     var props = _a.props;
     var rigidBodyRef = props.rigidBodyRef;
-    var collider = useContext(GaesupWorldContext).vehicleCollider;
+    var _b = useContext(GaesupWorldContext), collider = _b.vehicleCollider, activeState = _b.activeState;
     var vehicleSizeX = collider.vehicleSizeX, vehicleSizeZ = collider.vehicleSizeZ, wheelSizeX = collider.wheelSizeX, wheelSizeZ = collider.wheelSizeZ;
     var X = (vehicleSizeX - wheelSizeX) / 2 + 0.5;
     var Z = (vehicleSizeZ - 2 * wheelSizeZ) / 2 + 0.5;
@@ -16,5 +16,7 @@ export function Wheels(_a) {
         [X, 0, -Z],
     ];
     var wheelRefs = useRef(wheelPositions.map(function () { return createRef(); }));
-    return (_jsx(_Fragment, { children: wheelPositions.map(function (wheelPosition, index) { return (_jsx(WheelRegidBodyRef, { index: index, ref: wheelRefs.current[index], wheelPosition: wheelPosition, bodyRef: rigidBodyRef, wheel: wheelRefs.current[index], bodyAnchor: wheelPosition, wheelAnchor: [0, 0, 0], rotationAxis: [1, 0, 0] }, index)); }) }));
+    return (_jsx(_Fragment, { children: wheelPositions.map(function (wheelPosition, index) {
+            return (_jsx(WheelRegidBodyRef, { index: index, ref: wheelRefs.current[index], wheelPosition: wheelPosition, bodyRef: rigidBodyRef, wheel: wheelRefs.current[index], bodyAnchor: wheelPosition, wheelAnchor: [0, 0, 0], rotationAxis: [1, 0, 0] }, index));
+        }) }));
 }

package/dist/gaesup/component/passive/airplane/index.js

@@ -33,9 +33,11 @@ export function PassiveAirplane(props) {
                 .setFromEuler(innerGroupRef.current.rotation.clone())
                 .slerp(quat().setFromEuler(_euler), 0.2));
         }
-        // if (rigidBodyRef && rigidBodyRef.current) {
-        //   rigidBodyRef.current.setGravityScale(props.gravity, false);
-        // }
+        if (rigidBodyRef && rigidBodyRef.current) {
+            rigidBodyRef.current.setGravityScale(props.position.y < 10
+                ? ((1 - 0.1) / (0 - 10)) * props.position.y + 1
+                : 0.1, false);
+        }
     });
     return (_jsxs(OuterGroupRef, { ref: refs.outerGroupRef, children: [props.children, airplaneUrl && (_jsxs(RigidBodyRef, { ref: refs.rigidBodyRef, position: position, rotation: euler, onCollisionEnter: props.onCollisionEnter, children: [_jsx(InnerGroupRef, { currentAnimation: currentAnimation, ref: refs.innerGroupRef, url: airplaneUrl }), _jsx(CuboidCollider, { ref: colliderRef, args: [airplaneSize.x / 2, airplaneSize.y / 2, airplaneSize.z / 2], position: [0, airplaneSize.y / 2, 0] })] }))] }));
 }

package/dist/gaesup/physics/airplane/direction.js

@@ -1,7 +1,7 @@
 import { quat } from "@react-three/rapier";
 import { V3 } from "../../utils/vector";
 export default function direction(prop) {
-    var state = prop.state, innerGroupRef = prop.innerGroupRef, _a = prop.worldContext, joystick = _a.joystick, activeState = _a.activeState, control = _a.control, mode = _a.mode, airplane = prop.controllerContext.airplane, delta = prop.delta;
+    var innerGroupRef = prop.innerGroupRef, _a = prop.worldContext, joystick = _a.joystick, activeState = _a.activeState, control = _a.control, mode = _a.mode, airplane = prop.controllerContext.airplane;
     var forward = control.forward, backward = control.backward, leftward = control.leftward, rightward = control.rightward, shift = control.shift, space = control.space;
     var angleDelta = airplane.angleDelta, maxAngle = airplane.maxAngle, accelRatio = airplane.accelRatio;
     var boost = 0;

package/dist/gaesup/physics/airplane/gravity.d.ts

@@ -1,2 +1,14 @@
 import { calcPropType } from "../type";
+/**
+ * This function calculates and sets gravity.
+ *
+ * @param {calcPropType} prop - An object containing properties necessary for gravity calculation.
+ * @param {object} prop.rigidBodyRef - A reference to the physical object where gravity is being set.
+ * @param {object} prop.worldContext - An object representing the current state of the game world.
+ * @param {number} prop.worldContext.activeState.position.y - The current Y-coordinate position.
+ *
+ * Gravity is calculated based on altitude and buoyancy. When altitude is less than 10, gravity is calculated as follows:
+ * Gravity = ((1 - buoyancy) / (0 - 10)) * current Y-coordinate + buoyancy
+ * Otherwise, gravity is set to 0.1.
+ */
 export default function gravity(prop: calcPropType): void;

package/dist/gaesup/physics/airplane/gravity.js

@@ -1,12 +1,18 @@
+/**
+ * This function calculates and sets gravity.
+ *
+ * @param {calcPropType} prop - An object containing properties necessary for gravity calculation.
+ * @param {object} prop.rigidBodyRef - A reference to the physical object where gravity is being set.
+ * @param {object} prop.worldContext - An object representing the current state of the game world.
+ * @param {number} prop.worldContext.activeState.position.y - The current Y-coordinate position.
+ *
+ * Gravity is calculated based on altitude and buoyancy. When altitude is less than 10, gravity is calculated as follows:
+ * Gravity = ((1 - buoyancy) / (0 - 10)) * current Y-coordinate + buoyancy
+ * Otherwise, gravity is set to 0.1.
+ */
 export default function gravity(prop) {
-    var rigidBodyRef = prop.rigidBodyRef, groundRay = prop.groundRay, buoyancy = prop.controllerContext.airplane.buoyancy, airplaneCollider = prop.worldContext.airplaneCollider;
-    if (groundRay.hit) {
-        airplaneCollider.gravity =
-            (1 - buoyancy) / (groundRay.length - groundRay.hit.toi);
-        rigidBodyRef.current.setGravityScale(airplaneCollider.gravity, false);
-    }
-    else {
-        airplaneCollider.gravity = buoyancy;
-        rigidBodyRef.current.setGravityScale(airplaneCollider.gravity, false);
-    }
+    var rigidBodyRef = prop.rigidBodyRef, activeState = prop.worldContext.activeState;
+    rigidBodyRef.current.setGravityScale(activeState.position.y < 10
+        ? ((1 - 0.1) / (0 - 10)) * activeState.position.y + 1
+        : 0.1, false);
 }

package/dist/gaesup/physics/airplane/impulse.d.ts

@@ -1,2 +1,16 @@
 import { calcPropType } from "../type";
-export default function impulse(prop: calcPropType): any;
+/**
+ * This function applies an impulse to a rigid body in the game world.
+ *
+ * @param {calcPropType} prop - An object containing properties necessary for applying the impulse.
+ * @param {object} prop.rigidBodyRef - A reference to the rigid body to which the impulse is applied.
+ * @param {object} prop.worldContext - An object representing the current state of the game world.
+ * @param {object} prop.controllerContext - An object containing controller-specific context data.
+ * @param {object} prop.controllerContext.airplane - An object representing the airplane controller context.
+ * @param {number} prop.controllerContext.airplane.maxSpeed - The maximum speed of the airplane.
+ *
+ * This function calculates the current speed of the rigid body and compares it to the maximum speed.
+ * If the current speed is greater than the maximum speed, no impulse is applied.
+ * Otherwise, an impulse is applied to the rigid body in the direction specified by `activeState.direction`.
+ */
+export default function impulse(prop: calcPropType): void;

package/dist/gaesup/physics/airplane/impulse.js

@@ -1,15 +1,31 @@
 import { vec3 } from "@react-three/rapier";
+/**
+ * This function applies an impulse to a rigid body in the game world.
+ *
+ * @param {calcPropType} prop - An object containing properties necessary for applying the impulse.
+ * @param {object} prop.rigidBodyRef - A reference to the rigid body to which the impulse is applied.
+ * @param {object} prop.worldContext - An object representing the current state of the game world.
+ * @param {object} prop.controllerContext - An object containing controller-specific context data.
+ * @param {object} prop.controllerContext.airplane - An object representing the airplane controller context.
+ * @param {number} prop.controllerContext.airplane.maxSpeed - The maximum speed of the airplane.
+ *
+ * This function calculates the current speed of the rigid body and compares it to the maximum speed.
+ * If the current speed is greater than the maximum speed, no impulse is applied.
+ * Otherwise, an impulse is applied to the rigid body in the direction specified by `activeState.direction`.
+ */
 export default function impulse(prop) {
     var rigidBodyRef = prop.rigidBodyRef, activeState = prop.worldContext.activeState, airplane = prop.controllerContext.airplane;
     var maxSpeed = airplane.maxSpeed;
     var velocity = rigidBodyRef.current.linvel();
-    var currentSpeed = Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(velocity.y, 2) + Math.pow(velocity.z, 2));
-    if (currentSpeed > maxSpeed) {
-        return null;
+    // a = v / t (t = 1) (approximate calculation)
+    var V = vec3(velocity).length();
+    if (V < maxSpeed) {
+        var M = rigidBodyRef.current.mass();
+        // impulse = mass * velocity
+        rigidBodyRef.current.applyImpulse(vec3({
+            x: activeState.direction.x,
+            y: activeState.direction.y,
+            z: activeState.direction.z,
+        }).multiplyScalar(M), false);
     }
-    rigidBodyRef.current.applyImpulse(vec3({
-        x: activeState.direction.x,
-        y: activeState.direction.y,
-        z: activeState.direction.z,
-    }), false);
 }

package/dist/gaesup/physics/index.js

@@ -26,9 +26,10 @@ export default function calculation(prop) {
     var dispatch = useContext(GaesupWorldDispatchContext);
     var mode = worldContext.mode, activeState = worldContext.activeState, controlBlock = worldContext.controlBlock;
     useEffect(function () {
-        var rigidBodyRef = prop.rigidBodyRef;
-        if (rigidBodyRef.current) {
+        var rigidBodyRef = prop.rigidBodyRef, innerGroupRef = prop.innerGroupRef;
+        if (rigidBodyRef.current && innerGroupRef.current) {
             rigidBodyRef.current.lockRotations(true, true);
+            activeState.euler.set(0, 0, 0);
             rigidBodyRef.current.setTranslation(activeState.position.clone().add(V3(0, 2, 0)), true);
         }
     }, [mode.type]);

package/dist/gaesup/physics/vehicle/impulse.d.ts

@@ -1,2 +1,16 @@
 import { calcPropType } from "../type";
-export default function impulse(prop: calcPropType): any;
+/**
+ * This function applies an impulse to a rigid body in the game world.
+ *
+ * @param {calcPropType} prop - An object containing properties necessary for applying the impulse.
+ * @param {object} prop.rigidBodyRef - A reference to the rigid body to which the impulse is applied.
+ * @param {object} prop.worldContext - An object representing the current state of the game world.
+ * @param {object} prop.controllerContext - An object containing controller-specific context data.
+ * @param {object} prop.controllerContext.vehicle - An object representing the vehicle controller context.
+ * @param {number} prop.controllerContext.vehicle.maxSpeed - The maximum speed of the vehicle.
+ *
+ * This function calculates the current speed of the rigid body and compares it to the maximum speed.
+ * If the current speed is greater than the maximum speed, no impulse is applied.
+ * Otherwise, an impulse is applied to the rigid body in the direction specified by `activeState.dir.
+ */
+export default function impulse(prop: calcPropType): void;

package/dist/gaesup/physics/vehicle/impulse.js

@@ -1,20 +1,43 @@
 import { vec3 } from "@react-three/rapier";
+/**
+ * This function applies an impulse to a rigid body in the game world.
+ *
+ * @param {calcPropType} prop - An object containing properties necessary for applying the impulse.
+ * @param {object} prop.rigidBodyRef - A reference to the rigid body to which the impulse is applied.
+ * @param {object} prop.worldContext - An object representing the current state of the game world.
+ * @param {object} prop.controllerContext - An object containing controller-specific context data.
+ * @param {object} prop.controllerContext.vehicle - An object representing the vehicle controller context.
+ * @param {number} prop.controllerContext.vehicle.maxSpeed - The maximum speed of the vehicle.
+ *
+ * This function calculates the current speed of the rigid body and compares it to the maximum speed.
+ * If the current speed is greater than the maximum speed, no impulse is applied.
+ * Otherwise, an impulse is applied to the rigid body in the direction specified by `activeState.dir.
+ */
 export default function impulse(prop) {
     var rigidBodyRef = prop.rigidBodyRef, _a = prop.worldContext, activeState = _a.activeState, control = _a.control, mode = _a.mode, joystick = _a.joystick, vehicle = prop.controllerContext.vehicle;
     var shift = control.shift;
     var maxSpeed = vehicle.maxSpeed, accelRatio = vehicle.accelRatio;
     var velocity = rigidBodyRef.current.linvel();
-    var currentSpeed = Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(velocity.y, 2) + Math.pow(velocity.z, 2));
-    if (currentSpeed > maxSpeed) {
-        return null;
+    // const V = vec3(velocity).length();
+    // const currentSpeed = Math.sqrt(
+    //   velocity.x ** 2 + velocity.y ** 2 + velocity.z ** 2
+    // );
+    // a = v / t (t = 1) (approximate calculation)
+    var V = vec3(velocity).length();
+    if (V < maxSpeed) {
+        var M = rigidBodyRef.current.mass();
+        var speed = 1;
+        if (mode.controller === "joystick") {
+            if (!joystick.joyStickOrigin.isCenter)
+                speed = joystick.joyStickOrigin.isIn ? accelRatio : 1;
+        }
+        else {
+            speed = shift ? accelRatio : 1;
+        }
+        // impulse = mass * velocity
+        rigidBodyRef.current.applyImpulse(vec3()
+            .addScalar(speed)
+            .multiply(activeState.dir.clone().normalize())
+            .multiplyScalar(M), false);
     }
-    var speed = 1;
-    if (mode.controller === "joystick") {
-        if (!joystick.joyStickOrigin.isCenter)
-            speed = joystick.joyStickOrigin.isIn ? accelRatio : 1;
-    }
-    else {
-        speed = shift ? accelRatio : 1;
-    }
-    rigidBodyRef.current.applyImpulse(vec3().addScalar(speed).multiply(activeState.dir.clone().normalize()), false);
 }

package/dist/gaesup/tools/gamePad/GamePadButton.d.ts

@@ -1,7 +1,8 @@
 import { CSSProperties } from "react";
 import "./style.css";
-export default function GamePadButton({ value, name, gamePadButtonStyle, }: {
+export type gamePadButtonType = {
     value: string;
     name: string;
     gamePadButtonStyle: CSSProperties;
-}): import("react/jsx-runtime").JSX.Element;
+};
+export default function GamePadButton({ value, name, gamePadButtonStyle, }: gamePadButtonType): import("react/jsx-runtime").JSX.Element;

package/dist/gaesup/tools/joyStick/index.d.ts

@@ -1,3 +1,6 @@
+import { CSSProperties } from "react";
 import "./style.css";
-import { joyStickType } from "./type";
+export type joyStickType = {
+    [key in "joyStickBallStyle" | "joyStickStyle"]?: CSSProperties;
+};
 export declare function JoyStick(props: joyStickType): import("react/jsx-runtime").JSX.Element;

package/dist/gaesup/tools/joyStick/type.d.ts

@@ -1,4 +1,3 @@
-import { CSSProperties } from "react";
 export type joyStickBallType = {
     left: string;
     top: string;
@@ -18,6 +17,3 @@ export type joyStickInnerType = {
     joyStickBall?: joyStickBallType;
     joyStickOrigin?: joyStickOriginType;
 };
-export type joyStickType = {
-    [key in "joyStickBallStyle" | "joyStickStyle" | "joyBallStyle"]?: CSSProperties;
-};

package/dist/gaesup/tools/jumpPortal/index.d.ts

@@ -1,3 +1,16 @@
-import { portalType } from "../../world/context/type";
+import { CSSProperties } from "react";
 import "./style.css";
-export declare function JumpPortal({ text, position, jumpPortalStlye }: portalType): import("react/jsx-runtime").JSX.Element;
+export type JumpPortalType = {
+    text?: string;
+    position: THREE.Vector3;
+    jumpPortalStyle?: CSSProperties;
+};
+/**
+ * JumpPortal component represents a clickable portal that teleports the user to a specified location.
+ *
+ * @param {JumpPortalType} props - The props for the JumpPortal component.
+ * @param {string} props.text - (Optional) The text to display on the portal.
+ * @param {THREE.Vector3} props.position - The target position to teleport to.
+ * @param {CSSProperties} props.jumpPortalStyle - (Optional) CSS styles for the JumpPortal component.
+ */
+export declare function JumpPortal({ text, position, jumpPortalStyle, }: JumpPortalType): import("react/jsx-runtime").JSX.Element;

package/dist/gaesup/tools/jumpPortal/index.js

@@ -1,10 +1,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useTeleport } from "../../hooks/useTeleport";
 import "./style.css";
+/**
+ * JumpPortal component represents a clickable portal that teleports the user to a specified location.
+ *
+ * @param {JumpPortalType} props - The props for the JumpPortal component.
+ * @param {string} props.text - (Optional) The text to display on the portal.
+ * @param {THREE.Vector3} props.position - The target position to teleport to.
+ * @param {CSSProperties} props.jumpPortalStyle - (Optional) CSS styles for the JumpPortal component.
+ */
 export function JumpPortal(_a) {
-    var text = _a.text, position = _a.position, jumpPortalStlye = _a.jumpPortalStlye;
+    var text = _a.text, position = _a.position, jumpPortalStyle = _a.jumpPortalStyle;
     var Teleport = useTeleport().Teleport;
     return (_jsx("div", { className: "jumpPortal", onClick: function () {
             Teleport(position);
-        }, style: jumpPortalStlye, children: text }));
+        }, style: jumpPortalStyle, children: text }));
 }

package/dist/gaesup/tools/miniMap/index.js

@@ -19,7 +19,7 @@ import "./style.css";
 export function MiniMap(props) {
     var _a = useContext(GaesupWorldContext), minimap = _a.minimap, activeState = _a.activeState, mode = _a.mode;
     var _b = useState(props.scale || minimapDefault.scale), scale = _b[0], setscale = _b[1];
-    var minimapStyle = props.minimapStyle, innerStyle = props.innerStyle, textStyle = props.textStyle, objectStyle = props.objectStyle, avatarStyle = props.avatarStyle, scaleStyle = props.scaleStyle, directionStyle = props.directionStyle, plusMinusStyle = props.plusMinusStyle;
+    var innerStyle = props.innerStyle, textStyle = props.textStyle, objectStyle = props.objectStyle, avatarStyle = props.avatarStyle, scaleStyle = props.scaleStyle, directionStyle = props.directionStyle, plusMinusStyle = props.plusMinusStyle;
     var upscale = useCallback(function () {
         var max = props.maxScale || minimapDefault.maxScale;
         setscale(function (scale) { return Math.min(max, scale + 0.1); });

package/dist/gaesup/tools/zoomButton/index.d.ts

@@ -13,5 +13,6 @@ export declare function useZoom(): {
     closeCamera: (position: THREE.Vector3) => Promise<void>;
     isZoom: boolean;
     setIsZoom: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    moveToCamera: () => Promise<void>;
 };
 export declare function ZoomButton(props: zoomButtonPropsType): import("react/jsx-runtime").JSX.Element;

package/dist/gaesup/tools/zoomButton/index.js

@@ -47,12 +47,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useState } from "react";
-import { makeCameraPosition } from "../../camera/control/orbit.js";
-import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../world/context/index.js";
+import { makeNormalCameraPosition } from "../../camera/control/normal";
+import { makeOrbitCameraPosition } from "../../camera/control/orbit";
+import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../world/context/index";
 import "./style.css";
 export function useZoom() {
     var _this = this;
-    var _a = useContext(GaesupWorldContext), moveTo = _a.moveTo, activeState = _a.activeState, cameraOption = _a.cameraOption;
+    var _a = useContext(GaesupWorldContext), moveTo = _a.moveTo, activeState = _a.activeState, cameraOption = _a.cameraOption, mode = _a.mode;
     var dispatch = useContext(GaesupWorldDispatchContext);
     var _b = useState(true), isZoom = _b[0], setIsZoom = _b[1];
     var closeCamera = function (position) { return __awaiter(_this, void 0, void 0, function () {
@@ -81,6 +82,25 @@ export function useZoom() {
             return [2 /*return*/];
         });
     }); };
+    var moveToCamera = function () { return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(mode.control === "orbit" && moveTo)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, moveTo(makeOrbitCameraPosition(activeState, cameraOption), activeState.position)];
+                case 1:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 2:
+                    if (!(mode.control === "normal" && moveTo)) return [3 /*break*/, 4];
+                    return [4 /*yield*/, moveTo(makeNormalCameraPosition(activeState, cameraOption), activeState.position)];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
+            }
+        });
+    }); };
     var setZoom = function (position, isZoom) { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -89,7 +109,7 @@ export function useZoom() {
                     return [4 /*yield*/, closeCamera(position)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, moveTo(makeCameraPosition(activeState, cameraOption), activeState.position)];
+                    return [4 /*yield*/, moveToCamera()];
                 case 2:
                     _a.sent();
                     return [4 /*yield*/, openCamera()];
@@ -105,6 +125,7 @@ export function useZoom() {
         closeCamera: closeCamera,
         isZoom: isZoom,
         setIsZoom: setIsZoom,
+        moveToCamera: moveToCamera,
     };
 }
 export function ZoomButton(props) {

package/dist/index.d.ts

@@ -6,7 +6,6 @@ export { PassiveCharacter } from "./gaesup/component/passive/character";
 export { PassiveVehicle } from "./gaesup/component/passive/vehicle";
 export { GaesupController } from "./gaesup/controller";
 export { GaeSupProps } from "./gaesup/gaesupProps";
-export { useGaesupController } from "./gaesup/hooks";
 export { GameBoy } from "./gaesup/tools/gameBoy";
 export { GamePad } from "./gaesup/tools/gamePad";
 export { JoyStick } from "./gaesup/tools/joyStick";
@@ -17,3 +16,9 @@ export { Rideable } from "./gaesup/tools/rideable";
 export { ZoomButton } from "./gaesup/tools/zoomButton";
 export { Elr, Qt, V3, V30, V31 } from "./gaesup/utils/vector";
 export { GaesupWorld } from "./gaesup/world";
+export { useGaesupAnimation } from "./gaesup/hooks/useGaesupAnimation";
+export { useGaesupController } from "./gaesup/hooks/useGaesupController";
+export * as useJoyStick from "./gaesup/hooks/useJoyStick";
+export { usePushKey } from "./gaesup/hooks/usePushKey";
+export { useRideable } from "./gaesup/hooks/useRideable";
+export { useTeleport } from "./gaesup/hooks/useTeleport";

package/dist/index.js

@@ -6,7 +6,6 @@ export { PassiveCharacter } from "./gaesup/component/passive/character";
 export { PassiveVehicle } from "./gaesup/component/passive/vehicle";
 export { GaesupController } from "./gaesup/controller";
 export { GaeSupProps } from "./gaesup/gaesupProps";
-export { useGaesupController } from "./gaesup/hooks";
 export { GameBoy } from "./gaesup/tools/gameBoy";
 export { GamePad } from "./gaesup/tools/gamePad";
 export { JoyStick } from "./gaesup/tools/joyStick";
@@ -17,3 +16,9 @@ export { Rideable } from "./gaesup/tools/rideable";
 export { ZoomButton } from "./gaesup/tools/zoomButton";
 export { Elr, Qt, V3, V30, V31 } from "./gaesup/utils/vector";
 export { GaesupWorld } from "./gaesup/world";
+export { useGaesupAnimation } from "./gaesup/hooks/useGaesupAnimation";
+export { useGaesupController } from "./gaesup/hooks/useGaesupController";
+export * as useJoyStick from "./gaesup/hooks/useJoyStick";
+export { usePushKey } from "./gaesup/hooks/usePushKey";
+export { useRideable } from "./gaesup/hooks/useRideable";
+export { useTeleport } from "./gaesup/hooks/useTeleport";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gaesup-world",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/gaesup/hooks/index.d.ts

@@ -1 +0,0 @@
-export { useGaesupController } from "./useGaesupController";

package/dist/gaesup/hooks/index.js

@@ -1 +0,0 @@
-export { useGaesupController } from "./useGaesupController";