gaesup-world 0.7.95 → 0.8.2

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

@@ -1,7 +1,5 @@
 import { controllerInnerType, refsType } from "../controller/type";
-import { urlsType } from "../world/context/type";
-export declare function GaesupComponent({ props, refs, urls, }: {
+export declare function GaesupComponent({ props, refs, }: {
     props: controllerInnerType;
     refs: refsType;
-    urls: urlsType;
 }): import("react/jsx-runtime").JSX.Element;

package/dist/gaesup/component/index.js

@@ -17,8 +17,8 @@ import { AirplaneRef } from "./active/airplane";
 import { CharacterRef } from "./active/character";
 import { VehicleRef } from "./active/vehicle";
 export function GaesupComponent(_a) {
-    var props = _a.props, refs = _a.refs, urls = _a.urls;
-    var _b = useContext(GaesupWorldContext), mode = _b.mode, states = _b.states, rideable = _b.rideable;
+    var props = _a.props, refs = _a.refs;
+    var _b = useContext(GaesupWorldContext), mode = _b.mode, states = _b.states, rideable = _b.rideable, urls = _b.urls;
     var enableRiding = states.enableRiding, isRiderOn = states.isRiderOn, rideableId = states.rideableId;
     return (_jsxs(_Fragment, { children: [mode.type === "character" && (_jsx(CharacterRef, { props: props, refs: refs, urls: urls, children: props.children })), mode.type === "vehicle" && (_jsx(VehicleRef, __assign({ controllerOptions: props.controllerOptions, url: urls.vehicleUrl, wheelUrl: urls.wheelUrl, ridingUrl: urls.ridingUrl, enableRiding: enableRiding, isRiderOn: isRiderOn, groundRay: props.groundRay, offset: rideableId && rideable[rideableId]
                     ? rideable[rideableId].offset

package/dist/gaesup/component/inner/common/RigidbodyRef.d.ts

@@ -6,10 +6,10 @@ export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
     userData?: {
         intangible: boolean;
     };
-    onCollisionEnter?: (e: import("@react-three/rapier").CollisionEnterPayload) => Promise<void>;
     isActive?: boolean;
     ridingUrl?: string;
     groundRay?: import("../../../controller/type").groundRayType;
+    rigidBodyProps?: RapierRigidBody;
 } & {
     children?: import("react").ReactNode;
     groundRay?: import("../../../controller/type").groundRayType;
@@ -22,9 +22,14 @@ export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
     controllerOptions?: import("../../../controller/type").controllerOptionsType;
     currentAnimation?: string;
     rigidbodyType?: import("@react-three/rapier").RigidBodyTypeString;
+    sensor?: boolean;
+    onIntersectionEnter?: (e: import("@react-three/rapier").CollisionEnterPayload) => Promise<void>;
     onCollisionEnter?: (e: import("@react-three/rapier").CollisionEnterPayload) => Promise<void>;
     componentType: import("../../passive/type").componentTypeString;
     userData?: {
         intangible: boolean;
     };
+    rigidBodyProps?: RapierRigidBody;
+    outerGroupProps?: THREE.Group<THREE.Object3DEventMap>;
+    innerGroupProps?: THREE.Group<THREE.Object3DEventMap>;
 } & import("./type").ridingType & import("../../passive/type").innerRefType & import("../../../controller/initialize/callback/type").callbackType & import("react").RefAttributes<RapierRigidBody>>;

package/dist/gaesup/component/inner/common/RigidbodyRef.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useAnimations, useGLTF } from "@react-three/drei";
 import { useFrame, useGraph } from "@react-three/fiber";
@@ -72,7 +83,7 @@ export var RigidBodyRef = forwardRef(function (props, ref) {
             return;
         ref.current.setTranslation(V3(THREE.MathUtils.lerp(ref.current.translation().x, props.position.x, props.controllerOptions.lerp.cameraPosition), THREE.MathUtils.lerp(ref.current.translation().y, props.position.y, props.controllerOptions.lerp.cameraPosition), THREE.MathUtils.lerp(ref.current.translation().z, props.position.z, props.controllerOptions.lerp.cameraPosition)), false);
     });
-    return (_jsxs(RigidBody, { colliders: false, ref: ref, name: props.name, rotation: euler()
+    return (_jsxs(RigidBody, __assign({ colliders: false, ref: ref, name: props.name, rotation: euler()
             .set(0, ((_a = props.rotation) === null || _a === void 0 ? void 0 : _a.clone().y) || 0, 0)
-            .clone(), userData: props.userData, onCollisionEnter: props.onCollisionEnter, type: props.rigidbodyType || (props.isActive ? "dynamic" : "fixed"), children: [_jsx(CapsuleCollider, { ref: props.colliderRef, args: [(size.y / 2 - size.x) * 1.2, size.x * 1.2], position: [0, (size.y / 2 + size.x / 2) * 1.2, 0] }), props.children, _jsx(InnerGroupRef, { objectNode: objectNode, animationRef: animationRef, nodes: nodes, ref: props.innerGroupRef, isActive: props.isActive, isRiderOn: props.isRiderOn, enableRiding: props.enableRiding, ridingUrl: props.ridingUrl, offset: props.offset, children: props.children })] }));
+            .clone(), userData: props.userData, type: props.rigidbodyType || (props.isActive ? "dynamic" : "fixed"), sensor: props.sensor, onIntersectionEnter: props.onIntersectionEnter, onCollisionEnter: props.onCollisionEnter }, props.rigidBodyProps, { children: [_jsx(CapsuleCollider, { ref: props.colliderRef, args: [(size.y / 2 - size.x) * 1.2, size.x * 1.2], position: [0, (size.y / 2 + size.x / 2) * 1.2, 0] }), props.children, _jsx(InnerGroupRef, { objectNode: objectNode, animationRef: animationRef, nodes: nodes, ref: props.innerGroupRef, isActive: props.isActive, isRiderOn: props.isRiderOn, enableRiding: props.enableRiding, ridingUrl: props.ridingUrl, offset: props.offset, children: props.children })] })));
 });

package/dist/gaesup/component/inner/common/type.d.ts

@@ -1,5 +1,5 @@
 import { Collider } from "@dimforge/rapier3d-compat";
-import { CollisionEnterPayload, RigidBodyTypeString } from "@react-three/rapier";
+import { RapierRigidBody, RigidBodyTypeString } from "@react-three/rapier";
 import { MutableRefObject, RefObject } from "react";
 import * as THREE from "three";
 import { callbackType } from "../../../controller/initialize/callback/type";
@@ -40,7 +40,6 @@ export type refPropsType = {
         intangible: boolean;
     };
     currentAnimation?: string;
-    onCollisionEnter?: (e: CollisionEnterPayload) => Promise<void>;
     type?: RigidBodyTypeString;
 };
 export type setGroundRayType = {
@@ -53,8 +52,8 @@ export type rigidBodyRefType = {
     userData?: {
         intangible: boolean;
     };
-    onCollisionEnter?: (e: CollisionEnterPayload) => Promise<void>;
     isActive?: boolean;
     ridingUrl?: string;
     groundRay?: groundRayType;
+    rigidBodyProps?: RapierRigidBody;
 } & passivePropsType & innerRefType & callbackType;

package/dist/gaesup/component/inner/vehicle/index.js

@@ -10,13 +10,12 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
 import { OuterGroupRef } from "../common/OuterGroupRef";
 import { RigidBodyRef } from "../common/RigidbodyRef";
 export function VehicleInnerRef(props) {
     var rigidBodyRef = props.rigidBodyRef, outerGroupRef = props.outerGroupRef;
-    var size = useGltfAndSize({
-        url: props.url,
-    }).size;
+    // const { size } = useGltfAndSize({
+    //   url: props.url,
+    // });
     return (_jsx(OuterGroupRef, { ref: outerGroupRef, children: _jsx(RigidBodyRef, __assign({ ref: rigidBodyRef, name: props.name, componentType: "vehicle", ridingUrl: props.ridingUrl }, props, { children: props.children })) }));
 }

package/dist/gaesup/component/passive/type.d.ts

@@ -23,9 +23,14 @@ export type passivePropsType = {
     controllerOptions?: controllerOptionsType;
     currentAnimation?: string;
     rigidbodyType?: RigidBodyTypeString;
+    sensor?: boolean;
+    onIntersectionEnter?: (e: CollisionEnterPayload) => Promise<void>;
     onCollisionEnter?: (e: CollisionEnterPayload) => Promise<void>;
     componentType: componentTypeString;
     userData?: {
         intangible: boolean;
     };
+    rigidBodyProps?: RapierRigidBody;
+    outerGroupProps?: THREE.Group;
+    innerGroupProps?: THREE.Group;
 } & ridingType;

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

@@ -28,5 +28,5 @@ export function PassiveVehicle(props) {
                 cameraTurn: 1,
                 cameraPosition: 1,
             },
-        }, position: props.position, rotation: props.rotation, currentAnimation: props.currentAnimation, ridingUrl: props.ridingUrl }, props, refs, { children: props.children })));
+        }, position: props.position, rotation: props.rotation, currentAnimation: props.currentAnimation, url: props.url, ridingUrl: props.ridingUrl }, props, refs, { children: props.children })));
 }

