gaesup-world 0.7.31 → 0.7.32

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

@@ -13,5 +13,5 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { CharacterInnerRef } from "../../inner/character";
 export function CharacterRef(_a) {
     var props = _a.props, refs = _a.refs, urls = _a.urls;
-    return (_jsx(CharacterInnerRef, __assign({ url: urls.characterUrl, isActive: true, componentType: "character", rigidbodyType: "dynamic", controllerOptions: props.controllerOptions }, refs, { children: props.children })));
+    return (_jsx(CharacterInnerRef, __assign({ url: urls.characterUrl, isActive: true, componentType: "character", rigidbodyType: "dynamic", controllerOptions: props.controllerOptions, onAnimate: props.onAnimate, onFrame: props.onFrame, onReady: props.onReady, onDestory: props.onDestory }, refs, { children: props.children })));
 }

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

@@ -1,6 +1,7 @@
+import { callbackType } from "../../../controller/initialize/callback/type";
 import { passiveCharacterPropsType } from "../../passive/character/type";
 import { componentTypeString, innerRefType } from "../../passive/type";
 export type characterInnerType = {
     componentType: componentTypeString;
     isActive?: boolean;
-} & passiveCharacterPropsType & innerRefType;
+} & passiveCharacterPropsType & innerRefType & callbackType;

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

@@ -25,4 +25,4 @@ export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
     userData?: {
         intangible: boolean;
     };
-} & import("./type").ridingType & import("../../passive/type").innerRefType & import("react").RefAttributes<RapierRigidBody>>;
+} & 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

@@ -8,6 +8,7 @@ import { SkeletonUtils } from "three-stdlib";
 import playActions, { subscribeActions } from "../../../animation/actions";
 import Camera from "../../../camera";
 import { GaesupControllerContext } from "../../../controller/context";
+import initCallback from "../../../controller/initialize/callback";
 import { useGltfAndSize } from "../../../hooks/useGaesupGltf";
 import calculation from "../../../physics";
 import { V3 } from "../../../utils";
@@ -77,6 +78,11 @@ export var RigidBodyRef = forwardRef(function (props, ref) {
         currentAnimation: props.isActive ? undefined : props.currentAnimation,
         isActive: props.isActive,
     });
+    initCallback({
+        props: props,
+        actions: actions,
+        componentType: props.componentType,
+    });
     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"; });

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

@@ -2,6 +2,7 @@ import { Collider } from "@dimforge/rapier3d-compat";
 import { CollisionEnterPayload, RigidBodyTypeString } from "@react-three/rapier";
 import { MutableRefObject, RefObject } from "react";
 import * as THREE from "three";
+import { callbackType } from "../../../controller/initialize/callback/type";
 import { groundRayType } from "../../../controller/type";
 import { urlsType } from "../../../world/context/type";
 import { innerRefType, passivePropsType } from "../../passive/type";
@@ -55,4 +56,4 @@ export type rigidBodyRefType = {
     onCollisionEnter?: (e: CollisionEnterPayload) => Promise<void>;
     isActive?: boolean;
     ridingUrl?: string;
-} & passivePropsType & innerRefType;
+} & passivePropsType & innerRefType & callbackType;

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

@@ -1,9 +1,13 @@
-import * as THREE from "three";
-import { Api } from "../../../animation/actions";
+import { AnimationAction } from "three";
+import { rigidBodyRefType } from "../../../component/inner/common/type";
+import { componentTypeString } from "../../../component/passive/type";
 import { animationTagType } from "../../type";
