gaesup-world 0.3.1 → 0.3.3

package/dist/gaesup/camera/index.js

@@ -29,22 +29,6 @@ export default function Camera(_a) {
     var cameraRef = useRef();
     var intersectObjectMap = useMemo(function () { return ({}); }, []);
     var cameraProp = __assign(__assign({}, prop), { control: control, controllerContext: controllerContext, worldContext: worldContext, intersectObjectMap: intersectObjectMap });
-    //   const getMeshs = (object: THREE.Object3D) => {
-    //     if (object.userData && object.userData.intangible) return;
-    //     if (
-    //       object instanceof THREE.Mesh &&
-    //       object.geometry.type !== "InstancedBufferGeometry"
-    //     ) {
-    //       intersectObjectMap[object.uuid] = object;
-    //     }
-    //     object.children.forEach((child) => {
-    //       getMeshs(child);
-    //     });
-    //   };
-    //
-    //   useEffect(() => {
-    //     scene.children.forEach((child) => getMeshs(child));
-    //   }, []);
     var position = useMemo(function () { return camera.position; }, []);
     var dir = useMemo(function () { return vec3(); }, []);
     cameraProp.cameraRay.rayCast = new THREE.Raycaster(cameraProp.cameraRay.origin, cameraProp.cameraRay.dir, 0, -cameraOption.maxDistance);

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

@@ -1,8 +1,10 @@
 import { ReactNode } from "react";
-import { refsType } from "../../../controller/type";
+import { controllerInnerType, groundRayType, refsType } from "../../../controller/type";
 import { urlsType } from "../../../world/context/type";
-export declare function AirplaneRef({ children, enableRiding, isRiderOn, offset, refs, urls, }: {
+export declare function AirplaneRef({ children, props, groundRay, 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,6 +1,38 @@
 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, enableRiding = _a.enableRiding, isRiderOn = _a.isRiderOn, offset = _a.offset, refs = _a.refs, urls = _a.urls;
-    return (_jsx(AirplaneInnerRef, { refs: refs, urls: urls, isRiderOn: isRiderOn, enableRiding: enableRiding, offset: offset, children: children }));
+    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 }));
 }

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

@@ -7,7 +7,6 @@ import { CharacterInnerRef, calcCharacterColliderProps, } from "../../inner/char
 import { setGroundRay } from "../../inner/common/setGroundRay";
 export function CharacterRef(_a) {
     var props = _a.props, refs = _a.refs, urls = _a.urls;
-    initCallback(props, "character");
     var colliderRef = refs.colliderRef;
     var _b = useGltfAndSize({ url: urls.characterUrl }), size = _b.size, gltf = _b.gltf;
     var collider = calcCharacterColliderProps(size);
@@ -30,5 +29,11 @@ export function CharacterRef(_a) {
         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 }));
 }

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

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

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

@@ -1,11 +1,12 @@
 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, groundRay = _a.groundRay, enableRiding = _a.enableRiding, isRiderOn = _a.isRiderOn, offset = _a.offset, refs = _a.refs, urls = _a.urls;
+    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({
@@ -23,9 +24,15 @@ export function VehicleRef(_a) {
         groundRay: groundRay,
         animations: gltf.animations,
     }).animationResult;
-    var _c = playActions({
+    var currentAnimation = playActions({
         type: "vehicle",
         animationResult: animationResult,
-    }), animationRef = _c.animationRef, currentAnimation = _c.currentAnimation;
+    }).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 }));
 }

package/dist/gaesup/component/index.js

@@ -11,9 +11,9 @@ export function GaesupComponent(_a) {
     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, { 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, { props: props, groundRay: props.groundRay, refs: refs, urls: urls, enableRiding: enableRiding, isRiderOn: isRiderOn, offset: rideableId && rideable[rideableId]
                     ? rideable[rideableId].offset
-                    : vec3(), children: props.children })), mode.type === "airplane" && (_jsx(AirplaneRef, { refs: refs, urls: urls, enableRiding: enableRiding, isRiderOn: isRiderOn, offset: rideableId && rideable[rideableId]
+                    : 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]
                     ? rideable[rideableId].offset
                     : vec3(), children: props.children }))] }));
 }

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

