gaesup-world 0.8.31 → 0.8.34

package/dist/gaesup/gaesupProps/index.js

@@ -18,10 +18,10 @@ import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../world/contex
 export function GaeSupProps(_a) {
     var _b = _a.type, type = _b === void 0 ? "normal" : _b, text = _a.text, position = _a.position, children = _a.children;
     var groupRef = useRef(null);
-    var _c = useContext(GaesupWorldContext), minimap = _c.minimap, clickerOption = _c.clickerOption;
+    var minimap = useContext(GaesupWorldContext).minimap;
     var dispatch = useContext(GaesupWorldDispatchContext);
     // clicker
-    var _d = useClicker(), moveClicker = _d.moveClicker, moveDoubleClicker = _d.moveDoubleClicker;
+    var _c = useClicker(), moveClicker = _c.moveClicker, moveDoubleClicker = _c.moveDoubleClicker;
     useEffect(function () {
         if (groupRef.current) {
             var box = new THREE.Box3().setFromObject(groupRef.current);
@@ -43,19 +43,12 @@ export function GaeSupProps(_a) {
         }
     }, []);
     return (_jsx("group", { ref: groupRef, position: position, onPointerDown: function (e) {
-            // Only the mesh closest to the camera will be processed
-            e.stopPropagation();
-            // You may optionally capture the target
-            e.target.setPointerCapture(e.pointerId);
-            if (e.srcElement instanceof HTMLDivElement) {
+            if (e.srcElement instanceof HTMLDivElement)
                 return;
-            }
             moveClicker(e, false, type);
-        }, onPointerUp: function (e) {
-            e.stopPropagation();
-            // Optionally release capture
-            e.target.releasePointerCapture(e.pointerId);
         }, onDoubleClick: function (e) {
+            if (e.srcElement instanceof HTMLDivElement)
+                return;
             moveDoubleClicker(e, true, type);
         }, children: children }));
 }

package/dist/gaesup/hooks/useClicker/index.js

@@ -9,26 +9,41 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { useContext } from "react";
-import { V3, calcNorm } from "../../utils";
+import { useContext, useEffect } from "react";
+import { V3 } from "../../utils";
 import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../world/context";
 export function useClicker() {
     var _a = useContext(GaesupWorldContext), activeState = _a.activeState, mode = _a.mode, clicker = _a.clicker, clickerOption = _a.clickerOption;
     var dispatch = useContext(GaesupWorldDispatchContext);
+    // autoStart
+    useEffect(function () {
+        if (clickerOption.autoStart) {
+            var u = activeState.position;
+            var v = clickerOption.queue.shift();
+            if (clickerOption.loop) {
+                clickerOption.queue.push(v);
+            }
+            var newAngle = Math.atan2(v.z - u.z, v.x - u.x);
+            dispatch({
+                type: "update",
+                payload: {
+                    clicker: __assign(__assign({}, clicker), { point: V3(v.x, 0, v.z), angle: newAngle, isOn: true }),
+                    clickerOption: __assign({}, clickerOption),
+                },
+            });
+        }
+    }, [clickerOption.autoStart]);
     var moveClicker = function (e, isRun, type) {
         if (mode.controller !== "clicker" || type !== "ground")
             return;
         var u = activeState.position;
         var v = V3(e.point.x, e.point.y, e.point.z);
-        var norm = calcNorm(u, v, false);
-        if (norm < 2)
-            return;
         var newAngle = Math.atan2(v.z - u.z, v.x - u.x);
         dispatch({
             type: "update",
             payload: {
                 clicker: {
-                    point: v,
+                    point: V3(v.x, 0, v.z),
                     angle: newAngle,
                     isOn: true,
                     isRun: isRun,

package/dist/gaesup/hooks/useMovePoint/index.js

@@ -1,16 +1,14 @@
-import { useContext, useEffect } from "react";
+import { vec3 } from "@react-three/rapier";
+import { useContext } from "react";
 import { V3 } from "../../utils";
 import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../world/context";
 export function useMovePoint() {
     var _a = useContext(GaesupWorldContext), activeState = _a.activeState, clicker = _a.clicker;
     var dispatch = useContext(GaesupWorldDispatchContext);
     var move = function (position, isRun) {
-        var originPoint = activeState.position;
-        var newAngle = Math.atan2(position.z - originPoint.z, position.x - originPoint.x);
-        var norm = Math.sqrt(Math.pow(position.z - originPoint.z, 2) +
-            Math.pow(position.x - originPoint.x, 2));
-        if (norm < 2)
-            return;
+        var u = activeState.position;
+        var v = vec3(position);
+        var newAngle = Math.atan2(v.z - u.z, v.x - u.x);
         dispatch({
             type: "update",
             payload: {
@@ -23,22 +21,6 @@ export function useMovePoint() {
             },
         });
     };
-    // 거리 계산
-    useEffect(function () {
-        var originPoint = activeState.position;
-        var newPosition = clicker.point;
-        var norm = Math.sqrt(Math.pow(newPosition.z - originPoint.z, 2) +
-            Math.pow(newPosition.x - originPoint.x, 2));
-        if (norm < 1) {
-            clicker.isOn = false;
-            dispatch({
-                type: "update",
-                payload: {
-                    clicker: clicker,
-                },
-            });
-        }
-    }, [activeState.position, clicker.point]);
     return {
         move: move,
     };

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

@@ -1,22 +1,5 @@
-import { joyStickInnerType } from "../../tools/joystick/type";
-import { activeStateType, clickerType, modeType } from "../../world/context/type";
+import { gaesupWorldContextType } from "../../world/context/type";
 import { calcType } from "../type";
-export declare function orbitDirection({ activeState, control, mode, joystick, clicker, }: {
-    activeState: activeStateType;
-    mode: modeType;
-    joystick: joyStickInnerType;
-    clicker: clickerType;
-    control: {
-        [key: string]: boolean;
-    };
-}): void;
-export declare function normalDirection({ activeState, control, mode, joystick, clicker, }: {
-    activeState: activeStateType;
-    mode: modeType;
-    joystick: joyStickInnerType;
-    clicker: clickerType;
-    control: {
-        [key: string]: boolean;
-    };
-}): void;
+export declare function orbitDirection({ activeState, control, mode, joystick, clicker, clickerOption, }: Partial<gaesupWorldContextType>): void;
+export declare function normalDirection({ activeState, control, mode, joystick, clicker, clickerOption, }: Partial<gaesupWorldContextType>): void;
 export default function direction(prop: calcType): void;

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

@@ -1,6 +1,6 @@
 import { V3, calcAngleByVector } from "../../utils/vector";
 export function orbitDirection(_a) {
-    var activeState = _a.activeState, control = _a.control, mode = _a.mode, joystick = _a.joystick, clicker = _a.clicker;
+    var activeState = _a.activeState, control = _a.control, mode = _a.mode, joystick = _a.joystick, clicker = _a.clicker, clickerOption = _a.clickerOption;
     var forward = control.forward, backward = control.backward, leftward = control.leftward, rightward = control.rightward;
     var dirX = Number(leftward) - Number(rightward);
     var dirZ = Number(forward) - Number(backward);
@@ -26,7 +26,7 @@ export function orbitDirection(_a) {
     activeState.dir = activeState.direction.normalize();
 }
 export function normalDirection(_a) {
-    var activeState = _a.activeState, control = _a.control, mode = _a.mode, joystick = _a.joystick, clicker = _a.clicker;
+    var activeState = _a.activeState, control = _a.control, mode = _a.mode, joystick = _a.joystick, clicker = _a.clicker, clickerOption = _a.clickerOption;
     var forward = control.forward, backward = control.backward, leftward = control.leftward, rightward = control.rightward;
     if (mode.controller === "joystick") {
         if (joystick.joyStickOrigin.isCenter)
@@ -52,11 +52,11 @@ export function normalDirection(_a) {
     }
 }
 export default function direction(prop) {
-    var _a = prop.worldContext, joystick = _a.joystick, mode = _a.mode, activeState = _a.activeState, control = _a.control, clicker = _a.clicker;
-    if (mode.control === "normal") {
-        normalDirection({ activeState: activeState, control: control, mode: mode, joystick: joystick, clicker: clicker });
+    var worldContext = prop.worldContext;
+    if (worldContext.mode.control === "normal") {
+        normalDirection(worldContext);
     }
-    else if (mode.control === "orbit") {
-        orbitDirection({ activeState: activeState, control: control, mode: mode, joystick: joystick, clicker: clicker });
+    else if (worldContext.mode.control === "orbit") {
+        orbitDirection(worldContext);
     }
 }

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

@@ -2,17 +2,28 @@ import { vec3 } from "@react-three/rapier";
 import { calcNorm } from "../../utils";
 export default function stop(prop) {
     var _a;
-    var rigidBodyRef = prop.rigidBodyRef, _b = prop.worldContext, control = _b.control, clicker = _b.clicker, mode = _b.mode;
+    var rigidBodyRef = prop.rigidBodyRef, _b = prop.worldContext, control = _b.control, clicker = _b.clicker, mode = _b.mode, clickerOption = _b.clickerOption;
     var keyS = control.keyS;
     if (keyS && mode.controller === "clicker") {
         clicker.isOn = false;
         clicker.isRun = false;
     }
-    // 목적지 도착
+    // 목적지 도착 (클리커 막기 로직)
     var u = vec3((_a = rigidBodyRef.current) === null || _a === void 0 ? void 0 : _a.translation());
     var norm = calcNorm(u, clicker.point, false);
     if (norm < 1 && mode.controller === "clicker") {
-        clicker.isOn = false;
-        clicker.isRun = false;
+        if (clickerOption.track && clickerOption.queue.length !== 0) {
+            clicker.point = clickerOption.queue.shift();
+            var v = vec3(clicker.point);
+            var newAngle = Math.atan2(v.z - u.z, v.x - u.x);
+            clicker.angle = newAngle;
+            if (clickerOption.loop) {
+                clickerOption.queue.push(clicker.point);
+            }
+        }
+        else {
+            clicker.isOn = false;
+            clicker.isRun = false;
+        }
     }
 }

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

@@ -1,8 +1,15 @@
-import { jsxs as _jsxs, Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { Line } from "@react-three/drei";
 import { useContext } from "react";
 import { GaesupWorldContext } from "../../world/context";
 export function Clicker(_a) {
     var onMarker = _a.onMarker, runMarker = _a.runMarker;
     var _b = useContext(GaesupWorldContext), clicker = _b.clicker, mode = _b.mode, clickerOption = _b.clickerOption;
-    return (_jsx(_Fragment, { children: mode.controller === "clicker" && (_jsxs("group", { position: clicker.point, children: [clicker.isOn && onMarker, clicker.isOn && clickerOption.isRun && clicker.isRun && runMarker] })) }));
+    return (_jsxs(_Fragment, { children: [mode.controller === "clicker" && (_jsxs("group", { position: clicker.point, children: [clicker.isOn && onMarker, clicker.isOn && clickerOption.isRun && clicker.isRun && runMarker] })), clickerOption.line &&
+                clickerOption.queue.map(function (item, key) {
+                    return (_jsxs("group", { position: [0, 1, 0], children: [key >= 1 && (_jsx(Line, { worldUnits: true, points: [
+                                    clickerOption.queue[key - 1],
+                                    clickerOption.queue[key],
+                                ], color: "turquoise", transparent: true, opacity: 0.5, lineWidth: 0.4 })), _jsxs("mesh", { position: item, children: [_jsx("sphereGeometry", { args: [0.6, 30, 0.6] }), _jsx("meshStandardMaterial", { color: "turquoise", transparent: true, opacity: 0.8 })] }, key)] }));
+                })] }));
 }

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

@@ -48,7 +48,6 @@ export function Rideable(props) {
     var _a;
     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 _rideable = useState({
         position: props.position || V3(0, 0, 0),
         rotation: props.rotation || euler(),

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

@@ -125,6 +125,11 @@ export var gaesupWorldDefault = {
     clickerOption: {
         isRun: true,
         throttle: 100,
+        autoStart: false,
+        track: false,
+        loop: false,
+        queue: [],
+        line: false,
     },
 };
 export var GaesupWorldContext = createContext(null);

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

@@ -108,8 +108,13 @@ export type clickerType = {
     isRun: boolean;
 };
 export type clickerOptionType = {
-    isRun: boolean;
-    throttle: number;
+    autoStart?: boolean;
+    isRun?: boolean;
+    throttle?: number;
+    track?: boolean;
+    loop?: boolean;
+    queue?: THREE.Vector3[];
+    line?: boolean;
 };
 export type wheelStateType = {
     position: THREE.Vector3;

package/dist/index.js

@@ -12,7 +12,6 @@ export { JumpPortal } from "./gaesup/tools/jumpPortal";
 export { KeyBoardToolTip } from "./gaesup/tools/keyBoardToolTip";
 export { MiniMap } from "./gaesup/tools/miniMap";
 export { Rideable } from "./gaesup/tools/rideable";
-// export { ZoomButton } from "./gaesup/tools/zoomButton";
 export { InnerHtml } from "./gaesup/utils/innerHtml";
 export { Elr, Qt, V3, V30, V31 } from "./gaesup/utils/vector";
 export { GaesupWorld } from "./gaesup/world";

package/package.json

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