package/dist/gaesup/controller/context/index.d.ts

@@ -38,11 +38,11 @@ export declare const gaesupControllerDefault: {
         innerGroupRef: any;
         characterInnerRef: any;
     };
-    urls: {
-        airplaneUrl: any;
-        vehicleUrl: any;
-        characterUrl: any;
-        wheelUrl: any;
+    controllerOptions: {
+        lerp: {
+            cameraTurn: number;
+            cameraPosition: number;
+        };
     };
 };
 export declare const GaesupControllerContext: import("react").Context<gaesupControllerType>;

package/dist/gaesup/controller/context/index.js

@@ -48,11 +48,11 @@ export var gaesupControllerDefault = {
         innerGroupRef: null,
         characterInnerRef: null,
     },
-    urls: {
-        airplaneUrl: null,
-        vehicleUrl: null,
-        characterUrl: null,
-        wheelUrl: null,
+    controllerOptions: {
+        lerp: {
+            cameraTurn: 1,
+            cameraPosition: 1,
+        },
     },
 };
 export var GaesupControllerContext = createContext(__assign({}, gaesupControllerDefault));

package/dist/gaesup/controller/context/reducer.d.ts

@@ -6,7 +6,7 @@ export declare function gaesupControllerReducer(props: gaesupControllerType, act
     airplane: import("./type").airplaneType;
     vehicle: import("./type").vehicleType;
     character: import("./type").characterType;
-    urls: import("../../world/context/type").urlsType;
+    controllerOptions: import("../type").controllerOptionsType;
     callbacks?: import("../initialize/callback/type").callbackType;
     refs?: import("../type").refsType;
 };