@@ -1,2 +1,7 @@
+import { Api } from "../../../animation/actions";
 import { controllerInnerType } from "../../type";
-export default function initCallback(props: controllerInnerType, type: "character" | "vehicle" | "airplane"): void;
+export default function initCallback({ props, animationResult, type, }: {
+    props: controllerInnerType;
+    animationResult: Api<THREE.AnimationClip>;
+    type: "character" | "vehicle" | "airplane";
+}): void;

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

@@ -1,62 +1,60 @@
-export default function initCallback(props, type) {
-    //   const {
-    //     characterGltf,
-    //     animations: characterAnimations,
-    //     activeState,
-    //     states,
-    //     control,
-    //   } = useContext(GaesupWorldContext);
-    //   const dispatch = useContext(GaesupWorldDispatchContext);
-    //   const { animations } = characterGltf;
-    //   const { actions } = useAnimations(animations, props.outerGroupRef);
-    //   const { subscribe } = useGaesupAnimation({ type });
-    //
-    //   const playAnimation = (tag: keyof animationTagType, key: string) => {
-    //     if (!(key in control)) return;
-    //     if (control[key]) {
-    //       characterAnimations.current = tag;
-    //       dispatch({
-    //         type: "update",
-    //         payload: {
-    //           animations: {
-    //             ...characterAnimations,
-    //           },
-    //         },
-    //       });
-    //     }
-    //   };
-    //
-    //   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,
-    //         animation: characterAnimations,
-    //         playAnimation,
-    //       });
-    //     }
-    //   });
+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 { 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 = _a.props, animationResult = _a.animationResult, type = _a.type;
+    var actions = animationResult.actions;
+    var animationState = useContext(GaesupWorldContext).animationState;
+    var dispatch = useContext(GaesupWorldDispatchContext);
+    var store = useGaesupAnimation({ type: type }).store;
+    var _b = useContext(GaesupWorldContext), activeState = _b.activeState, states = _b.states, control = _b.control;
+    var subscribe = useGaesupAnimation({ type: type }).subscribe;
+    var playAnimation = function (tag, key) {
+        if (!(key in control))
+            return;
+        if (control[key]) {
+            animationState[type].current = tag;
+            var currentAnimation = store[tag];
+            if (currentAnimation === null || currentAnimation === void 0 ? void 0 : currentAnimation.action) {
+                currentAnimation.action();
+            }
+            dispatch({
+                type: "update",
+                payload: {
+                    animationState: __assign({}, animationState),
+                },
+            });
+        }
+    };
+    var controllerProp = __assign(__assign({}, props), { 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 }));
+        }
+    });
 }

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

@@ -1,11 +1,10 @@
 import { RootState } from "@react-three/fiber";
 import { cameraRayType } from "../../../camera/type";