-export default function initCallback({ animationResult, type, }: {
-    animationResult: Api<THREE.AnimationClip>;
-    type: "character" | "vehicle" | "airplane";
+export default function initCallback({ props, actions, componentType, }: {
+    props: rigidBodyRefType;
+    actions: {
+        [x: string]: AnimationAction;
+    };
+    componentType: componentTypeString;
 }): {
     subscribe: ({ tag, condition, action, animationName, key, }: import("../../../world/context/type").animationAtomType) => void;
     playAnimation: (tag: keyof animationTagType, key: string) => void;

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

@@ -9,24 +9,22 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { useContext } from "react";
+import { useFrame } from "@react-three/fiber";
+import { useContext, useEffect } from "react";
 import { useGaesupAnimation } from "../../../hooks/useGaesupAnimation";
 import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../../world/context";
 export default function initCallback(_a) {
-    var 
-    // props,
-    animationResult = _a.animationResult, type = _a.type;
-    var actions = animationResult.actions;
+    var props = _a.props, actions = _a.actions, componentType = _a.componentType;
     var animationState = useContext(GaesupWorldContext).animationState;
     var dispatch = useContext(GaesupWorldDispatchContext);
-    var store = useGaesupAnimation({ type: type }).store;
+    var store = useGaesupAnimation({ type: componentType }).store;
     var _b = useContext(GaesupWorldContext), activeState = _b.activeState, states = _b.states, control = _b.control;
-    var subscribe = useGaesupAnimation({ type: type }).subscribe;
+    var subscribe = useGaesupAnimation({ type: componentType }).subscribe;
     var playAnimation = function (tag, key) {
         if (!(key in control))
             return;
-        if (control[key]) {
-            animationState[type].current = tag;
+        if (control[key] && animationState[componentType]) {
+            animationState[componentType].current = tag;
             var currentAnimation = store[tag];
             if (currentAnimation === null || currentAnimation === void 0 ? void 0 : currentAnimation.action) {
                 currentAnimation.action();
@@ -39,39 +37,30 @@ export default function initCallback(_a) {
             });
         }
     };
-    //   const controllerProp: callbackPropType = {
-    //     ...props,
-    //     activeState,
-    //     control,
-    //     states,
-    //     subscribe,
-    //   };
-    //
-    //   useEffect(() => {
-    //     if (props.onReady) {
-    //       props.onReady(controllerProp);
-    //     }
-    //     return () => {
-    //       if (props.onDestory) {
-    //         props.onDestory(controllerProp);
-    //       }
-    //     };
-    //   }, []);
-    //
-    //   useFrame((prop) => {
-    //     if (props.onFrame) {
-    //       props.onFrame({ ...controllerProp, ...prop });
-    //     }
-    //     if (props.onAnimate) {
-    //       props.onAnimate({
-    //         ...controllerProp,
-    //         ...prop,
-    //         actions,
-    //         animationState,
-    //         playAnimation,
-    //       });
-    //     }
-    //   });
+    var controllerProp = {
+        activeState: activeState,
+        control: control,
+        states: states,
+        subscribe: subscribe,
+    };
+    useEffect(function () {
+        if (props.onReady) {
+            props.onReady(controllerProp);
+        }
+        return function () {
+            if (props.onDestory) {
+                props.onDestory(controllerProp);
+            }
+        };
+    }, []);
+    useFrame(function (prop) {
+        if (props.onFrame) {
+            props.onFrame(__assign(__assign({}, controllerProp), prop));
+        }
+        if (props.onAnimate) {
+            props.onAnimate(__assign(__assign(__assign({}, controllerProp), prop), { actions: actions, animationState: animationState, playAnimation: playAnimation }));
+        }
+    });
     return {
         subscribe: subscribe,
         playAnimation: playAnimation,

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

@@ -1,13 +1,10 @@
 import { RootState } from "@react-three/fiber";
 import * as THREE from "three";
-import { cameraRayType } from "../../../camera/type";
 import { activeStateType, animationAtomType, animationStateType, keyControlType, statesType } from "../../../world/context/type";
-import { actionsType, groundRayType } from "../../type";
+import { actionsType } from "../../type";
 export type callbackPropType = {
     activeState: activeStateType;
     states: statesType;
-    groundRay: groundRayType;
-    cameraRay: cameraRayType;
     control: keyControlType;
     subscribe: (props: animationAtomType) => void;
 };

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

@@ -51,7 +51,7 @@ export function MiniMap(props) {
                             (props.angle ? Math.sin(props.angle) : 1) *
                             scale;
                         var Z = (center.z - activeState.position.z) *
-                            (props.angle ? -Math.cos(props.angle) : 1) *
+                            (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)"), transformOrigin: "50% 50%", zIndex: 1 + key }, objectStyle) }, key), _jsx("div", { className: "imageObject", style: __assign({ width: "".concat(props.imageWidth * scale, "rem"), height: "".concat(props.imageHeight * scale, "rem"), top: "50%", left: "50%", transform: "translate(-50.1%, -50.1%) translate(".concat(-X, "rem, ").concat(-Z, "rem)"), transformOrigin: "50% 50%", zIndex: 1000 + key }, imageStyle) }, key + 10), _jsx("div", { className: "textObject", style: {
                                         width: "".concat(size.x * scale, "rem"),

package/package.json

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