gaesup-world 0.8.2 → 0.8.3

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 minimap = useContext(GaesupWorldContext).minimap;
+    var _c = useContext(GaesupWorldContext), minimap = _c.minimap, clickerOption = _c.clickerOption;
     var dispatch = useContext(GaesupWorldDispatchContext);
     // clicker
-    var moveClicker = useClicker().moveClicker;
+    var _d = useClicker(), moveClicker = _d.moveClicker, moveDoubleClicker = _d.moveDoubleClicker;
     useEffect(function () {
         if (groupRef.current) {
             var box = new THREE.Box3().setFromObject(groupRef.current);
@@ -42,5 +42,17 @@ export function GaeSupProps(_a) {
             });
         }
     }, []);
-    return (_jsx("group", { ref: groupRef, position: position, onPointerDown: function (e) { return moveClicker(e, false, type); }, onDoubleClick: function (e) { return moveClicker(e, true, type); }, children: children }));
+    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);
+            moveClicker(e, false, type);
+        }, onPointerUp: function (e) {
+            e.stopPropagation();
+            // Optionally release capture
+            e.target.releasePointerCapture(e.pointerId);
+        }, onDoubleClick: function (e) {
+            moveDoubleClicker(e, true, type);
+        }, children: children }));
 }

package/dist/gaesup/hooks/useClicker/index.d.ts

@@ -1,4 +1,5 @@
 import { ThreeEvent } from "@react-three/fiber";
 export declare function useClicker(): {
     moveClicker: (e: ThreeEvent<MouseEvent>, isRun: boolean, type: "normal" | "ground") => void;
+    moveDoubleClicker: (e: ThreeEvent<MouseEvent>, isRun: boolean, type: "normal" | "ground") => void;
 };

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

@@ -1,24 +1,37 @@
-import { useContext, useEffect } from "react";
-import { V3 } from "../../utils";
+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 { useContext } from "react";
+import { V3, calcNorm } from "../../utils";
 import { GaesupWorldContext, GaesupWorldDispatchContext, } from "../../world/context";
 export function useClicker() {
-    var _a = useContext(GaesupWorldContext), activeState = _a.activeState, clicker = _a.clicker, mode = _a.mode;
+    var _a = useContext(GaesupWorldContext), activeState = _a.activeState, mode = _a.mode, clicker = _a.clicker, clickerOption = _a.clickerOption;
     var dispatch = useContext(GaesupWorldDispatchContext);
     var moveClicker = function (e, isRun, type) {
         if (mode.controller !== "clicker" || type !== "ground")
             return;
-        var originPoint = activeState.position;
-        var newPosition = e.point;
-        var newAngle = Math.atan2(newPosition.z - originPoint.z, newPosition.x - originPoint.x);
-        var norm = Math.sqrt(Math.pow(newPosition.z - originPoint.z, 2) +
-            Math.pow(newPosition.x - originPoint.x, 2));
+        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 gap = calcNorm(v, clicker.point, true);
+        if (gap < 1)
+            return;
+        var newAngle = Math.atan2(v.z - u.z, v.x - u.x);
         dispatch({
             type: "update",
             payload: {
                 clicker: {
-                    point: V3(e.point.x, e.point.y, e.point.z),
+                    point: v,
                     angle: newAngle,
                     isOn: true,
                     isRun: isRun,
@@ -26,25 +39,18 @@ export function useClicker() {
             },
         });
     };
-    // 거리 계산
-    useEffect(function () {
-        if (mode.controller !== "clicker")
+    var moveDoubleClicker = function (e, isRun, type) {
+        if (!clicker.isOn || !clickerOption.isRun)
             return;
-        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]);
+        dispatch({
+            type: "update",
+            payload: {
+                clicker: __assign(__assign({}, clicker), { isRun: isRun }),
+            },
+        });
+    };
     return {
         moveClicker: moveClicker,
+        moveDoubleClicker: moveDoubleClicker,
     };
 }

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

@@ -1,8 +1,18 @@
+import { vec3 } from "@react-three/rapier";
+import { calcNorm } from "../../utils";
 export default function stop(prop) {
-    var _a = prop.worldContext, control = _a.control, clicker = _a.clicker, mode = _a.mode;
+    var _a;
+    var rigidBodyRef = prop.rigidBodyRef, _b = prop.worldContext, control = _b.control, clicker = _b.clicker, mode = _b.mode;
     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;
+    }
 }

package/dist/gaesup/utils/vector.d.ts

@@ -1,5 +1,6 @@
 import * as THREE from "three";
 export declare function isVectorNonZero(v: THREE.Vector3): boolean;
+export declare function calcNorm(u: THREE.Vector3, v: THREE.Vector3, calcZ: boolean): number;
 export declare function isValidOrZero(condision: boolean, vector: THREE.Vector3): THREE.Vector3;
 export declare function isValidOrOne(condision: boolean, vector: THREE.Vector3): THREE.Vector3;
 export declare function V3(x?: number, y?: number, z?: number): THREE.Vector3;

package/dist/gaesup/utils/vector.js

@@ -2,6 +2,11 @@ import * as THREE from "three";
 export function isVectorNonZero(v) {
     return v.toArray().every(function (value) { return value !== 0; });
 }
+export function calcNorm(u, v, calcZ) {
+    return Math.sqrt(Math.pow(u.x - v.x, 2) +
+        (calcZ && Math.pow(u.y - v.y, 2)) +
+        Math.pow(u.z - v.z, 2));
+}
 export function isValidOrZero(condision, vector) {
     return condision ? vector : new THREE.Vector3(0, 0, 0);
 }

package/package.json

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