package/dist/gaesup/controller/index.js

@@ -40,7 +40,6 @@ export function GaesupControllerInner(props) {
             onDestory: props.onDestory,
             onAnimate: props.onAnimate,
         }),
-        urls: Object.assign(gaesupControllerDefault.urls, props.urls || {}),
         refs: {
             colliderRef: colliderRef,
             rigidBodyRef: rigidBodyRef,
@@ -48,6 +47,7 @@ export function GaesupControllerInner(props) {
             innerGroupRef: innerGroupRef,
             characterInnerRef: characterInnerRef,
         },
+        controllerOptions: Object.assign(gaesupControllerDefault.controllerOptions, props.controllerOptions || {}),
     }), controller = _a[0], controllerDispatch = _a[1];
     var gaesupControl = useMemo(function () { return ({
         value: controller,
@@ -65,11 +65,11 @@ export function GaesupControllerInner(props) {
     }, []);
     var prop = __assign(__assign(__assign(__assign({}, initControllerProps({
         refs: refs,
-    })), { children: props.children, groupProps: props.groupProps }), gaesupControl.value.callbacks), refs);
+    })), { children: props.children, groupProps: props.groupProps, controllerOptions: gaesupControl.value.controllerOptions }), gaesupControl.value.callbacks), refs);
     initDebug({
         controllerContext: gaesupControl.value,
         controllerDispatch: gaesupControl.dispatch,
     });
     var ContextBridge = useContextBridge(GaesupWorldContext, GaesupControllerContext);
-    return (_jsx(ContextBridge, { children: _jsx(GaesupControllerContext.Provider, { value: gaesupControl.value, children: _jsx(GaesupControllerDispatchContext.Provider, { value: gaesupControl.dispatch, children: _jsx(GaesupComponent, { props: prop, refs: refs, urls: props.urls }) }) }) }));
+    return (_jsx(ContextBridge, { children: _jsx(GaesupControllerContext.Provider, { value: gaesupControl.value, children: _jsx(GaesupControllerDispatchContext.Provider, { value: gaesupControl.dispatch, children: _jsx(GaesupComponent, { props: prop, refs: refs }) }) }) }));
 }

package/dist/gaesup/controller/initialize/index.d.ts

@@ -1,16 +1,10 @@
 import { groundRayType, refsType } from "../../controller/type";
 import { cameraRayType } from "../../camera/type";
 import { keyControlType } from "../../world/context/type";
