gaesup-world 0.6.58 → 0.6.61

package/dist/gaesup/animation/actions.d.ts

@@ -13,8 +13,10 @@ export type Api<T extends AnimationClip> = {
 };
 export type playActionsType = {
     type: "character" | "vehicle" | "airplane";
-    animationResult: Api<AnimationClip>;
     currentAnimation?: string;
+    actions: actionsType;
+    animationRef: Ref<Object3D<Object3DEventMap>>;
+    isActive: boolean;
 };
 export type subscribeActionsType = {
     type: "character" | "vehicle" | "airplane";
@@ -28,23 +30,8 @@ export type playResultType = {
     actions: actionsType;
     ref: Ref<Object3D<Object3DEventMap>>;
 };
-export declare function subscribeActions({ type, groundRay, animations, }: subscribeActionsType): {
-    animationResult: {
-        ref: import("react").MutableRefObject<THREE.Object3D<THREE.Object3DEventMap>>;
-        clips: THREE.AnimationClip[];
-        mixer: THREE.AnimationMixer;
-        names: string[];
-        actions: {
-            [x: string]: THREE.AnimationAction;
-        };
-    };
-};
-export default function playActions({ type, animationResult, currentAnimation, }: playActionsType): {
-    animationRef: import("react").MutableRefObject<THREE.Object3D<THREE.Object3DEventMap>>;
+export declare function subscribeActions({ type }: subscribeActionsType): void;
+export default function playActions({ type, actions, animationRef, currentAnimation, isActive, }: playActionsType): {
+    animationRef: Ref<THREE.Object3D<THREE.Object3DEventMap>>;
     currentAnimation: string;
 };
-export declare const setAnimation: ({ currentAnimation, actions, type, }: {
-    currentAnimation?: string;
-    actions?: actionsType;
-    type?: "character" | "vehicle" | "airplane";
-}) => void;

package/dist/gaesup/animation/actions.js

@@ -9,16 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { useAnimations } from "@react-three/drei";
 import { useFrame } from "@react-three/fiber";
 import { useContext, useEffect } from "react";
 import { useGaesupAnimation } from "../hooks/useGaesupAnimation";
 import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../world/context";
 export function subscribeActions(_a) {
-    var type = _a.type, groundRay = _a.groundRay, animations = _a.animations;
-    var _b = useContext(GaesupWorldContext), states = _b.states, activeState = _b.activeState;
+    var type = _a.type;
+    var states = useContext(GaesupWorldContext).states;
     var subscribeAll = useGaesupAnimation({ type: type }).subscribeAll;
-    var animationResult = useAnimations(animations);
     // 초기 기본 애니메이션 등록
     useEffect(function () {
         subscribeAll([
@@ -43,13 +41,6 @@ export function subscribeActions(_a) {
                 animationName: "jump",
                 key: "jump",
             },
-            {
-                tag: "fall",
-                condition: function () { return groundRay.hit === null && activeState.velocity.y < 0; },
-                action: function () { },
-                animationName: "fall",
-                key: "fall",
-            },
             {
                 tag: "ride",
                 condition: function () { return states.isPush["keyR"]; },
@@ -57,19 +48,32 @@ export function subscribeActions(_a) {
                 animationName: "ride",
                 key: "ride",
             },
+            {
+                tag: "land",
+                condition: function () { return states.isLanding; },
+                action: function () { },
+                animationName: "land",
+                key: "land",
+            },
+            {
+                tag: "fall",
+                condition: function () { return states.isFalling; },
+                action: function () { },
+                animationName: "fall",
+                key: "fall",
+            },
         ]);
     }, []);
-    return {
-        animationResult: animationResult,
-    };
 }
 export default function playActions(_a) {
-    var _b;
-    var type = _a.type, animationResult = _a.animationResult, currentAnimation = _a.currentAnimation;
-    var _c = useContext(GaesupWorldContext), mode = _c.mode, animationState = _c.animationState, block = _c.block;
+    var _b, _c;
+    var type = _a.type, actions = _a.actions, animationRef = _a.animationRef, currentAnimation = _a.currentAnimation, isActive = _a.isActive;
+    var _d = useContext(GaesupWorldContext), mode = _d.mode, animationState = _d.animationState, block = _d.block;
     var dispatch = useContext(GaesupWorldDispatchContext);
-    var _d = useGaesupAnimation({ type: type }), notify = _d.notify, store = _d.store;
-    var actions = animationResult.actions, ref = animationResult.ref;
+    var _e = useGaesupAnimation({ type: type }), notify = _e.notify, store = _e.store;
+    if (isActive) {
+        currentAnimation = (_b = animationState === null || animationState === void 0 ? void 0 : animationState[type]) === null || _b === void 0 ? void 0 : _b.current;
+    }
     var play = function (tag) {
         animationState[type].current = tag;
         var currentAnimation = store[tag];
@@ -99,25 +103,15 @@ export default function playActions(_a) {
         return function () {
             action === null || action === void 0 ? void 0 : action.fadeOut(0.2);
         };
-    }, [currentAnimation, mode.type, block.animation]);
+    }, [currentAnimation, mode.type, block.animation, type]);
     useFrame(function () {
-        if (!currentAnimation) {
+        if (isActive) {
             var tag = notify();
             play(tag);
         }
     });
     return {
-        animationRef: ref,
-        currentAnimation: (_b = animationState === null || animationState === void 0 ? void 0 : animationState[type]) === null || _b === void 0 ? void 0 : _b.current,
+        animationRef: animationRef,
+        currentAnimation: (_c = animationState === null || animationState === void 0 ? void 0 : animationState[type]) === null || _c === void 0 ? void 0 : _c.current,
     };
 }
-export var setAnimation = function (_a) {
-    var currentAnimation = _a.currentAnimation, actions = _a.actions, type = _a.type;
-    useEffect(function () {
-        var _a;
-        var action = (_a = actions[currentAnimation]) === null || _a === void 0 ? void 0 : _a.reset().fadeIn(0.2).play();
-        return function () {
-            action === null || action === void 0 ? void 0 : action.fadeOut(0.2);
-        };
-    }, [currentAnimation, type]);
-};

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

@@ -13,7 +13,7 @@ export default function orbit(prop) {
     if (!state || !state.camera)
         return;
     var cameraPosition = makeOrbitCameraPosition(activeState, cameraOption);
-    state.camera.position.lerp(cameraPosition, 1);
+    state.camera.position.lerp(cameraPosition.clone(), 0.2);
     state.camera.quaternion.copy(activeState.quat
         .clone()
         .multiply(quat().setFromAxisAngle(V3(0, 1, 0), Math.PI)));

package/dist/gaesup/camera/index.js

@@ -2,33 +2,7 @@ import { useFrame } from "@react-three/fiber";
 import normal, { makeNormalCameraPosition } from "./control/normal";
 import orbit from "./control/orbit";
 export default function Camera(prop) {
-    // const worldContext = useContext(GaesupWorldContext);
-    // const controllerContext = useContext(GaesupControllerContext);
-    // const { mode, cameraOption, activeState } = worldContext;
-    // const cameraRef = useRef<CameraControls>();
-    // const intersectObjectMap: intersectObjectMapType = useMemo(() => ({}), []);
-    // const cameraProp: cameraPropType = {
-    //   ...prop,
-    //   // control,
-    //   controllerContext,
-    //   worldContext,
-    //   // intersectObjectMap,
-    // };
-    // cameraProp.cameraRay.rayCast = new THREE.Raycaster(
-    //   cameraProp.cameraRay.origin,
-    //   cameraProp.cameraRay.dir,
-    //   0,
-    //   -cameraOption.maxDistance
-    // );
-    useFrame(function (state, delta) {
-        // if (
-        //   !rigidBodyRef ||
-        //   !rigidBodyRef.current ||
-        //   !outerGroupRef ||
-        //   !outerGroupRef.current
-        // )
-        //   return;
-        // cameraProp.delta = delta;
+    useFrame(function (state) {
         prop.state = state;
         if (!prop.worldContext.block.camera) {
             if (prop.worldContext.mode.control === "orbit") {
@@ -39,12 +13,6 @@ export default function Camera(prop) {
             }
         }
     });
-    // zoom
-    // useEffect(() => {
-    //   if (cameraRef.current) {
-    //     cameraRef.current.zoomTo(worldContext.cameraOption.zoom, true);
-    //   }
-    // }, [worldContext.cameraOption.zoom]);
     // 포커스가 아닐 때 카메라 activeStae 따라가기
     useFrame(function () {
         if (!prop.worldContext.cameraOption.focus) {

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

@@ -1,11 +1,9 @@
 import { ReactNode } from "react";
 import * as THREE from "three";
-import { controllerInnerType, groundRayType, refsType } from "../../../controller/type";
+import { refsType } from "../../../controller/type";
 import { urlsType } from "../../../world/context/type";
-export declare function AirplaneRef({ children, props, groundRay, enableRiding, isRiderOn, offset, refs, urls, }: {
+export declare function AirplaneRef({ children, enableRiding, isRiderOn, offset, refs, urls, }: {
     children: ReactNode;
-    props: controllerInnerType;
-    groundRay: groundRayType;
     enableRiding?: boolean;
     isRiderOn?: boolean;
     offset?: THREE.Vector3;

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

@@ -1,38 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { vec3 } from "@react-three/rapier";
-import playActions, { subscribeActions } from "../../../animation/actions";
-import initCallback from "../../../controller/initialize/callback";
-import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
 import { AirplaneInnerRef } from "../../inner/airplane";
-import { setGroundRay } from "../../inner/common/setGroundRay";
 export function AirplaneRef(_a) {
-    var children = _a.children, props = _a.props, groundRay = _a.groundRay, enableRiding = _a.enableRiding, isRiderOn = _a.isRiderOn, offset = _a.offset, refs = _a.refs, urls = _a.urls;
-    var colliderRef = refs.colliderRef;
-    var _b = useGltfAndSize({ url: urls.vehicleUrl }), size = _b.size, gltf = _b.gltf;
-    groundRay.offset = vec3({
-        x: 0,
-        y: size.y * 5,
-        z: 0,
-    });
-    setGroundRay({
-        groundRay: groundRay,
-        length: size.y * 5,
-        colliderRef: colliderRef,
-    });
-    var animationResult = subscribeActions({
-        type: "airplane",
-        groundRay: groundRay,
-        animations: gltf.animations,
-    }).animationResult;
-    var currentAnimation = playActions({
-        type: "airplane",
-        animationResult: animationResult,
-    }).currentAnimation;
-    // callback
-    initCallback({
-        props: props,
-        animationResult: animationResult,
-        type: "airplane",
-    });
-    return (_jsx(AirplaneInnerRef, { refs: refs, urls: urls, isRiderOn: isRiderOn, enableRiding: enableRiding, offset: offset, currentAnimation: currentAnimation, children: children }));
+    var children = _a.children, enableRiding = _a.enableRiding, isRiderOn = _a.isRiderOn, offset = _a.offset, refs = _a.refs, urls = _a.urls;
+    return (_jsx(AirplaneInnerRef, { refs: refs, urls: urls, name: "airplane", isRiderOn: isRiderOn, enableRiding: enableRiding, offset: offset, outerGroupRef: refs.outerGroupRef, innerGroupRef: refs.innerGroupRef, rigidBodyRef: refs.rigidBodyRef, colliderRef: refs.colliderRef, isActive: true, currentAnimation: "idle", componentType: "airplane", children: children }));
 }

package/dist/gaesup/component/active/character/index.js

@@ -1,39 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { vec3 } from "@react-three/rapier";
-import playActions, { subscribeActions } from "../../../animation/actions";
-import initCallback from "../../../controller/initialize/callback";
-import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
-import { CharacterInnerRef, calcCharacterColliderProps, } from "../../inner/character";
-import { setGroundRay } from "../../inner/common/setGroundRay";
+import { CharacterInnerRef } from "../../inner/character";
 export function CharacterRef(_a) {
     var props = _a.props, refs = _a.refs, urls = _a.urls;
-    var colliderRef = refs.colliderRef;
-    var _b = useGltfAndSize({ url: urls.characterUrl }), size = _b.size, gltf = _b.gltf;
-    var collider = calcCharacterColliderProps(size);
-    props.groundRay.offset = vec3({
-        x: 0,
-        y: (collider === null || collider === void 0 ? void 0 : collider.halfHeight) ? -(collider === null || collider === void 0 ? void 0 : collider.halfHeight) : -1,
-        z: 0,
-    });
-    setGroundRay({
-        groundRay: props.groundRay,
-        length: ((collider === null || collider === void 0 ? void 0 : collider.height) || 0) + 2,
-        colliderRef: colliderRef,
-    });
-    var animationResult = subscribeActions({
-        type: "character",
-        groundRay: props.groundRay,
-        animations: gltf.animations,
-    }).animationResult;
-    var _c = playActions({
-        type: "character",
-        animationResult: animationResult,
-    }), animationRef = _c.animationRef, currentAnimation = _c.currentAnimation;
-    // callback
-    initCallback({
-        props: props,
-        animationResult: animationResult,
-        type: "character",
-    });
-    return (_jsx(CharacterInnerRef, { animationRef: animationRef, refs: refs, urls: urls, currentAnimation: currentAnimation, children: props.children }));
+    return (_jsx(CharacterInnerRef, { refs: refs, urls: urls, outerGroupRef: refs.outerGroupRef, innerGroupRef: refs.innerGroupRef, rigidBodyRef: refs.rigidBodyRef, colliderRef: refs.colliderRef, isActive: true, componentType: "character", children: props.children }));
 }

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

@@ -1,11 +1,9 @@
 import { ReactNode } from "react";
 import * as THREE from "three";
-import { controllerInnerType, groundRayType, refsType } from "../../../controller/type";
+import { refsType } from "../../../controller/type";
 import { urlsType } from "../../../world/context/type";
-export declare function VehicleRef({ children, props, groundRay, enableRiding, isRiderOn, offset, refs, urls, }: {
+export declare function VehicleRef({ children, enableRiding, isRiderOn, offset, refs, urls, }: {
     children: ReactNode;
-    props: controllerInnerType;
-    groundRay: groundRayType;
     enableRiding?: boolean;
     isRiderOn?: boolean;
     offset?: THREE.Vector3;

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

@@ -1,38 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { vec3 } from "@react-three/rapier";
-import playActions, { subscribeActions } from "../../../animation/actions";
-import initCallback from "../../../controller/initialize/callback";
-import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
-import { setGroundRay } from "../../inner/common/setGroundRay";
 import { VehicleInnerRef } from "../../inner/vehicle";
 export function VehicleRef(_a) {
-    var children = _a.children, props = _a.props, groundRay = _a.groundRay, enableRiding = _a.enableRiding, isRiderOn = _a.isRiderOn, offset = _a.offset, refs = _a.refs, urls = _a.urls;
-    var colliderRef = refs.colliderRef;
-    var _b = useGltfAndSize({ url: urls.vehicleUrl }), size = _b.size, gltf = _b.gltf;
-    groundRay.offset = vec3({
-        x: 0,
-        y: size.y * 3,
-        z: 0,
-    });
-    setGroundRay({
-        groundRay: groundRay,
-        length: size.y * 3,
-        colliderRef: colliderRef,
-    });
-    var animationResult = subscribeActions({
-        type: "vehicle",
-        groundRay: groundRay,
-        animations: gltf.animations,
-    }).animationResult;
-    var currentAnimation = playActions({
-        type: "vehicle",
-        animationResult: animationResult,
-    }).currentAnimation;
-    // callback
-    initCallback({
-        props: props,
-        animationResult: animationResult,
-        type: "vehicle",
-    });
-    return (_jsx(VehicleInnerRef, { refs: refs, urls: urls, isRiderOn: isRiderOn, enableRiding: enableRiding, offset: offset, currentAnimation: currentAnimation, children: children }));
+    var children = _a.children, enableRiding = _a.enableRiding, isRiderOn = _a.isRiderOn, offset = _a.offset, refs = _a.refs, urls = _a.urls;
+    return (_jsx(VehicleInnerRef, { refs: refs, urls: urls, name: "vehicle", isRiderOn: isRiderOn, enableRiding: enableRiding, offset: offset, outerGroupRef: refs.outerGroupRef, innerGroupRef: refs.innerGroupRef, rigidBodyRef: refs.rigidBodyRef, colliderRef: refs.colliderRef, isActive: true, currentAnimation: "idle", componentType: "vehicle", children: children }));
 }

package/dist/gaesup/component/index.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { vec3 } from "@react-three/rapier";
 import { useContext } from "react";
-import calculation from "../physics";
 import { GaesupWorldContext } from "../world/context";
 import { AirplaneRef } from "./active/airplane";
 import { CharacterRef } from "./active/character";
@@ -10,10 +9,9 @@ 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 enableRiding = states.enableRiding, isRiderOn = states.isRiderOn, rideableId = states.rideableId;
-    calculation(props);
-    return (_jsxs(_Fragment, { children: [mode.type === "character" && (_jsx(CharacterRef, { props: props, refs: refs, urls: urls })), mode.type === "vehicle" && (_jsx(VehicleRef, { props: props, groundRay: props.groundRay, refs: refs, urls: urls, enableRiding: enableRiding, isRiderOn: isRiderOn, offset: rideableId && rideable[rideableId]
+    return (_jsxs(_Fragment, { children: [mode.type === "character" && (_jsx(CharacterRef, { props: props, refs: refs, urls: urls })), mode.type === "vehicle" && (_jsx(VehicleRef, { refs: refs, urls: urls, enableRiding: enableRiding, isRiderOn: isRiderOn, offset: rideableId && rideable[rideableId]
                     ? rideable[rideableId].offset
-                    : vec3(), children: props.children })), mode.type === "airplane" && (_jsx(AirplaneRef, { props: props, groundRay: props.groundRay, refs: refs, urls: urls, enableRiding: enableRiding, isRiderOn: isRiderOn, offset: rideableId && rideable[rideableId]
+                    : vec3(), children: props.children })), mode.type === "airplane" && (_jsx(AirplaneRef, { refs: refs, urls: urls, enableRiding: enableRiding, isRiderOn: isRiderOn, offset: rideableId && rideable[rideableId]
                     ? rideable[rideableId].offset
                     : vec3(), children: props.children }))] }));
 }

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

@@ -1,2 +1,2 @@
-import { refPropsType } from "../common/type";
-export declare function AirplaneInnerRef({ children, refs, urls, isRiderOn, enableRiding, offset, name, position, rotation, userData, onCollisionEnter, type, }: refPropsType): import("react/jsx-runtime").JSX.Element;
+import { vehicleInnerType } from "../vehicle/type";
+export declare function AirplaneInnerRef(props: vehicleInnerType): import("react/jsx-runtime").JSX.Element;

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

@@ -1,16 +1,24 @@
+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 { CuboidCollider } from "@react-three/rapier";
 import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
-import { InnerGroupRef } from "../common/InnerGroupRef";
 import { OuterGroupRef } from "../common/OuterGroupRef";
 import { RigidBodyRef } from "../common/RigidbodyRef";
-import RiderRef from "../rider";
-export function AirplaneInnerRef(_a) {
-    var children = _a.children, refs = _a.refs, urls = _a.urls, isRiderOn = _a.isRiderOn, enableRiding = _a.enableRiding, offset = _a.offset, name = _a.name, position = _a.position, rotation = _a.rotation, userData = _a.userData, onCollisionEnter = _a.onCollisionEnter, type = _a.type;
-    var airplaneUrl = urls.airplaneUrl;
-    var rigidBodyRef = refs.rigidBodyRef, innerGroupRef = refs.innerGroupRef, outerGroupRef = refs.outerGroupRef;
+export function AirplaneInnerRef(props) {
+    var airplaneUrl = props.urls.airplaneUrl;
+    var _a = props.refs, rigidBodyRef = _a.rigidBodyRef, innerGroupRef = _a.innerGroupRef, outerGroupRef = _a.outerGroupRef, colliderRef = _a.colliderRef;
     var size = useGltfAndSize({
         url: airplaneUrl,
     }).size;
-    return (_jsx(OuterGroupRef, { ref: outerGroupRef, children: airplaneUrl && (_jsxs(RigidBodyRef, { ref: rigidBodyRef, name: name, position: position, rotation: rotation, userData: userData, onCollisionEnter: onCollisionEnter, type: type, children: [_jsx(CuboidCollider, { args: [size.x / 2, size.y / 2, size.z / 2], position: [0, size.y / 2, 0] }), children, _jsx(InnerGroupRef, { type: "airplane", url: airplaneUrl, currentAnimation: "idle", ref: innerGroupRef, children: enableRiding && isRiderOn && urls.characterUrl && (_jsx(RiderRef, { urls: urls, offset: offset })) })] })) }));
+    return (_jsx(OuterGroupRef, { ref: outerGroupRef, children: airplaneUrl && (_jsxs(RigidBodyRef, __assign({ ref: rigidBodyRef, name: props.name, url: props.urls.vehicleUrl, outerGroupRef: outerGroupRef, innerGroupRef: innerGroupRef, rigidBodyRef: rigidBodyRef, colliderRef: colliderRef, componentType: "vehicle" }, props, { children: [_jsx(CuboidCollider, { args: [size.x / 2, size.y / 2, size.z / 2], position: [0, size.y / 2, 0] }), props.children] }))) }));
 }

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

@@ -1,9 +1,5 @@
-import { refsType } from "../../../controller/type";
-import { RigidBodyTypeString } from "@react-three/rapier";
-import { ReactNode, Ref } from "react";
 import * as THREE from "three";
-import { Object3D, Object3DEventMap } from "three";
-import { urlsType } from "../../../world/context/type";
+import { characterInnerType } from "./type";
 export declare const calcCharacterColliderProps: (characterSize: THREE.Vector3) => {
     height: number;
     halfHeight: number;
@@ -16,14 +12,4 @@ export type characterColliderType = {
     radius: number;
     diameter: number;
 };
-export declare function CharacterInnerRef({ children, refs, urls, position, euler, currentAnimation, positionLerp, type, }: {
-    children: ReactNode;
-    refs: Partial<refsType>;
-    urls: urlsType;
-    position?: THREE.Vector3;
-    euler?: THREE.Euler;
-    animationRef?: Ref<Object3D<Object3DEventMap>>;
-    currentAnimation?: string;
-    positionLerp?: number;
-    type?: RigidBodyTypeString;
-}): import("react/jsx-runtime").JSX.Element;
+export declare function CharacterInnerRef(props: characterInnerType): import("react/jsx-runtime").JSX.Element;

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

@@ -1,7 +1,15 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { CapsuleCollider } from "@react-three/rapier";
-import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
-import { InnerGroupRef } from "../common/InnerGroupRef";
+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 } from "react/jsx-runtime";
 import { OuterGroupRef } from "../common/OuterGroupRef";
 import { RigidBodyRef } from "../common/RigidbodyRef";
 export var calcCharacterColliderProps = function (characterSize) {
@@ -19,10 +27,7 @@ export var calcCharacterColliderProps = function (characterSize) {
         diameter: diameter,
     };
 };
-export function CharacterInnerRef(_a) {
-    var children = _a.children, refs = _a.refs, urls = _a.urls, position = _a.position, euler = _a.euler, currentAnimation = _a.currentAnimation, positionLerp = _a.positionLerp, type = _a.type;
-    var outerGroupRef = refs.outerGroupRef, rigidBodyRef = refs.rigidBodyRef, colliderRef = refs.colliderRef, innerGroupRef = refs.innerGroupRef;
-    var size = useGltfAndSize({ url: urls.characterUrl }).size;
-    var collider = calcCharacterColliderProps(size);
-    return (_jsx(_Fragment, { children: collider && (_jsx(OuterGroupRef, { ref: outerGroupRef, children: _jsxs(RigidBodyRef, { ref: rigidBodyRef, name: "character", position: position, positionLerp: positionLerp, rotation: euler, type: type, children: [_jsx(CapsuleCollider, { ref: colliderRef, args: [collider.height, collider.radius], position: [0, collider.height + collider.radius, 0] }), _jsx(InnerGroupRef, { type: "character", ref: innerGroupRef, url: urls.characterUrl, currentAnimation: currentAnimation, children: children })] }) })) }));
+export function CharacterInnerRef(props) {
+    var _a = props.refs, outerGroupRef = _a.outerGroupRef, rigidBodyRef = _a.rigidBodyRef, colliderRef = _a.colliderRef, innerGroupRef = _a.innerGroupRef;
+    return (_jsx(OuterGroupRef, { ref: outerGroupRef, children: _jsx(RigidBodyRef, __assign({ ref: rigidBodyRef, name: "character", url: props.urls.characterUrl, outerGroupRef: outerGroupRef, innerGroupRef: innerGroupRef, rigidBodyRef: rigidBodyRef, colliderRef: colliderRef }, props, { children: props.children })) }));
 }

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

@@ -0,0 +1,18 @@
+import { RigidBodyTypeString } from "@react-three/rapier";
+import { ReactNode } from "react";
+import * as THREE from "three";
+import { refsType } from "../../../controller/type";
+import { propInnerType } from "../../../physics/type";
+import { urlsType } from "../../../world/context/type";
+export type characterInnerType = {
+    children: ReactNode;
+    refs: Partial<refsType>;
+    urls: urlsType;
+    position?: THREE.Vector3;
+    positionLerp?: number;
+    euler?: THREE.Euler;
+    type?: RigidBodyTypeString;
+    componentType: "character" | "vehicle" | "airplane";
+    currentAnimation?: string;
+    isActive?: boolean;
+} & propInnerType;

package/dist/gaesup/component/inner/character/type.js

@@ -0,0 +1 @@
+export {};

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

@@ -1,10 +1,11 @@
-/// <reference types="react" />
+import { MutableRefObject } from "react";
 import * as THREE from "three";
 export type InnerGroupRefType = {
     children?: React.ReactNode;
-    type: "character" | "vehicle" | "airplane";
-    currentAnimation: string;
-    url: string;
-    rotation?: THREE.Euler;
+    objectNode: THREE.Object3D;
+    animationRef: MutableRefObject<THREE.Object3D<THREE.Object3DEventMap>>;
+    nodes: {
+        [name: string]: THREE.Object3D<THREE.Object3DEventMap>;
+    };
 };
 export declare const InnerGroupRef: import("react").ForwardRefExoticComponent<InnerGroupRefType & import("react").RefAttributes<THREE.Group<THREE.Object3DEventMap>>>;

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

@@ -1,37 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useFrame, useGraph } from "@react-three/fiber";
-import { forwardRef, useContext, useMemo } from "react";
+import { forwardRef } from "react";
 import * as THREE from "three";
-import { SkeletonUtils } from "three-stdlib";
-import { useAnimations, useGLTF } from "@react-three/drei";
-import playActions from "../../../animation/actions";
-import Camera from "../../../camera";
-import { GaesupControllerContext } from "../../../controller/context";
-import { GaesupWorldContext } from "../../../world/context";
 export var InnerGroupRef = forwardRef(function (_a, ref) {
-    var children = _a.children, type = _a.type, currentAnimation = _a.currentAnimation, url = _a.url, rotation = _a.rotation;
-    var _b = useGLTF(url), scene = _b.scene, animations = _b.animations;
-    var animationResult = useAnimations(animations);
-    var animationRef = playActions({
-        type: type,
-        animationResult: animationResult,
-        currentAnimation: currentAnimation,
-    }).animationRef;
-    var clone = useMemo(function () { return SkeletonUtils.clone(scene); }, [scene]);
-    var nodes = useGraph(clone).nodes;
-    var objectNode = Object.values(nodes).find(function (node) { return node.type === "Object3D"; });
-    var worldContext = useContext(GaesupWorldContext);
-    var controllerContext = useContext(GaesupControllerContext);
-    var props = {
-        state: null,
-        worldContext: worldContext,
-        controllerContext: controllerContext,
-    };
-    useFrame(function (state, delta) {
-        props.state = state;
-    });
-    Camera(props);
-    return (_jsxs("group", { receiveShadow: true, castShadow: true, ref: ref, rotation: rotation, userData: { intangible: true }, children: [children, objectNode && animationRef && (_jsx("primitive", { object: objectNode, visible: false, receiveShadow: true, castShadow: true, ref: animationRef })), Object.keys(nodes).map(function (name, key) {
+    var children = _a.children, objectNode = _a.objectNode, animationRef = _a.animationRef, nodes = _a.nodes;
+    return (_jsxs("group", { receiveShadow: true, castShadow: true, ref: ref, userData: { intangible: true }, children: [children, objectNode && animationRef && (_jsx("primitive", { object: objectNode, visible: false, receiveShadow: true, castShadow: true, ref: animationRef })), Object.keys(nodes).map(function (name, key) {
                 var node = nodes[name];
                 if (node instanceof THREE.SkinnedMesh) {
                     return (_jsx("skinnedMesh", { castShadow: true, receiveShadow: true, material: node.material, geometry: node.geometry, skeleton: node.skeleton }, key));

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

@@ -1,15 +1,19 @@
-import { CollisionEnterPayload, RapierRigidBody, RigidBodyTypeString } from "@react-three/rapier";
-import { ReactNode } from "react";
+/// <reference types="react" />
+import { RapierRigidBody } from "@react-three/rapier";
 import * as THREE from "three";
 export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
-    children: ReactNode;
+    children: import("react").ReactNode;
     name?: string;
     position?: THREE.Vector3;
     rotation?: THREE.Euler;
     userData?: {
         intangible: boolean;
     };
-    onCollisionEnter?: (e: CollisionEnterPayload) => Promise<void>;
+    onCollisionEnter?: (e: import("@react-three/rapier").CollisionEnterPayload) => Promise<void>;
     positionLerp?: number;
-    type?: RigidBodyTypeString;
-} & import("react").RefAttributes<RapierRigidBody>>;
+    type?: import("@react-three/rapier").RigidBodyTypeString;
+    url: string;
+    isActive?: boolean;
+    currentAnimation?: string;
+    componentType: "vehicle" | "airplane" | "character";
+} & import("../../../physics/type").propInnerType & import("react").RefAttributes<RapierRigidBody>>;