-import { activeStateType, animationAtomType, animationPropType, keyControlType, statesType } from "../../../world/context/type";
-import { actionsType, groundRayType, slopeRayType } from "../../type";
+import { activeStateType, animationAtomType, animationStateType, keyControlType, statesType } from "../../../world/context/type";
+import { actionsType, groundRayType } from "../../type";
 export type callbackPropType = {
     activeState: activeStateType;
     states: statesType;
-    slopeRay: slopeRayType;
     groundRay: groundRayType;
     cameraRay: cameraRayType;
     control: keyControlType;
@@ -16,7 +15,7 @@ export type onAnimatePropType = onFramePropType & {
     actions: {
         [x: string]: THREE.AnimationAction | null;
     };
-    animation: animationPropType;
+    animationState: animationStateType;
     playAnimation: (tag: keyof actionsType, key: string) => void;
 };
 export type callbackType = {

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

@@ -23,12 +23,26 @@ export default function initControllerProps(_a) {
     var keyControl = getKeys();
     useEffect(function () {
         if (context && keyControl && context.control) {
+            // 컨트롤 정하기
+            var newControl = {};
+            if (context.mode.controller === "keyboard") {
+                newControl = __assign({}, keyControl);
+            }
+            else if (context.mode.controller === "clicker") {
+                if (context.mode.isButton) {
+                    newControl = __assign({}, context.control);
+                }
+                else {
+                    newControl = __assign({}, keyControl);
+                }
+            }
+            else {
+                newControl = __assign({}, context.control);
+            }
             dispatch({
                 type: "update",
                 payload: {
-                    control: __assign({}, (context.mode.controller === "keyboard"
-                        ? keyControl
-                        : context.control)),
+                    control: __assign({}, newControl),
                 },
             });
         }

package/dist/gaesup/physics/character/index.js

@@ -1,8 +1,10 @@
 import direction from "./direction";
 import impulse from "./impulse";
 import innerCalc from "./innerCalc";
+import stop from "./stop";
 export default function characterCalculation(calcProp) {
     direction(calcProp);
     impulse(calcProp);
     innerCalc(calcProp);
+    stop(calcProp);
 }

package/dist/gaesup/physics/character/stop.d.ts

@@ -0,0 +1,2 @@
+import { calcPropType } from "../type";
+export default function stop(prop: calcPropType): void;

package/dist/gaesup/physics/character/stop.js

@@ -0,0 +1,8 @@
+export default function stop(prop) {
+    var _a = prop.worldContext, control = _a.control, clicker = _a.clicker, mode = _a.mode;
+    var keyS = control.keyS;
+    if (keyS && mode.controller === "clicker") {
+        clicker.isOn = false;
+        clicker.isRun = false;
+    }
+}

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

@@ -1,5 +1,5 @@
 export default function push(prop) {
-    var _a = prop.worldContext, states = _a.states, joystick = _a.joystick, mode = _a.mode, control = _a.control;
+    var _a = prop.worldContext, states = _a.states, control = _a.control;
     Object.keys(control).forEach(function (key) {
         states.isPush[key] = control[key];
     });

package/dist/gaesup/tools/gamePad/GamePadButton.js

@@ -14,7 +14,7 @@ export default function GamePadButton(_a) {
         pushKey(value, false);
         setIsClicked(false);
     };
-    return (_jsx("button", { className: "padButton ".concat(isClicked ? "isClicked" : ""), onMouseDown: function () { return onMouseDown(); }, onMouseUp: function () { return onMouseLeave(); }, onMouseLeave: function () { return onMouseLeave(); }, onContextMenu: function (e) {
+    return (_jsx("div", { className: "padButton ".concat(isClicked ? "isClicked" : ""), onMouseDown: function () { return onMouseDown(); }, onMouseUp: function () { return onMouseLeave(); }, onMouseLeave: function () { return onMouseLeave(); }, onContextMenu: function (e) {
             e.preventDefault();
             onMouseLeave();
         }, onPointerDown: function () { return onMouseDown(); }, onPointerUp: function () { return onMouseLeave(); }, style: gamePadButtonStyle, children: name }));

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

@@ -26,7 +26,9 @@ export function GamePad(props) {
         .filter(function (item) {
         return !(item.tag === "run" && mode.controller === "joystick");
     });
-    return (_jsx(_Fragment, { children: (mode.controller === "joystick" || mode.controller === "gameboy") && (_jsx("div", { className: "gamePad", style: gamePadStyle, children: GamePadDirections.map(function (item, key) {
+    return (_jsx(_Fragment, { children: (mode.controller === "joystick" ||
+            mode.controller === "gameboy" ||
+            mode.controller === "clicker") && (_jsx("div", { className: "gamePad", style: gamePadStyle, children: GamePadDirections.map(function (item, key) {
                 return (_jsx(GamePadButton, { value: item.value, name: item.name, gamePadButtonStyle: gamePadButtonStyle }, key));
             }) })) }));
 }

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

@@ -37,34 +37,35 @@ export function KeyBoardToolTip(props) {
         });
         return maps;
     }, {});
-    return (_jsx(_Fragment, { children: mode.controller === "keyboard" && (_jsx("div", { className: "keyBoardToolInner", style: keyBoardToolTipInnerStyle, children: keyArray.map(function (item, key) {
-                var background = "rgba(0, 0, 0, 0.1)";
-                var boxShadow = "0 0 5px rgba(0, 0, 0, 0.2)";
-                var isSelect = "none";
-                if (codeToActionObj[item.code]) {
-                    if (control[codeToActionObj[item.code]]) {
-                        isSelect = "select";
-                        background = "linear-gradient( 68.4deg,  rgba(99,251,215,1) -0.4%, rgba(5,222,250,1) 100.2% )";
-                        boxShadow = "0 0 10px rgba(99,251,215,1)";
+    return (_jsx(_Fragment, { children: mode.controller === "keyboard" ||
+            (mode.controller === "clicker" && !mode.isButton && (_jsx("div", { className: "keyBoardToolInner", style: keyBoardToolTipInnerStyle, children: keyArray.map(function (item, key) {
+                    var background = "rgba(0, 0, 0, 0.1)";
+                    var boxShadow = "0 0 5px rgba(0, 0, 0, 0.2)";
+                    var isSelect = "none";
+                    if (codeToActionObj[item.code]) {
+                        if (control[codeToActionObj[item.code]]) {
+                            isSelect = "select";
+                            background = "linear-gradient( 68.4deg,  rgba(99,251,215,1) -0.4%, rgba(5,222,250,1) 100.2% )";
+                            boxShadow = "0 0 10px rgba(99,251,215,1)";
+                        }
+                        else {
+                            isSelect = "notSelect";
+                            background = "rgba(0, 0, 0, 0.6)";
+                            boxShadow = "0 0 10px rgba(0, 0, 0, 0.6)";
+                        }
                     }
-                    else {
-                        isSelect = "notSelect";
-                        background = "rgba(0, 0, 0, 0.6)";
-                        boxShadow = "0 0 10px rgba(0, 0, 0, 0.6)";
+                    var color = "white";
+                    if (codeToActionObj[item.code] &&
+                        control[codeToActionObj[item.code]]) {
+                        color = "black";
                     }
-                }
-                var color = "white";
-                if (codeToActionObj[item.code] &&
-                    control[codeToActionObj[item.code]]) {
-                    color = "black";
-                }
-                var keyStyle = keyCapStyle;
-                if (isSelect === "select") {
-                    keyStyle = __assign({}, selectedKeyCapStyle);
-                }
-                else if (isSelect === "notSelect") {
-                    keyStyle = __assign({}, notSelectedkeyCapStyle);
-                }
-                return (_jsx("div", { className: "keyCap", style: __assign({ background: background, boxShadow: boxShadow, color: color, gridRow: item.gridRow, gridColumn: item.gridColumn }, keyStyle), children: item.name }, key));
-            }) })) }));
+                    var keyStyle = keyCapStyle;
+                    if (isSelect === "select") {
+                        keyStyle = __assign({}, selectedKeyCapStyle);
+                    }
+                    else if (isSelect === "notSelect") {
+                        keyStyle = __assign({}, notSelectedkeyCapStyle);
+                    }
+                    return (_jsx("div", { className: "keyCap", style: __assign({ background: background, boxShadow: boxShadow, color: color, gridRow: item.gridRow, gridColumn: item.gridColumn }, keyStyle), children: item.name }, key));
+                }) }))) }));
 }

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

@@ -82,6 +82,7 @@ export type modeType = {
     type?: "character" | "vehicle" | "airplane";
     controller?: "gameboy" | "keyboard" | "joystick" | "clicker";
     control?: "normal" | "orbit";
+    isButton?: boolean;
 };
 export type activeStateType = {
     position: THREE.Vector3;

package/package.json

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