-export default function initControllerProps({ refs }: {
+export default function initControllerProps(props: {
     refs: refsType;
 }): {
     groundRay: groundRayType;
     cameraRay: cameraRayType;
     keyControl: keyControlType;
-    controllerOptions: {
-        lerp: {
-            cameraPosition: number;
-            cameraTurn: number;
-        };
-    };
 };

package/dist/gaesup/controller/initialize/index.js

@@ -15,11 +15,10 @@ import { useCallback, useContext, useEffect, useMemo } from "react";
 import * as THREE from "three";
 import { update } from "../../utils/context";
 import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../world/context";
-export default function initControllerProps(_a) {
-    var refs = _a.refs;
+export default function initControllerProps(props) {
     var context = useContext(GaesupWorldContext);
     var dispatch = useContext(GaesupWorldDispatchContext);
-    var _b = useKeyboardControls(), _ = _b[0], getKeys = _b[1];
+    var _a = useKeyboardControls(), _ = _a[0], getKeys = _a[1];
     var keyControl = getKeys();
     useEffect(function () {
         if (context && keyControl && context.control) {
@@ -71,28 +70,19 @@ export default function initControllerProps(_a) {
             intersectObjectMap: {},
         };
     }, []);
-    var controllerOptions = useMemo(function () {
-        return {
-            lerp: {
-                cameraPosition: 0.9,
-                cameraTurn: 0.1,
-            },
-        };
-    }, []);
     var initRefs = useCallback(function (refs) {
         update({
             refs: __assign({}, refs),
         }, dispatch);
-    }, [refs]);
+    }, [props.refs]);
     useEffect(function () {
-        if (refs) {
-            initRefs(refs);
+        if (props.refs) {
+            initRefs(props.refs);
         }
     }, []);
     return {
         groundRay: groundRay,
         cameraRay: cameraRay,
         keyControl: keyControl,
-        controllerOptions: controllerOptions,
     };
 }

package/dist/gaesup/controller/type.d.ts

@@ -81,7 +81,7 @@ export type gaesupControllerContextPropType = {
     airplane: airplaneType;
     vehicle: vehicleType;
     character: characterType;
-    urls: urlsType;
+    controllerOptions: controllerOptionsType;
 };
 export interface controllerOtherPropType extends RigidBodyProps {
     children?: ReactNode;
@@ -89,4 +89,6 @@ export interface controllerOtherPropType extends RigidBodyProps {
     rigidBodyProps?: RigidBodyProps;
     debug?: boolean;
 }
-export type controllerType = controllerOtherPropType & Partial<gaesupControllerContextPropType> & callbackType;
+export type controllerType = controllerOtherPropType & urlsType & Partial<gaesupControllerContextPropType> & callbackType & {
+    controllerOptions?: controllerOptionsType;
+};

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

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
 };
 import { quat, vec3 } from "@react-three/rapier";
 export default function innerCalc(prop) {
-    var rigidBodyRef = prop.rigidBodyRef, _a = prop.worldContext, activeState = _a.activeState, block = _a.block, dispatch = prop.dispatch;
+    var rigidBodyRef = prop.rigidBodyRef, activeState = prop.worldContext.activeState, dispatch = prop.dispatch;
     activeState.position = vec3(rigidBodyRef.current.translation());
     activeState.velocity = vec3(rigidBodyRef.current.linvel());
     var _euler = activeState.euler.clone();

package/dist/gaesup/physics/check/moving.js

@@ -1,5 +1,5 @@
 export default function moving(prop) {
-    var _a = prop.worldContext, states = _a.states, joystick = _a.joystick, mode = _a.mode, control = _a.control, clicker = _a.clicker;
+    var _a = prop.worldContext, states = _a.states, joystick = _a.joystick, mode = _a.mode, control = _a.control, clicker = _a.clicker, clickerOption = _a.clickerOption;
     var forward = control.forward, backward = control.backward, leftward = control.leftward, rightward = control.rightward, shift = control.shift, space = control.space;
     if (mode.controller === "gameboy" || mode.controller === "keyboard") {
         states.isMoving = forward || backward || leftward || rightward;
@@ -16,7 +16,8 @@ export default function moving(prop) {
     else if (mode.controller === "clicker") {
         states.isMoving = clicker.isOn;
         states.isNotMoving = !clicker.isOn;
-        states.isRunning = (shift || clicker.isRun) && states.isMoving;
+        states.isRunning =
+            (shift || clicker.isRun) && states.isMoving && clickerOption.isRun;
         states.isJumping = space;
     }
 }

package/dist/gaesup/physics/index.js

@@ -54,7 +54,7 @@ export default function calculation(_a) {
             worldContext: worldContext,
             controllerContext: controllerContext,
             dispatch: dispatch,
-            matchSizes: getSizesByUrls(controllerContext === null || controllerContext === void 0 ? void 0 : controllerContext.urls),
+            matchSizes: getSizesByUrls(worldContext === null || worldContext === void 0 ? void 0 : worldContext.urls),
         };
         if (mode.type === "vehicle")
             vehicleCalculation(calcProp);

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

@@ -3,6 +3,6 @@ import { useContext } from "react";
 import { GaesupWorldContext } from "../../world/context";
 export function Clicker(_a) {
     var onMarker = _a.onMarker, runMarker = _a.runMarker;
-    var _b = useContext(GaesupWorldContext), clicker = _b.clicker, mode = _b.mode;
-    return (_jsx(_Fragment, { children: mode.controller === "clicker" && (_jsxs("group", { position: clicker.point, children: [clicker.isOn && onMarker, clicker.isOn && clicker.isRun && runMarker] })) }));
+    var _b = useContext(GaesupWorldContext), clicker = _b.clicker, mode = _b.mode, clickerOption = _b.clickerOption;
+    return (_jsx(_Fragment, { children: mode.controller === "clicker" && (_jsxs("group", { position: clicker.point, children: [clicker.isOn && onMarker, clicker.isOn && clickerOption.isRun && clicker.isRun && runMarker] })) }));
 }

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 innerStyle = props.innerStyle, textStyle = props.textStyle, objectStyle = props.objectStyle, avatarStyle = props.avatarStyle, scaleStyle = props.scaleStyle, directionStyle = props.directionStyle, plusMinusStyle = props.plusMinusStyle, imageStyle = props.imageStyle;
+    var minimapInnerStyle = props.minimapInnerStyle, textStyle = props.textStyle, minimapObjectStyle = props.minimapObjectStyle, avatarStyle = props.avatarStyle, scaleStyle = props.scaleStyle, directionStyle = props.directionStyle, plusMinusStyle = props.plusMinusStyle, imageStyle = props.imageStyle, minimapStyle = props.minimapStyle, minimapOuterStyle = props.minimapOuterStyle;
     var upscale = useCallback(function () {
         var max = props.maxScale || minimapDefault.maxScale;
         setscale(function (scale) { return Math.min(max, scale + 0.1); });
@@ -35,9 +35,9 @@ export function MiniMap(props) {
                 upscale();
             else
                 downscale();
-        }, children: [_jsx("div", { className: "minimapOuter", style: objectStyle }), _jsxs("div", { className: "minimapInner", style: __assign({ transform: props.blockRotate || mode.control === "normal"
+        }, style: minimapStyle, children: [_jsx("div", { className: "minimapOuter", style: minimapOuterStyle }), _jsxs("div", { className: "minimapInner", style: __assign({ transform: props.blockRotate || mode.control === "normal"
                         ? "translate(-50%, -50%) rotate(180deg) "
-                        : "translate(-50%, -50%) rotate(".concat((activeState.euler.y * 180) / Math.PI + 180, "deg) ") }, innerStyle), children: [" ", _jsx("div", { className: "east direction", style: __assign({ transform: props.blockRotate || mode.control === "normal"
+                        : "translate(-50%, -50%) rotate(".concat((activeState.euler.y * 180) / Math.PI + 180, "deg) ") }, minimapInnerStyle), children: [_jsx("div", { className: "east direction", style: __assign({ transform: props.blockRotate || mode.control === "normal"
                                 ? "translate(-50%, -50%) rotate(180deg) "
                                 : "translate(-50%, -50%) rotate(-".concat((activeState.euler.y * 180) / Math.PI + 180, "deg) ") }, directionStyle), children: "E" }), _jsx("div", { className: "west direction", style: __assign({ transform: props.blockRotate || mode.control === "normal"
                                 ? "translate(50%, -50%) rotate(180deg) "
@@ -53,7 +53,7 @@ export function MiniMap(props) {
                         var Z = (center.z - activeState.position.z) *
                             (props.angle ? -Math.cos(props.angle) : 1) *
                             scale;
-                        return (_jsxs("div", { children: [_jsx("div", { className: "minimapObject", style: __assign({ width: "".concat(size.x * scale, "rem"), height: "".concat(size.z * scale, "rem"), top: "50%", left: "50%", transform: "translate(-50.1%, -50.1%) translate(".concat(-X, "rem, ").concat(-Z, "rem) rotate(").concat((Math.PI * 3) / 2 + props.angle || 0, "rad)"), transformOrigin: "50% 50%", zIndex: 1 + key }, objectStyle) }), key === 0 && (_jsx("div", { className: "imageObject", style: __assign({ width: "".concat(size.x * scale, "rem"), height: "".concat(size.z * scale, "rem"), top: "50%", left: "50%", transform: "translate(-50.1%, -50.1%) translate(".concat(-X, "rem, ").concat(-Z, "rem) rotate(").concat((Math.PI * 3) / 2 + props.angle || 0, "rad)"), transformOrigin: "50% 50%", zIndex: 10 + key }, imageStyle) })), _jsx("div", { className: "textObject", style: {
+                        return (_jsxs("div", { children: [_jsx("div", { className: "minimapObject", style: __assign({ width: "".concat(size.x * scale, "rem"), height: "".concat(size.z * scale, "rem"), top: "50%", left: "50%", transform: "translate(-50.1%, -50.1%) translate(".concat(-X, "rem, ").concat(-Z, "rem) rotate(").concat((Math.PI * 3) / 2 + props.angle || 0, "rad)"), transformOrigin: "50% 50%", zIndex: 1 + key }, minimapObjectStyle) }), key === 0 && (_jsx("div", { className: "imageObject", style: __assign({ width: "".concat(size.x * scale, "rem"), height: "".concat(size.z * scale, "rem"), top: "50%", left: "50%", transform: "translate(-50.1%, -50.1%) translate(".concat(-X, "rem, ").concat(-Z, "rem) rotate(").concat((Math.PI * 3) / 2 + props.angle || 0, "rad)"), transformOrigin: "50% 50%", zIndex: 10 + key }, imageStyle) })), _jsx("div", { className: "textObject", style: {
                                         width: "".concat(size.x * scale, "rem"),
                                         height: "".concat(size.z * scale, "rem"),
                                         top: "50.1%",

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

@@ -14,7 +14,7 @@ export type minimapInnerType = {
     };
 };
 export type minimapType = {
-    [key in "minimapStyle" | "outerStyle" | "innerStyle" | "textStyle" | "objectStyle" | "avatarStyle" | "directionStyle" | "scaleStyle" | "imageStyle" | "plusMinusStyle"]?: CSSProperties;
+    [key in "minimapStyle" | "minimapOuterStyle" | "minimapInnerStyle" | "minimapObjectStyle" | "textStyle" | "objectStyle" | "avatarStyle" | "directionStyle" | "scaleStyle" | "imageStyle" | "plusMinusStyle"]?: CSSProperties;
 } & {
     minScale?: number;
     maxScale?: number;

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

@@ -46,13 +46,13 @@ import "./style.css";
 export function Rideable(props) {
     var _this = this;
     var _a;
-    var _b = useContext(GaesupWorldContext), states = _b.states, rideable = _b.rideable, urls = _b.urls;
-    var _c = useRideable(), initRideable = _c.initRideable, getRideable = _c.getRideable, ride = _c.ride, landing = _c.landing;
+    var _b = useContext(GaesupWorldContext), states = _b.states, rideable = _b.rideable;
+    var _c = useRideable(), initRideable = _c.initRideable, ride = _c.ride, landing = _c.landing;
     // const current = getRideable(props.objectkey);
-    var _d = useState({
+    var _rideable = useState({
         position: props.position || V3(0, 0, 0),
         rotation: props.rotation || euler(),
-    }), _rideable = _d[0], set_Rideable = _d[1];
+    })[0];
     useEffect(function () {
         initRideable(props);
     }, []);
@@ -63,7 +63,7 @@ export function Rideable(props) {
             landing(props.objectkey);
         }
     }, [states === null || states === void 0 ? void 0 : states.isRiding]);
-    var onCollisionEnter = function (e) { return __awaiter(_this, void 0, void 0, function () {
+    var onIntersectionEnter = function (e) { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, ride(e, props)];
@@ -73,5 +73,5 @@ export function Rideable(props) {
             }
         });
     }); };
-    return (_jsx(_Fragment, { children: ((_a = rideable === null || rideable === void 0 ? void 0 : rideable[props.objectkey]) === null || _a === void 0 ? void 0 : _a.visible) && (_jsxs("group", { userData: { intangible: true }, children: [props.objectType === "vehicle" && (_jsx(PassiveVehicle, { controllerOptions: props.controllerOptions, position: props.position, rotation: props.rotation, currentAnimation: "idle", url: props.url, wheelUrl: props.wheelUrl, ridingUrl: props.ridingUrl, offset: props.offset, enableRiding: props.enableRiding, onCollisionEnter: onCollisionEnter })), props.objectType === "airplane" && (_jsx(PassiveAirplane, { controllerOptions: props.controllerOptions, position: _rideable.position, rotation: _rideable.rotation, ridingUrl: props.ridingUrl, currentAnimation: "idle", url: props.url, offset: props.offset, enableRiding: props.enableRiding, onCollisionEnter: onCollisionEnter }))] })) }));
+    return (_jsx(_Fragment, { children: ((_a = rideable === null || rideable === void 0 ? void 0 : rideable[props.objectkey]) === null || _a === void 0 ? void 0 : _a.visible) && (_jsxs("group", { userData: { intangible: true }, children: [props.objectType === "vehicle" && (_jsx(PassiveVehicle, { controllerOptions: props.controllerOptions, position: _rideable.position, rotation: _rideable.rotation, currentAnimation: "idle", url: props.url, wheelUrl: props.wheelUrl, ridingUrl: props.ridingUrl, offset: props.offset, enableRiding: props.enableRiding, rigidBodyProps: props.rigidBodyProps, sensor: true, onIntersectionEnter: onIntersectionEnter })), props.objectType === "airplane" && (_jsx(PassiveAirplane, { controllerOptions: props.controllerOptions, position: _rideable.position.clone(), rotation: _rideable.rotation.clone(), currentAnimation: "idle", url: props.url, ridingUrl: props.ridingUrl, offset: props.offset, enableRiding: props.enableRiding, rigidBodyProps: props.rigidBodyProps, sensor: true, onIntersectionEnter: onIntersectionEnter }))] })) }));
 }

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

@@ -1,3 +1,4 @@
+import { RapierRigidBody } from "@react-three/rapier";
 import * as THREE from "three";
 import { controllerOptionsType } from "../../controller/type";
 export type rideablePropType = {
@@ -18,4 +19,7 @@ export type rideablePropType = {
     vehicleSize?: THREE.Vector3;
     wheelSize?: THREE.Vector3;
     airplaneSize?: THREE.Vector3;
+    rigidBodyProps?: RapierRigidBody;
+    outerGroupProps?: THREE.Group;
+    innerGroupProps?: THREE.Group;
 };

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

@@ -1,19 +0,0 @@
-/// <reference types="react" />
-import * as THREE from "three";
-import "./style.css";
-export type zoomButtonPropsType = {
-    children?: React.ReactNode;
-    position: THREE.Vector3;
-    target?: THREE.Vector3;
-    keepBlocking?: boolean;
-    zoomButtonStyle?: React.CSSProperties;
-};
-export declare function useZoom(): {
-    setZoom: (position: THREE.Vector3, isZoom: boolean) => Promise<void>;
-    openCamera: () => Promise<void>;
-    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

@@ -1,146 +1,102 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext, useState } from "react";
-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, mode = _a.mode, block = _a.block;
-    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 () {
-        return __generator(this, function (_a) {
-            cameraOption.XDistance = position.x;
-            cameraOption.YDistance = position.y;
-            cameraOption.ZDistance = position.z;
-            block.camera = true;
-            dispatch({
-                type: "update",
-                payload: {
-                    block: __assign({}, block),
-                    cameraOption: __assign({}, cameraOption),
-                },
-            });
-            return [2 /*return*/];
-        });
-    }); };
-    var openCamera = function () { return __awaiter(_this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            block.camera = false;
-            dispatch({
-                type: "update",
-                payload: {
-                    block: __assign({}, block),
-                },
-            });
-            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) {
-                case 0:
-                    setIsZoom(isZoom);
-                    return [4 /*yield*/, closeCamera(position)];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, moveToCamera()];
-                case 2:
-                    _a.sent();
-                    return [4 /*yield*/, openCamera()];
-                case 3:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    }); };
-    return {
-        setZoom: setZoom,
-        openCamera: openCamera,
-        closeCamera: closeCamera,
-        isZoom: isZoom,
-        setIsZoom: setIsZoom,
-        moveToCamera: moveToCamera,
-    };
-}
-export function ZoomButton(props) {
-    var _this = this;
-    var _a = useZoom(), setZoom = _a.setZoom, isZoom = _a.isZoom;
-    return (_jsx("div", { className: "zoomButton", style: __assign({}, props.zoomButtonStyle), onClick: function () { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, setZoom(props.position, isZoom)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        }); }, children: props.children }));
-}
+// import { useContext, useState } from "react";
+// import * as THREE from "three";
+// import { makeNormalCameraPosition } from "../../camera/control/normal";
+// import { makeOrbitCameraPosition } from "../../camera/control/orbit";
+// import {
+//   GaesupWorldContext,
+//   GaesupWorldDispatchContext,
+// } from "../../world/context/index";
+// import "./style.css";
+//
+// export type zoomButtonPropsType = {
+//   children?: React.ReactNode;
+//   position: THREE.Vector3;
+//   target?: THREE.Vector3;
+//   keepBlocking?: boolean;
+//   zoomButtonStyle?: React.CSSProperties;
+// };
+//
+// export function useZoom() {
+//   const { moveTo, activeState, cameraOption, mode, block } =
+//     useContext(GaesupWorldContext);
+//   const dispatch = useContext(GaesupWorldDispatchContext);
+//   const [isZoom, setIsZoom] = useState(true);
+//
+//   const closeCamera = async (position: THREE.Vector3) => {
+//     cameraOption.XDistance = position.x;
+//     cameraOption.YDistance = position.y;
+//     cameraOption.ZDistance = position.z;
+//     block.camera = true;
+//     dispatch({
+//       type: "update",
+//       payload: {
+//         block: {
+//           ...block,
+//         },
+//         cameraOption: {
+//           ...cameraOption,
+//         },
+//       },
+//     });
+//   };
+//
+//   const openCamera = async () => {
+//     block.camera = false;
+//     dispatch({
+//       type: "update",
+//       payload: {
+//         block: {
+//           ...block,
+//         },
+//       },
+//     });
+//   };
+//
+//   const moveToCamera = async () => {
+//     if (mode.control === "orbit" && moveTo) {
+//       await moveTo(
+//         makeOrbitCameraPosition(activeState, cameraOption),
+//         activeState.position
+//       );
+//     } else if (mode.control === "normal" && moveTo) {
+//       await moveTo(
+//         makeNormalCameraPosition(activeState, cameraOption),
+//         activeState.position
+//       );
+//     }
+//   };
+//
+//   const setZoom = async (position: THREE.Vector3, isZoom: boolean) => {
+//     setIsZoom(isZoom);
+//     await closeCamera(position);
+//     await moveToCamera();
+//     await openCamera();
+//   };
+//
+//   return {
+//     setZoom,
+//     openCamera,
+//     closeCamera,
+//     isZoom,
+//     setIsZoom,
+//     moveToCamera,
+//   };
+// }
+//
+// export function ZoomButton(props: zoomButtonPropsType) {
+//   const { setZoom, isZoom } = useZoom();
+//
+//   return (
+//     <div
+//       className="zoomButton"
+//       style={{
+//         ...props.zoomButtonStyle,
+//       }}
+//       onClick={async () => {
+//         await setZoom(props.position, isZoom);
+//       }}
+//     >
+//       {props.children}
+//     </div>
+//   );
+// }

package/dist/gaesup/world/context/index.js

@@ -114,7 +114,6 @@ export var gaesupWorldDefault = {
         position: vec3(),
         focus: false,
     },
-    moveTo: null,
     rideable: {},
     sizes: {},
     block: {
@@ -123,8 +122,9 @@ export var gaesupWorldDefault = {
         animation: false,
         scroll: true,
     },
-    callback: {
-        moveTo: null,
+    clickerOption: {
+        isRun: true,
+        throttle: 100,
     },
 };
 export var GaesupWorldContext = createContext(null);

package/dist/gaesup/world/context/reducer.d.ts

@@ -17,14 +17,11 @@ export declare function gaesupWorldReducer(props: Partial<gaesupWorldContextType
     animationState?: import("./type").animationStateType;
     keyBoardMap?: import("../../tools/keyBoardToolTip/type").keyboardMapType;
     cameraOption?: import("./type").cameraOptionType;
+    clickerOption?: import("./type").clickerOptionType;
     clicker?: import("./type").clickerType;
-    moveTo?: (position: import("three").Vector3, target: import("three").Vector3) => Promise<void>;
     rideable?: {
         [key: string]: import("../../hooks/useRideable/type").rideableType;
     };
     sizes?: import("./type").sizesType;
     block?: import("./type").blockType;
-    callback?: {
-        moveTo: (position: import("three").Vector3, target: import("three").Vector3) => Promise<void>;
-    };
 };

package/dist/gaesup/world/context/type.d.ts

@@ -107,6 +107,10 @@ export type clickerType = {
     isOn: boolean;
     isRun: boolean;
 };
+export type clickerOptionType = {
+    isRun: boolean;
+    throttle: number;
+};
 export type wheelStateType = {
     position: THREE.Vector3;
     rotation: THREE.Euler;
@@ -156,16 +160,13 @@ export type gaesupWorldContextType = {
     animationState: animationStateType;
     keyBoardMap: keyboardMapType;
     cameraOption: cameraOptionType;
+    clickerOption: clickerOptionType;
     clicker: clickerType;
-    moveTo: (position: THREE.Vector3, target: THREE.Vector3) => Promise<void>;
     rideable: {
         [key: string]: rideableType;
     };
     sizes: sizesType;
     block: blockType;
-    callback: {
-        moveTo: (position: THREE.Vector3, target: THREE.Vector3) => Promise<void>;
-    };
 };
 export type gaesupDisptachType = dispatchType<gaesupWorldContextType>;
 export {};

package/dist/gaesup/world/initalize/index.d.ts

@@ -17,16 +17,13 @@ export default function initGaesupWorld(props: gaesupWorldPropsType): {
             animationState?: import("../context/type").animationStateType;
             keyBoardMap?: import("../../tools/keyBoardToolTip/type").keyboardMapType;
             cameraOption?: import("../context/type").cameraOptionType;
+            clickerOption?: import("../context/type").clickerOptionType;
             clicker?: import("../context/type").clickerType;
-            moveTo?: (position: import("three").Vector3, target: import("three").Vector3) => Promise<void>;
             rideable?: {
                 [key: string]: import("../../hooks/useRideable/type").rideableType;
             };
             sizes?: import("../context/type").sizesType;
             block?: import("../context/type").blockType;
-            callback?: {
-                moveTo: (position: import("three").Vector3, target: import("three").Vector3) => Promise<void>;
-            };
         };
         dispatch: import("react").Dispatch<{
             type: string;

package/dist/gaesup/world/initalize/index.js

@@ -28,14 +28,11 @@ export default function initGaesupWorld(props) {
         joystick: gaesupWorldDefault.joystick,
         control: gaesupWorldDefault.control,
         clicker: gaesupWorldDefault.clicker,
+        clickerOption: Object.assign(gaesupWorldDefault.clickerOption, props.clickerOption || {}),
         animationState: gaesupWorldDefault.animationState,
         keyBoardMap: Object.assign(gaesupWorldDefault.keyBoardMap, props.keyBoardMap || {}),
-        moveTo: null,
         block: Object.assign(gaesupWorldDefault.block, props.block || {}),
         sizes: gaesupWorldDefault.sizes,
-        callback: {
-            moveTo: null,
-        },
     }), value = _a[0], dispatch = _a[1];
     useEffect(function () {
         var _a;

package/dist/gaesup/world/type.d.ts

@@ -2,7 +2,7 @@ import { ReactNode } from "react";
 import * as THREE from "three";
 import { keyboardMapType } from "../tools/keyBoardToolTip/type";
 import { dispatchType } from "../utils/type";
-import { blockType, cameraOptionType, gaesupWorldContextType, modeType, urlsType } from "./context/type";
+import { blockType, cameraOptionType, clickerOptionType, gaesupWorldContextType, modeType, urlsType } from "./context/type";
 export type gaesupWorldInitType = {
     value: gaesupWorldContextType;
     dispatch: dispatchType<gaesupWorldContextType>;
@@ -15,6 +15,6 @@ export type gaesupWorldPropsType = {
     debug?: boolean;
     keyBoardMap?: keyboardMapType;
     cameraOption?: cameraOptionType;
-    moveTo?: (position: THREE.Vector3, target: THREE.Vector3) => void;
     block?: blockType;
+    clickerOption?: clickerOptionType;
 };

package/dist/index.d.ts

@@ -12,7 +12,6 @@ export { JumpPortal } from "./gaesup/tools/jumpPortal";
 export { KeyBoardToolTip } from "./gaesup/tools/keyBoardToolTip";
 export { MiniMap } from "./gaesup/tools/miniMap";
 export { Rideable } from "./gaesup/tools/rideable";
-export { ZoomButton } from "./gaesup/tools/zoomButton";
 export { InnerHtml } from "./gaesup/utils/innerHtml";
 export { Elr, Qt, V3, V30, V31 } from "./gaesup/utils/vector";
 export { GaesupWorld } from "./gaesup/world";

package/dist/index.js

@@ -12,7 +12,7 @@ export { JumpPortal } from "./gaesup/tools/jumpPortal";
 export { KeyBoardToolTip } from "./gaesup/tools/keyBoardToolTip";
 export { MiniMap } from "./gaesup/tools/miniMap";
 export { Rideable } from "./gaesup/tools/rideable";
-export { ZoomButton } from "./gaesup/tools/zoomButton";
+// export { ZoomButton } from "./gaesup/tools/zoomButton";
 export { InnerHtml } from "./gaesup/utils/innerHtml";
 export { Elr, Qt, V3, V30, V31 } from "./gaesup/utils/vector";
 export { GaesupWorld } from "./gaesup/world";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gaesup-world",
-  "version": "0.7.95",
+  "version": "0.8.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,24 +13,24 @@
     "@react-three/fiber": "8.16.2",
     "@react-three/postprocessing": "^2.16.2",
     "@react-three/rapier": "^1.3.1",
-    "@types/three": "^0.163.0",
+    "@types/lodash": "^4.17.0",
+    "@types/three": "^0.164.0",
     "gh-pages": "^6.1.1",
     "jotai": "^2.8.0",
     "leva": "0.9.35",
     "lodash": "^4.17.21",
     "node-fetch": "3.3.2",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-device-detect": "^2.2.3",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-icons": "^5.1.0",
     "react-use-refs": "^1.0.1",
-    "three": "^0.163.0",
-    "three-stdlib": "^2.29.6"
+    "three": "^0.164.1",
+    "three-stdlib": "^2.29.7"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.0",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.2.25",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.0",
     "@vanilla-extract/css": "^1.14.2",
     "@vanilla-extract/dynamic": "^2.1.0",
     "@vanilla-extract/recipes": "^0.5.2",