gaesup-world 0.7.94 → 0.8.1

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,12 +38,6 @@ export declare const gaesupControllerDefault: {
         innerGroupRef: any;
         characterInnerRef: any;
     };
-    urls: {
-        airplaneUrl: any;
-        vehicleUrl: any;
-        characterUrl: any;
-        wheelUrl: any;
-    };
 };
 export declare const GaesupControllerContext: import("react").Context<gaesupControllerType>;
 export declare const GaesupControllerDispatchContext: import("react").Context<dispatchType<gaesupControllerType>>;

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

@@ -48,12 +48,6 @@ export var gaesupControllerDefault = {
         innerGroupRef: null,
         characterInnerRef: null,
     },
-    urls: {
-        airplaneUrl: null,
-        vehicleUrl: null,
-        characterUrl: null,
-        wheelUrl: null,
-    },
 };
 export var GaesupControllerContext = createContext(__assign({}, gaesupControllerDefault));
 export var GaesupControllerDispatchContext = createContext(null);

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

@@ -6,7 +6,6 @@ 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;
     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,
@@ -71,5 +70,5 @@ export function GaesupControllerInner(props) {
         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/type.d.ts

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

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/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/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/world/initalize/index.js

@@ -55,7 +55,7 @@ export default function initGaesupWorld(props) {
             },
         });
     }, []);
-    var gaesupProps = useMemo(function () { return ({ value: value, dispatch: dispatch }); }, [value, dispatch]);
+    var gaesupProps = useMemo(function () { return ({ value: value, dispatch: dispatch }); }, [value, value.block, dispatch]);
     initDebug({ value: gaesupProps.value, dispatch: dispatch });
     return {
         gaesupProps: gaesupProps,

package/package.json

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