gaesup-world 0.0.772 → 0.0.781

package/dist/gaesup/camera/index.js

@@ -25,8 +25,7 @@ export default function Camera(_a) {
     var controllerContext = useContext(GaesupControllerContext);
     var cameraMode = controllerContext.cameraMode, perspectiveCamera = controllerContext.perspectiveCamera, orthographicCamera = controllerContext.orthographicCamera;
     var rigidBodyRef = refs.rigidBodyRef, outerGroupRef = refs.outerGroupRef;
-    var cameraRay = prop.cameraRay;
-    var _b = useThree(), camera = _b.camera, scene = _b.scene;
+    var scene = useThree().scene;
     var activeState = worldContext.activeState;
     var intersectObjectMap = useMemo(function () { return ({}); }, []);
     var cameraProp = __assign(__assign({}, prop), { control: control, controllerContext: controllerContext, worldContext: worldContext, intersectObjectMap: intersectObjectMap });

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { CapsuleCollider, useRapier } from "@react-three/rapier";
 import { forwardRef, useContext } from "react";
 import { getRayHit, useForwardRef } from "../../../utils";
@@ -20,5 +20,5 @@ export var CharacterCapsuleCollider = forwardRef(function (_a, ref) {
     slopeRay.rayCast = new rapier.Ray(slopeRay.origin, slopeRay.dir);
     slopeRay.length = collider.radius + 3;
     slopeRay.rayCast = new rapier.Ray(slopeRay.origin, slopeRay.dir);
-    return (_jsx(_Fragment, { children: _jsx(CapsuleCollider, { ref: ref, args: [collider.height, collider.radius], position: [0, collider.height + collider.radius, 0] }) }));
+    return (_jsx(CapsuleCollider, { ref: ref, args: [collider.height, collider.radius], position: [0, collider.height + collider.radius, 0] }));
 });

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

@@ -8,7 +8,7 @@ import { WrapperRef } from "../common/WrapperRef";
 export function CharacterRef(_a) {
     var props = _a.props, refs = _a.refs;
     initCallback(props);
-    var _b = useContext(GaesupWorldContext), characterGltf = _b.characterGltf, characterCollider = _b.characterCollider, vehicleCollider = _b.vehicleCollider;
+    var characterGltf = useContext(GaesupWorldContext).characterGltf;
     var ref = playCharacterActions({
         groundRay: props.groundRay,
     }).ref;

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

@@ -2,6 +2,9 @@ import { RapierRigidBody } from "@react-three/rapier";
 import { ReactNode } from "react";
 import { controllerInnerType } from "../../../controller/type";
 export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
+    children: ReactNode;
+} & import("react").RefAttributes<RapierRigidBody>>;
+export declare const PassiveRigidBodyRef: import("react").ForwardRefExoticComponent<{
     props: controllerInnerType;
     children: ReactNode;
 } & import("react").RefAttributes<RapierRigidBody>>;

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

@@ -13,6 +13,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { RigidBody } from "@react-three/rapier";
 import { forwardRef } from "react";
 export var RigidBodyRef = forwardRef(function (_a, ref) {
+    var children = _a.children;
+    return (_jsx(RigidBody, { colliders: false, ref: ref, children: children }));
+});
+export var PassiveRigidBodyRef = forwardRef(function (_a, ref) {
     var props = _a.props, children = _a.children;
     return (_jsx(RigidBody, __assign({ colliders: false, ref: ref }, props.rigidBodyProps, { children: children })));
 });

package/dist/gaesup/component/active/common/WrapperRef.js

@@ -5,5 +5,5 @@ import { SlopeRayRef } from "../common/slopeRayRef";
 import { RigidBodyRef } from "./RigidbodyRef";
 export function WrapperRef(_a) {
     var children = _a.children, outerChildren = _a.outerChildren, props = _a.props, refs = _a.refs, gltf = _a.gltf, animationRef = _a.animationRef;
-    return (_jsxs(OuterGroupRef, { ref: refs.outerGroupRef, props: props, children: [_jsxs(RigidBodyRef, { ref: refs.rigidBodyRef, props: props, children: [_jsx(SlopeRayRef, { slopeRay: props.slopeRay, groundRay: props.groundRay, ref: refs.slopeRayOriginRef }), children, props.children, _jsx(InnerGroupRef, { props: props, gltf: gltf, ref: refs.innerGroupRef, animationRef: animationRef })] }), outerChildren] }));
+    return (_jsxs(OuterGroupRef, { ref: refs.outerGroupRef, props: props, children: [_jsxs(RigidBodyRef, { ref: refs.rigidBodyRef, children: [_jsx(SlopeRayRef, { slopeRay: props.slopeRay, groundRay: props.groundRay, ref: refs.slopeRayOriginRef }), children, props.children, _jsx(InnerGroupRef, { props: props, gltf: gltf, ref: refs.innerGroupRef, animationRef: animationRef })] }), outerChildren] }));
 }

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

@@ -9,5 +9,5 @@ export var WheelRegidBodyRef = forwardRef(function (_a, ref) {
     var wheelSizeX = collider.wheelSizeX, wheelSizeY = collider.wheelSizeY;
     useRevoluteJoint(bodyRef, wheel, [bodyAnchor, wheelAnchor, rotationAxis]);
     var colliderRef = useRef(null);
-    return (_jsxs(RigidBody, { position: wheelPosition, colliders: false, ref: ref, userData: { intangible: true }, children: [_jsx(CylinderCollider, { args: [wheelSizeX / 2, wheelSizeY / 2], rotation: [0, 0, Math.PI / 2], ref: colliderRef }), _jsx(Gltf, { src: url.wheelUrl })] }));
+    return (_jsxs(RigidBody, { colliders: false, ref: ref, userData: { intangible: true }, args: [wheelSizeX / 2, wheelSizeY / 2], rotation: [0, 0, Math.PI / 2], children: [_jsx(CylinderCollider, { args: [wheelSizeX / 2, wheelSizeY / 2], rotation: [0, 0, Math.PI / 2], ref: colliderRef }), _jsx(Gltf, { src: url.wheelUrl })] }));
 });

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

@@ -1,16 +1,14 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { createRef, useContext, useRef } from "react";
-import { GaesupControllerContext } from "../../../controller/context";
 import { GaesupWorldContext } from "../../../world/context";
 import { WheelRegidBodyRef } from "./wheel";
 export function Wheels(_a) {
     var props = _a.props;
     var rigidBodyRef = props.rigidBodyRef;
-    var wheelOffset = useContext(GaesupControllerContext).vehicle.wheelOffset;
     var collider = useContext(GaesupWorldContext).vehicleCollider;
     var vehicleSizeX = collider.vehicleSizeX, vehicleSizeZ = collider.vehicleSizeZ, wheelSizeX = collider.wheelSizeX, wheelSizeZ = collider.wheelSizeZ;
-    var X = (vehicleSizeX - wheelSizeX) / 2 + wheelOffset;
-    var Z = (vehicleSizeZ - 2 * wheelSizeZ) / 2 + wheelOffset;
+    var X = (vehicleSizeX - wheelSizeX) / 2 + 0.5;
+    var Z = (vehicleSizeZ - 2 * wheelSizeZ) / 2 + 0.5;
     var wheelPositions = [
         [-X, 0, Z],
         [-X, 0, -Z],

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

@@ -1,6 +1,4 @@
 import { controllerInnerType, refsType } from "../controller/type";
-import { gaesupPassivePropsType } from "../hooks/useGaesupController";
-export declare function GaesupPassiveComponent(props: gaesupPassivePropsType): import("react/jsx-runtime").JSX.Element;
 export declare function GaesupComponent({ props, refs, }: {
     props: controllerInnerType;
     refs: refsType;

package/dist/gaesup/component/index.js

@@ -5,13 +5,6 @@ import { GaesupWorldContext } from "../world/context";
 import { AirplaneRef } from "./active/airplane";
 import { CharacterRef } from "./active/character";
 import { VehicleRef } from "./active/vehicle";
-import { PassiveAirplane } from "./passive/airplane";
-import { PassiveCharacter } from "./passive/character";
-import { PassiveVehicle } from "./passive/vehicle";
-export function GaesupPassiveComponent(props) {
-    var mode = props.mode;
-    return (_jsxs(_Fragment, { children: [mode.type === "character" && _jsx(PassiveCharacter, { props: props }), mode.type === "vehicle" && _jsx(PassiveVehicle, { props: props }), mode.type === "airplane" && _jsx(PassiveAirplane, { props: props })] }));
-}
 export function GaesupComponent(_a) {
     var props = _a.props, refs = _a.refs;
     var mode = useContext(GaesupWorldContext).mode;

package/dist/gaesup/component/passive/airplane/collider.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="react" />
 import { Collider } from "@dimforge/rapier3d-compat";
-import { airplaneColliderType } from "../../../world/context/type";
 export declare const AirplaneCollider: import("react").ForwardRefExoticComponent<{
-    collider: airplaneColliderType;
+    airplaneSize: THREE.Vector3;
 } & import("react").RefAttributes<Collider>>;

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

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { CuboidCollider } from "@react-three/rapier";
 import { forwardRef } from "react";
 export var AirplaneCollider = forwardRef(function (_a, ref) {
-    var collider = _a.collider;
-    var airplaneSizeX = collider.airplaneSizeX, airplaneSizeY = collider.airplaneSizeY, airplaneSizeZ = collider.airplaneSizeZ;
-    return (_jsx(CuboidCollider, { ref: ref, args: [airplaneSizeX / 2, airplaneSizeY / 2, airplaneSizeZ / 2], position: [0, airplaneSizeY / 2, 0] }));
+    var airplaneSize = _a.airplaneSize;
+    return (_jsx(CuboidCollider, { ref: ref, args: [airplaneSize.x / 2, airplaneSize.y / 2, airplaneSize.z / 2], position: [0, airplaneSize.y / 2, 0] }));
 });

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

@@ -1,4 +1,2 @@
-import { gaesupPassivePropsType } from "../../../hooks/useGaesupController";
-export declare function PassiveAirplane({ props }: {
-    props: gaesupPassivePropsType;
-}): import("react/jsx-runtime").JSX.Element;
+import { passiveAirplanePropsType } from "./type";
+export declare function PassiveAirplane(props: passiveAirplanePropsType): import("react/jsx-runtime").JSX.Element;

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

@@ -1,25 +1,39 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useRef } from "react";
-import mutation from "../../../mutation";
-import { PassiveWrapperRef } from "../common/PassiveWrapperRef";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useFrame } from "@react-three/fiber";
+import { quat } from "@react-three/rapier";
+import { useMemo, useRef } from "react";
+import { InnerGroupRef } from "../common/InnerGroupRef";
+import { OuterGroupRef } from "../common/OuterGroupRef";
+import { RigidBodyRef } from "../common/RigidbodyRef";
 import { AirplaneCollider } from "./collider";
-export function PassiveAirplane(_a) {
-    var _b;
-    var props = _a.props;
+export function PassiveAirplane(props) {
     var rigidBodyRef = useRef(null);
     var outerGroupRef = useRef(null);
     var innerGroupRef = useRef(null);
-    var characterInnerRef = useRef(null);
+    var colliderRef = useRef(null);
     var refs = {
         rigidBodyRef: rigidBodyRef,
         outerGroupRef: outerGroupRef,
         innerGroupRef: innerGroupRef,
-        characterInnerRef: characterInnerRef,
+        colliderRef: colliderRef,
     };
-    mutation({
-        refs: refs,
-        props: props,
-        delta: 0.9,
+    var _a = useMemo(function () {
+        return {
+            position: props.position,
+            euler: props.euler,
+            currentAnimation: props.currentAnimation,
+            airplaneUrl: props.airplaneUrl,
+        };
+    }, [props]), position = _a.position, euler = _a.euler, currentAnimation = _a.currentAnimation, airplaneUrl = _a.airplaneUrl;
+    useFrame(function () {
+        if (innerGroupRef && innerGroupRef.current) {
+            innerGroupRef.current.setRotationFromQuaternion(quat()
+                .setFromEuler(innerGroupRef.current.rotation.clone())
+                .slerp(quat().setFromEuler(euler), 0.1));
+        }
+        if (rigidBodyRef && rigidBodyRef.current) {
+            rigidBodyRef.current.setGravityScale(props.gravity, false);
+        }
     });
-    return (_jsx(PassiveWrapperRef, { props: props, refs: refs, url: (_b = props.url) === null || _b === void 0 ? void 0 : _b.airplaneUrl, children: _jsx(AirplaneCollider, { collider: props.airplaneCollider }) }));
+    return (_jsx(OuterGroupRef, { ref: refs.outerGroupRef, children: props.airplaneUrl && (_jsxs(RigidBodyRef, { ref: refs.rigidBodyRef, position: props.position, rotation: props.euler, children: [_jsx(InnerGroupRef, { currentAnimation: props.currentAnimation, ref: refs.innerGroupRef, url: props.airplaneUrl }), _jsx(AirplaneCollider, { airplaneSize: props.airplaneSize, ref: colliderRef })] })) }));
 }

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+export type passiveAirplanePropsType = {
+    position: THREE.Vector3;
+    euler: THREE.Euler;
+    airplaneSize: THREE.Vector3;
+    airplaneUrl: string;
+    currentAnimation: string;
+    children?: React.ReactNode;
+    gravity?: number;
+};

package/dist/gaesup/component/passive/character/collider.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { Collider } from "@dimforge/rapier3d-compat";
-import { characterColliderType } from "../../../world/context/type";
 export declare const CharacterCapsuleCollider: import("react").ForwardRefExoticComponent<{
-    collider: characterColliderType;
+    height: number;
+    diameter: number;
 } & import("react").RefAttributes<Collider>>;

package/dist/gaesup/component/passive/character/collider.js

@@ -2,6 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { CapsuleCollider } from "@react-three/rapier";
 import { forwardRef } from "react";
 export var CharacterCapsuleCollider = forwardRef(function (_a, ref) {
-    var collider = _a.collider;
-    return (_jsx(CapsuleCollider, { ref: ref, args: [collider.height, collider.radius], position: [0, collider.height + collider.radius, 0] }));
+    var height = _a.height, diameter = _a.diameter;
+    return (_jsx(CapsuleCollider, { ref: ref, args: [height, diameter / 2], position: [0, height + diameter / 2, 0] }));
 });

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

@@ -1,4 +1,2 @@
-import { gaesupPassivePropsType } from "../../../hooks/useGaesupController";
-export declare function PassiveCharacter({ props }: {
-    props: gaesupPassivePropsType;
-}): import("react/jsx-runtime").JSX.Element;
+import { passiveCharacterPropsType } from "./type";
+export declare function PassiveCharacter(props: passiveCharacterPropsType): import("react/jsx-runtime").JSX.Element;

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

@@ -1,25 +1,39 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useRef } from "react";
-import mutation from "../../../mutation";
-import { PassiveWrapperRef } from "../common/PassiveWrapperRef";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useFrame } from "@react-three/fiber";
+import { quat } from "@react-three/rapier";
+import { useEffect, useMemo, useRef } from "react";
+import { InnerGroupRef } from "../common/InnerGroupRef";
+import { OuterGroupRef } from "../common/OuterGroupRef";
+import { RigidBodyRef } from "../common/RigidbodyRef";
 import { CharacterCapsuleCollider } from "./collider";
-export function PassiveCharacter(_a) {
-    var _b;
-    var props = _a.props;
+export function PassiveCharacter(props) {
     var rigidBodyRef = useRef(null);
     var outerGroupRef = useRef(null);
     var innerGroupRef = useRef(null);
-    var characterInnerRef = useRef(null);
+    var colliderRef = useRef(null);
     var refs = {
         rigidBodyRef: rigidBodyRef,
         outerGroupRef: outerGroupRef,
         innerGroupRef: innerGroupRef,
-        characterInnerRef: characterInnerRef,
+        capsuleColliderRef: colliderRef,
     };
-    mutation({
-        refs: refs,
-        props: props,
-        delta: 0.9,
+    var _a = useMemo(function () {
+        return {
+            position: props.position,
+            euler: props.euler,
+            currentAnimation: props.currentAnimation,
+            characterUrl: props.url.characterUrl,
+        };
+    }, [props]), position = _a.position, euler = _a.euler, currentAnimation = _a.currentAnimation, characterUrl = _a.characterUrl;
+    useEffect(function () {
+        if (rigidBodyRef || rigidBodyRef.current) {
+            rigidBodyRef.current.setEnabledRotations(false, false, false, false);
+        }
+    }, []);
+    useFrame(function (_, delta) {
+        if (innerGroupRef && innerGroupRef.current) {
+            innerGroupRef.current.quaternion.rotateTowards(quat().setFromEuler(euler), 10 * delta);
+        }
     });
-    return (_jsx(PassiveWrapperRef, { props: props, refs: refs, url: (_b = props.url) === null || _b === void 0 ? void 0 : _b.characterUrl, children: _jsx(CharacterCapsuleCollider, { collider: props.characterCollider }) }));
+    return (_jsxs(OuterGroupRef, { ref: refs.outerGroupRef, children: [props.children, characterUrl && (_jsxs(RigidBodyRef, { ref: refs.rigidBodyRef, position: position, children: [_jsx(CharacterCapsuleCollider, { height: props.height, diameter: props.diameter, ref: colliderRef }), _jsx(InnerGroupRef, { currentAnimation: currentAnimation, ref: refs.innerGroupRef, url: characterUrl })] }))] }));
 }

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

@@ -0,0 +1,27 @@
+/// <reference types="react" />
+import { refsType } from "../../../controller/type";
+import { activeStateType, characterColliderType, modeType, urlType } from "../../../world/context/type";
+export type gaesupPassiveCharacterPropsType = {
+    state: activeStateType;
+    characterCollider?: characterColliderType;
+    mode: modeType;
+    url: urlType;
+    currentAnimation: string;
+    children?: React.ReactNode;
+};
+export type passiveCharacterPropsType = {
+    position: THREE.Vector3;
+    euler: THREE.Euler;
+    height: number;
+    diameter: number;
+    url: urlType;
+    currentAnimation: string;
+    children?: React.ReactNode;
+};
+export type mutateCharacterPropsType = {
+    position: THREE.Vector3;
+    euler: THREE.Euler;
+    height: number;
+    diameter: number;
+    delta?: number;
+} & Partial<refsType>;

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

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

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

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import * as THREE from "three";
-import { gaesupPassivePropsType } from "../../../hooks/useGaesupController";
 export type InnerGroupRefType = {
-    props: gaesupPassivePropsType;
+    currentAnimation: string;
     url: string;
+    rotation?: THREE.Euler;
 };
 export declare const InnerGroupRef: import("react").ForwardRefExoticComponent<InnerGroupRefType & import("react").RefAttributes<THREE.Group<THREE.Object3DEventMap>>>;

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

@@ -6,16 +6,16 @@ import * as THREE from "three";
 import { SkeletonUtils } from "three-stdlib";
 import playPassiveActions from "../../../animation/passiveActions";
 export var InnerGroupRef = forwardRef(function (_a, ref) {
-    var props = _a.props, url = _a.url;
+    var currentAnimation = _a.currentAnimation, url = _a.url, rotation = _a.rotation;
     var _b = useGLTF(url), scene = _b.scene, animations = _b.animations;
     var animationRef = playPassiveActions({
-        current: props.currentAnimation,
+        current: currentAnimation,
         animations: animations,
     }).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"; });
-    return (_jsx(Suspense, { fallback: null, children: _jsxs("group", { receiveShadow: true, castShadow: true, ref: ref, userData: { intangible: true }, children: [objectNode && animationRef && (_jsx("primitive", { object: objectNode, visible: false, receiveShadow: true, castShadow: true, ref: animationRef })), Object.keys(nodes).map(function (name, key) {
+    return (_jsx(Suspense, { fallback: null, children: _jsxs("group", { receiveShadow: true, castShadow: true, ref: ref, rotation: rotation, userData: { intangible: true }, 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, userData: { intangible: true } }, key));

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

@@ -2,4 +2,6 @@ import { RapierRigidBody } from "@react-three/rapier";
 import { ReactNode } from "react";
 export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
     children: ReactNode;
+    position?: THREE.Vector3;
+    rotation?: THREE.Euler;
 } & import("react").RefAttributes<RapierRigidBody>>;

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

@@ -2,6 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { RigidBody } from "@react-three/rapier";
 import { forwardRef } from "react";
 export var RigidBodyRef = forwardRef(function (_a, ref) {
-    var children = _a.children;
-    return (_jsx(RigidBody, { colliders: false, ref: ref, userData: { intangible: true }, children: children }));
+    var children = _a.children, position = _a.position, rotation = _a.rotation;
+    return (_jsx(RigidBody, { colliders: false, ref: ref, position: position, rotation: rotation, userData: { intangible: true }, children: children }));
 });

package/dist/gaesup/component/passive/vehicle/collider.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { Collider } from "@dimforge/rapier3d-compat";
-import { urlType, vehicleColliderType } from "../../../world/context/type";
 export declare const VehicleCollider: import("react").ForwardRefExoticComponent<{
-    collider: vehicleColliderType;
-    url: urlType;
+    vehicleSize: THREE.Vector3;
+    wheelSize: THREE.Vector3;
 } & import("react").RefAttributes<Collider>>;

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

@@ -2,7 +2,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { CuboidCollider } from "@react-three/rapier";
 import { forwardRef } from "react";
 export var VehicleCollider = forwardRef(function (_a, ref) {
-    var collider = _a.collider, url = _a.url;
-    var vehicleSizeX = collider.vehicleSizeX, vehicleSizeY = collider.vehicleSizeY, vehicleSizeZ = collider.vehicleSizeZ;
-    return (_jsx(CuboidCollider, { ref: ref, args: [vehicleSizeX / 2, vehicleSizeY / 2, vehicleSizeZ / 2], position: [0, vehicleSizeY + url.wheelUrl ? collider.wheelSizeY : 0, 0] }));
+    var vehicleSize = _a.vehicleSize, wheelSize = _a.wheelSize;
+    return (_jsx(CuboidCollider, { ref: ref, args: [vehicleSize.x / 2, vehicleSize.y / 2, vehicleSize.z / 2], position: [0, vehicleSize.y + wheelSize.y || 0, 0] }));
 });

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

@@ -1,4 +1,2 @@
-import { gaesupPassivePropsType } from "../../../hooks/useGaesupController";
-export declare function PassiveVehicle({ props }: {
-    props: gaesupPassivePropsType;
-}): import("react/jsx-runtime").JSX.Element;
+import { passiveVehiclePropsType } from "./type";
+export declare function PassiveVehicle(props: passiveVehiclePropsType): import("react/jsx-runtime").JSX.Element;

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

@@ -1,26 +1,31 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { useRef } from "react";
-import mutation from "../../../mutation";
-import { PassiveWrapperRef } from "../common/PassiveWrapperRef";
-import { VehicleCollider } from "./collider";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { CuboidCollider } from "@react-three/rapier";
+import { useMemo, useRef } from "react";
+import { InnerGroupRef } from "../common/InnerGroupRef";
+import { OuterGroupRef } from "../common/OuterGroupRef";
+import { RigidBodyRef } from "../common/RigidbodyRef";
 import { Wheels } from "./wheels";
-export function PassiveVehicle(_a) {
-    var _b, _c, _d;
-    var props = _a.props;
+export function PassiveVehicle(props) {
     var rigidBodyRef = useRef(null);
     var outerGroupRef = useRef(null);
     var innerGroupRef = useRef(null);
-    var characterInnerRef = useRef(null);
+    var colliderRef = useRef(null);
     var refs = {
         rigidBodyRef: rigidBodyRef,
         outerGroupRef: outerGroupRef,
         innerGroupRef: innerGroupRef,
-        characterInnerRef: characterInnerRef,
+        capsuleColliderRef: colliderRef,
     };
-    mutation({
-        refs: refs,
-        props: props,
-        delta: 0.9,
-    });
-    return (_jsx(PassiveWrapperRef, { props: props, refs: refs, url: (_b = props.url) === null || _b === void 0 ? void 0 : _b.vehicleUrl, outerChildren: ((_c = props.url) === null || _c === void 0 ? void 0 : _c.wheelUrl) ? (_jsx(Wheels, { props: props, rigidBodyRef: rigidBodyRef, url: (_d = props.url) === null || _d === void 0 ? void 0 : _d.wheelUrl })) : (_jsx(_Fragment, {})), children: props.vehicleCollider && (_jsx(VehicleCollider, { collider: props.vehicleCollider, url: props.url })) }));
+    var _a = useMemo(function () {
+        return {
+            position: props.position,
+            euler: props.euler,
+            vehicleSize: props.vehicleSize,
+            wheelSize: props.wheelSize,
+            currentAnimation: props.currentAnimation,
+            wheelUrl: props.url.wheelUrl,
+            vehicleUrl: props.url.vehicleUrl,
+        };
+    }, [props]), position = _a.position, euler = _a.euler, vehicleSize = _a.vehicleSize, wheelSize = _a.wheelSize, currentAnimation = _a.currentAnimation, wheelUrl = _a.wheelUrl, vehicleUrl = _a.vehicleUrl;
+    return (_jsxs(OuterGroupRef, { ref: refs.outerGroupRef, children: [props.children, vehicleUrl && (_jsxs(RigidBodyRef, { ref: refs.rigidBodyRef, position: position, rotation: euler, children: [_jsx(InnerGroupRef, { currentAnimation: currentAnimation, ref: refs.innerGroupRef, url: vehicleUrl }), _jsx(CuboidCollider, { ref: colliderRef, args: [vehicleSize.x / 2, vehicleSize.y / 2, vehicleSize.z / 2], position: [0, vehicleSize.y + wheelSize.y || 0, 0] })] })), wheelUrl && (_jsx(Wheels, { vehicleSize: vehicleSize, wheelSize: wheelSize, rigidBodyRef: rigidBodyRef, url: wheelUrl }))] }));
 }

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

@@ -0,0 +1,19 @@
+/// <reference types="react" />
+import { activeStateType, characterColliderType, modeType, urlType } from "../../../world/context/type";
+export type gaesupPassiveCharacterPropsType = {
+    state: activeStateType;
+    characterCollider?: characterColliderType;
+    mode: modeType;
+    url: urlType;
+    currentAnimation: string;
+    children?: React.ReactNode;
+};
+export type passiveVehiclePropsType = {
+    position: THREE.Vector3;
+    euler: THREE.Euler;
+    vehicleSize: THREE.Vector3;
+    wheelSize: THREE.Vector3;
+    url: urlType;
+    currentAnimation: string;
+    children?: React.ReactNode;
+};

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

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

package/dist/gaesup/component/passive/vehicle/wheel.d.ts

@@ -1,6 +1,5 @@
 import { RapierRigidBody } from "@react-three/rapier";
 import { RefObject } from "react";
-import { vehicleColliderType } from "../../../world/context/type";
 export type wheelRegidBodyType = {
     wheelPosition: [number, number, number];
     bodyRef: RefObject<RapierRigidBody>;
@@ -8,7 +7,7 @@ export type wheelRegidBodyType = {
     bodyAnchor: THREE.Vector3Tuple;
     wheelAnchor: THREE.Vector3Tuple;
     rotationAxis: THREE.Vector3Tuple;
-    vehicleCollider: vehicleColliderType;
+    wheelSize: THREE.Vector3;
     url: string;
 };
 export declare const WheelRegidBodyRef: import("react").ForwardRefExoticComponent<{

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

@@ -1,10 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Gltf } from "@react-three/drei";
 import { CylinderCollider, RigidBody, useRevoluteJoint, } from "@react-three/rapier";
-import { forwardRef } from "react";
+import { forwardRef, useRef } from "react";
 export var WheelRegidBodyRef = forwardRef(function (_a, ref) {
     var props = _a.props;
-    var _b = props.vehicleCollider, wheelSizeX = _b.wheelSizeX, wheelSizeY = _b.wheelSizeY, bodyRef = props.bodyRef, wheel = props.wheel, bodyAnchor = props.bodyAnchor, wheelAnchor = props.wheelAnchor, rotationAxis = props.rotationAxis, wheelPosition = props.wheelPosition, url = props.url;
-    useRevoluteJoint(bodyRef, wheel, [bodyAnchor, wheelAnchor, rotationAxis]);
-    return (_jsxs(RigidBody, { position: wheelPosition, colliders: false, ref: ref, children: [_jsx(CylinderCollider, { args: [wheelSizeX / 2, wheelSizeY / 2], rotation: [0, 0, Math.PI / 2] }), _jsx(Gltf, { src: url })] }));
+    var bodyRef = props.bodyRef, wheel = props.wheel, bodyAnchor = props.bodyAnchor, wheelAnchor = props.wheelAnchor, rotationAxis = props.rotationAxis, wheelPosition = props.wheelPosition, wheelSize = props.wheelSize, url = props.url;
+    useRevoluteJoint(bodyRef, wheel, [
+        bodyAnchor,
+        wheelAnchor,
+        rotationAxis,
+        [0, 0],
+    ]);
+    var refs = useRef(null);
+    return (_jsxs(RigidBody, { position: wheelPosition, colliders: false, ref: ref, children: [_jsx(CylinderCollider, { args: [wheelSize.x / 2, wheelSize.y / 2], rotation: [0, 0, Math.PI / 2], ref: refs }), _jsx(Gltf, { src: url })] }));
 });

package/dist/gaesup/component/passive/vehicle/wheels.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
 import { RapierRigidBody } from "@react-three/rapier";
-import { gaesupPassivePropsType } from "../../../hooks/useGaesupController";
 export type useSetWheelType = {
     wheelPositions: [number, number, number][];
 };
-export declare function Wheels({ props, rigidBodyRef, url, }: {
-    props: gaesupPassivePropsType;
+export declare function Wheels({ vehicleSize, wheelSize, rigidBodyRef, url, }: {
+    vehicleSize: THREE.Vector3;
+    wheelSize: THREE.Vector3;
     rigidBodyRef: React.MutableRefObject<RapierRigidBody>;
     url: string;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -2,11 +2,9 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { createRef, useRef } from "react";
 import { WheelRegidBodyRef } from "./wheel";
 export function Wheels(_a) {
-    var props = _a.props, rigidBodyRef = _a.rigidBodyRef, url = _a.url;
-    var wheelOffset = props.wheelOffset, collider = props.vehicleCollider;
-    var vehicleSizeX = collider.vehicleSizeX, vehicleSizeZ = collider.vehicleSizeZ, wheelSizeX = collider.wheelSizeX, wheelSizeZ = collider.wheelSizeZ;
-    var X = (vehicleSizeX - wheelSizeX) / 2 + wheelOffset;
-    var Z = (vehicleSizeZ - 2 * wheelSizeZ) / 2 + wheelOffset;
+    var vehicleSize = _a.vehicleSize, wheelSize = _a.wheelSize, rigidBodyRef = _a.rigidBodyRef, url = _a.url;
+    var X = (vehicleSize.x - wheelSize.x) / 2 + 0.5;
+    var Z = (vehicleSize.z - 2 * wheelSize.z) / 2 + 0.5;
     var wheelPositions = [
         [-X, 0, Z],
         [-X, 0, -Z],
@@ -19,7 +17,7 @@ export function Wheels(_a) {
                 bodyRef: rigidBodyRef,
                 wheel: wheelRefs.current[index],
                 bodyAnchor: wheelPosition,
-                vehicleCollider: collider,
+                wheelSize: wheelSize,
                 wheelAnchor: [0, 0, 0],
                 rotationAxis: [1, 0, 0],
                 url: url,

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

@@ -14,5 +14,4 @@ export type passiveRefsType = {
     rigidBodyRef: RefObject<RapierRigidBody>;
     outerGroupRef: RefObject<THREE.Group>;
     innerGroupRef: RefObject<THREE.Group>;
-    characterInnerRef: RefObject<THREE.Group>;
 };

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

@@ -59,7 +59,6 @@ export declare const gaesupControllerDefault: {
         innerGroupRef: any;
         slopeRayOriginRef: any;
         characterInnerRef: any;
-        jointRefs: any;
     };
     isRider: boolean;
 };

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

@@ -42,7 +42,7 @@ export var gaesupControllerDefault = {
         maxSpeed: 60,
         accelRatio: 2,
         brakeRatio: 5,
-        buoyancy: 0.5,
+        buoyancy: 0.2,
         linearDamping: 1,
     },
     vehicle: {
@@ -56,7 +56,7 @@ export var gaesupControllerDefault = {
         walkSpeed: 4,
         runSpeed: 10,
         turnSpeed: 10,
-        jumpSpeed: 5,
+        jumpSpeed: 0.5,
         linearDamping: 1,
     },
     callbacks: {
@@ -72,7 +72,6 @@ export var gaesupControllerDefault = {
         innerGroupRef: null,
         slopeRayOriginRef: null,
         characterInnerRef: null,
-        jointRefs: null,
     },
     isRider: false,
 };