gaesup-world 0.4.0 → 0.4.2

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

@@ -14,7 +14,7 @@ export type characterColliderType = {
     radius: number;
     diameter: number;
 };
-export declare function CharacterInnerRef({ children, refs, urls, position, euler, currentAnimation, }: {
+export declare function CharacterInnerRef({ children, refs, urls, position, euler, currentAnimation, positionLerp, }: {
     children: ReactNode;
     refs: Partial<refsType>;
     urls: urlsType;
@@ -22,4 +22,5 @@ export declare function CharacterInnerRef({ children, refs, urls, position, eule
     euler?: THREE.Euler;
     animationRef?: Ref<Object3D<Object3DEventMap>>;
     currentAnimation?: string;
+    positionLerp?: number;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -20,9 +20,9 @@ export var calcCharacterColliderProps = function (characterSize) {
     };
 };
 export function CharacterInnerRef(_a) {
-    var children = _a.children, refs = _a.refs, urls = _a.urls, position = _a.position, euler = _a.euler, currentAnimation = _a.currentAnimation;
+    var children = _a.children, refs = _a.refs, urls = _a.urls, position = _a.position, euler = _a.euler, currentAnimation = _a.currentAnimation, positionLerp = _a.positionLerp;
     var outerGroupRef = refs.outerGroupRef, rigidBodyRef = refs.rigidBodyRef, colliderRef = refs.colliderRef, innerGroupRef = refs.innerGroupRef;
     var size = useGltfAndSize({ url: urls.characterUrl }).size;
     var collider = calcCharacterColliderProps(size);
-    return (_jsx(_Fragment, { children: collider && (_jsx(OuterGroupRef, { ref: outerGroupRef, children: _jsxs(RigidBodyRef, { ref: rigidBodyRef, name: "character", position: position, rotation: euler, children: [_jsx(CapsuleCollider, { ref: colliderRef, args: [collider.height, collider.radius], position: [0, collider.height + collider.radius, 0] }), _jsx(InnerGroupRef, { type: "character", ref: innerGroupRef, url: urls.characterUrl, currentAnimation: currentAnimation, children: children })] }) })) }));
+    return (_jsx(_Fragment, { children: collider && (_jsx(OuterGroupRef, { ref: outerGroupRef, children: _jsxs(RigidBodyRef, { ref: rigidBodyRef, name: "character", position: position, positionLerp: positionLerp, rotation: euler, children: [_jsx(CapsuleCollider, { ref: colliderRef, args: [collider.height, collider.radius], position: [0, collider.height + collider.radius, 0] }), _jsx(InnerGroupRef, { type: "character", ref: innerGroupRef, url: urls.characterUrl, currentAnimation: currentAnimation, children: children })] }) })) }));
 }

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

@@ -9,4 +9,5 @@ export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
         intangible: boolean;
     };
     onCollisionEnter?: (e: CollisionEnterPayload) => Promise<void>;
+    positionLerp?: number;
 } & import("react").RefAttributes<RapierRigidBody>>;

package/dist/gaesup/component/inner/common/RigidbodyRef.js

@@ -1,7 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { RigidBody, euler, } from "@react-three/rapier";
-import { forwardRef } from "react";
+import { forwardRef, useEffect, useState, } from "react";
 export var RigidBodyRef = forwardRef(function (_a, ref) {
-    var children = _a.children, name = _a.name, position = _a.position, rotation = _a.rotation, userData = _a.userData, onCollisionEnter = _a.onCollisionEnter;
-    return (_jsx(RigidBody, { colliders: false, ref: ref, name: name, position: position, rotation: euler().set(0, (rotation === null || rotation === void 0 ? void 0 : rotation.clone().y) || 0, 0), userData: userData, onCollisionEnter: onCollisionEnter, children: children }));
+    var children = _a.children, name = _a.name, position = _a.position, rotation = _a.rotation, userData = _a.userData, onCollisionEnter = _a.onCollisionEnter, positionLerp = _a.positionLerp;
+    var _b = useState(position), newPosition = _b[0], setNewPosition = _b[1];
+    useEffect(function () {
+        if (!positionLerp)
+            return;
+        setNewPosition(function (ordPosition) {
+            return ordPosition.lerp(position.clone(), positionLerp);
+        });
+    }, [position, positionLerp]);
+    return (_jsx(RigidBody, { colliders: false, ref: ref, name: name, position: positionLerp ? newPosition === null || newPosition === void 0 ? void 0 : newPosition.clone() : position, rotation: euler().set(0, (rotation === null || rotation === void 0 ? void 0 : rotation.clone().y) || 0, 0), userData: userData, onCollisionEnter: onCollisionEnter, children: children }));
 });

package/dist/gaesup/component/passive/character/index.d.ts

@@ -7,5 +7,6 @@ export type passiveCharacterPropsType = {
     currentAnimation: string;
     gravityScale?: number;
     children?: React.ReactNode;
+    positionLerp?: number;
 };
 export declare function PassiveCharacter(props: passiveCharacterPropsType): import("react/jsx-runtime").JSX.Element;

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

@@ -29,8 +29,7 @@ export function PassiveCharacter(props) {
     useFrame(function (_, delta) {
         if (innerGroupRef && innerGroupRef.current) {
             innerGroupRef.current.quaternion.rotateTowards(quat().setFromEuler(euler), 10 * delta);
-            // innerGroupRef.current.position.copy(position);
         }
     });
-    return (_jsx(CharacterInnerRef, { position: position, refs: refs, urls: props.urls, currentAnimation: props.currentAnimation, children: props.children }));
+    return (_jsx(CharacterInnerRef, { position: position, refs: refs, urls: props.urls, currentAnimation: props.currentAnimation, positionLerp: props.positionLerp, children: props.children }));
 }

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

@@ -52,7 +52,7 @@ export function normalDirection(_a) {
     }
 }
 export default function direction(prop) {
-    var state = prop.state, _a = prop.worldContext, joystick = _a.joystick, mode = _a.mode, activeState = _a.activeState, control = _a.control, clicker = _a.clicker;
+    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 });
     }

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

@@ -32,13 +32,8 @@ export default function impulse(prop) {
         impulse.setZ(F.z);
     }
     rigidBodyRef.current.applyImpulse(impulse, true);
-    activeState.position =
-        // activeState.position.copy(
-        activeState.position
-            .clone()
-            .lerp(vec3(rigidBodyRef.current.translation()), 0.9);
-    // );
-    activeState.velocity.lerp(vec3(rigidBodyRef.current.linvel()), 0.9);
+    activeState.position = vec3(rigidBodyRef.current.translation());
+    activeState.velocity = vec3(rigidBodyRef.current.linvel());
     dispatch({
         type: "update",
         payload: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gaesup-world",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,6 +22,7 @@
     "@react-three/drei": "9.97.0",
     "@react-three/fiber": "8.15.16",
     "@react-three/rapier": "^1.2.1",
+    "@types/lodash": "^4.17.0",
     "@types/three": "^0.161.2",
     "gh-pages": "^6.1.1",
     "leva": "0.9.35",