gaesup-world 0.9.56 → 0.9.58

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

@@ -1,159 +1,3 @@
-// import { useAnimations, useGLTF } from "@react-three/drei";
-// import { useFrame, useGraph } from "@react-three/fiber";
-// import {
-//   CapsuleCollider,
-//   RapierRigidBody,
-//   RigidBody,
-//   euler,
-// } from "@react-three/rapier";
-// import { MutableRefObject, forwardRef, useContext, useMemo } from "react";
-// import * as THREE from "three";
-// 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 { cameraPropType } from "../../../physics/type";
-// import { V3 } from "../../../utils";
-// import { GaesupWorldContext } from "../../../world/context";
-// import { InnerGroupRef } from "./InnerGroupRef";
-// import { PartsGroupRef } from "./partsGroupRef";
-// import { setGroundRay } from "./setGroundRay";
-// import { rigidBodyRefType } from "./type";
-//
-// export const RigidBodyRef = forwardRef(
-//   (props: rigidBodyRefType, ref: MutableRefObject<RapierRigidBody>) => {
-//     const { size } = useGltfAndSize({ url: props.url });
-//
-//     props.groundRay &&
-//       setGroundRay({
-//         groundRay: props.groundRay,
-//         length: 0.5,
-//         colliderRef: props.colliderRef,
-//       });
-//     const { scene, animations } = useGLTF(props.url);
-//     const { actions, ref: animationRef } = useAnimations(animations);
-//     const worldContext = useContext(GaesupWorldContext);
-//     const controllerContext = useContext(GaesupControllerContext);
-//     if (props.isActive) {
-//       subscribeActions({
-//         type: props.componentType,
-//         groundRay: props.groundRay,
-//         animations: animations,
-//       });
-//       const cameraProps: cameraPropType = {
-//         state: null,
-//         worldContext,
-//         controllerContext,
-//         controllerOptions: props.controllerOptions,
-//       };
-//
-//       Camera(cameraProps);
-//       calculation({
-//         outerGroupRef: props.outerGroupRef,
-//         innerGroupRef: props.innerGroupRef,
-//         rigidBodyRef: ref,
-//         colliderRef: props.colliderRef,
-//         groundRay: props.groundRay,
-//       });
-//     }
-//     playActions({
-//       type: props.componentType,
-//       actions,
-//       animationRef,
-//       currentAnimation: props.isActive ? undefined : props.currentAnimation,
-//       isActive: props.isActive,
-//     });
-//     initCallback({
-//       props,
-//       actions,
-//       componentType: props.componentType,
-//     });
-//     const clone = useMemo(() => SkeletonUtils.clone(scene), [scene]);
-//     const { nodes } = useGraph(clone);
-//     const objectNode = Object.values(nodes).find(
-//       (node) => node.type === "Object3D"
-//     );
-//     useFrame(() => {
-//       if (props.isActive || !props.position || !ref || !ref.current) return;
-//       ref.current.setTranslation(
-//         V3(
-//           THREE.MathUtils.lerp(
-//             ref.current.translation().x,
-//             props.position.x,
-//             props.controllerOptions.lerp.cameraPosition
-//           ),
-//           THREE.MathUtils.lerp(
-//             ref.current.translation().y,
-//             props.position.y,
-//             props.controllerOptions.lerp.cameraPosition
-//           ),
-//           THREE.MathUtils.lerp(
-//             ref.current.translation().z,
-//             props.position.z,
-//             props.controllerOptions.lerp.cameraPosition
-//           )
-//         ),
-//         false
-//       );
-//     });
-//     return (
-//       <RigidBody
-//         colliders={false}
-//         ref={ref}
-//         name={props.name}
-//         rotation={euler()
-//           .set(0, props.rotation?.clone().y || 0, 0)
-//           .clone()}
-//         userData={props.userData}
-//         type={props.rigidbodyType || (props.isActive ? "dynamic" : "fixed")}
-//         sensor={props.sensor}
-//         onIntersectionEnter={props.onIntersectionEnter}
-//         onCollisionEnter={props.onCollisionEnter}
-//         {...props.rigidBodyProps}
-//       >
-//         {!props.isNotColliding && (
-//           <CapsuleCollider
-//             ref={props.colliderRef as any}
-//             args={[(size.y / 2 - size.x) * 1.2, size.x * 1.2]}
-//             position={[0, (size.y / 2 + size.x / 2) * 1.2, 0]}
-//           />
-//         )}
-//         <InnerGroupRef
-//           objectNode={objectNode}
-//           animationRef={animationRef}
-//           nodes={nodes}
-//           ref={props.innerGroupRef}
-//           isActive={props.isActive}
-//           isRiderOn={props.isRiderOn}
-//           enableRiding={props.enableRiding}
-//           ridingUrl={props.ridingUrl}
-//           offset={props.offset}
-//           parts={props.parts}
-//         >
-//           {props.children}
-//           {props.parts &&
-//             props.parts.length > 0 &&
-//             props.parts.map(({ url, color }, key) => {
-//               if (!url) return null;
-//               return (
-//                 <PartsGroupRef
-//                   url={url}
-//                   isActive={props.isActive}
-//                   componentType={props.componentType}
-//                   currentAnimation={props.currentAnimation}
-//                   color={color}
-//                   key={key + url}
-//                 />
-//               );
-//             })}
-//         </InnerGroupRef>
-//       </RigidBody>
-//     );
-//   }
-// );
 import { useAnimations, useGLTF } from "@react-three/drei";
 import { useFrame, useGraph } from "@react-three/fiber";
 import {
@@ -176,12 +20,13 @@ import { V3 } from "../../../utils";
 import { GaesupWorldContext } from "../../../world/context";
 import { InnerGroupRef } from "./InnerGroupRef";
 import { PartsGroupRef } from "./partsGroupRef";
-import { setGroundRay } from "./setGroundRay";
+import { useSetGroundRay } from "./setGroundRay";
 import { rigidBodyRefType } from "./type";
 
 export const RigidBodyRef = forwardRef(
   (props: rigidBodyRefType, ref: MutableRefObject<RapierRigidBody>) => {
     const { size } = useGltfAndSize({ url: props.url });
+    const setGroundRay = useSetGroundRay();
 
     props.groundRay &&
       setGroundRay({

package/dist/gaesup/component/inner/common/setGroundRay.ts

@@ -1,19 +1,25 @@
+// useSetGroundRay.ts
 import { useRapier } from "@react-three/rapier";
 import { groundRayType } from "../../../controller/type";
 import { getRayHit } from "../../../utils";
 import { setGroundRayType } from "./type";
 
-export function setGroundRay({
-  groundRay,
-  length,
-  colliderRef,
-}: setGroundRayType) {
+export function useSetGroundRay() {
   const { rapier } = useRapier();
-  groundRay.length = length;
-  groundRay.rayCast = new rapier.Ray(groundRay.origin, groundRay.dir);
-  groundRay.hit = getRayHit<groundRayType>({
-    ray: groundRay,
-    ref: colliderRef,
-  });
-  groundRay.parent = groundRay.hit?.collider.parent();
+
+  const setGroundRay = ({
+    groundRay,
+    length,
+    colliderRef,
+  }: setGroundRayType) => {
+    groundRay.length = length;
+    groundRay.rayCast = new rapier.Ray(groundRay.origin, groundRay.dir);
+    groundRay.hit = getRayHit<groundRayType>({
+      ray: groundRay,
+      ref: colliderRef,
+    });
+    groundRay.parent = groundRay.hit?.collider.parent();
+  };
+
+  return setGroundRay;
 }

package/dist/gaesup/hooks/useTeleport/index.tsx

@@ -1,18 +1,16 @@
-import { useContext } from "react";
 import * as THREE from "three";
-import { GaesupWorldContext } from "../../world/context";
 
 export function useTeleport() {
-  const worldContext = useContext(GaesupWorldContext);
+  // const worldContext = useContext(GaesupWorldContext);
 
   const Teleport = (position: THREE.Vector3) => {
-    if (
-      worldContext &&
-      worldContext?.refs &&
-      worldContext?.refs?.rigidBodyRef &&
-      worldContext?.refs?.rigidBodyRef?.current
-    )
-      worldContext.refs.rigidBodyRef.current.setTranslation(position, true);
+    // if (
+    //   worldContext &&
+    //   worldContext?.refs &&
+    //   worldContext?.refs?.rigidBodyRef &&
+    //   worldContext?.refs?.rigidBodyRef?.current
+    // )
+    //   worldContext.refs.rigidBodyRef.current.setTranslation(position, true);
   };
 
   return {

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

@@ -1,80 +1,72 @@
 // Rideable.tsx
-import { CollisionEnterPayload, euler } from "@react-three/rapier";
-import { useContext, useEffect, useState } from "react";
-import * as THREE from "three";
-import { PassiveAirplane } from "../../component/passive/airplane";
-import { PassiveVehicle } from "../../component/passive/vehicle";
-import { useRideable } from "../../hooks/useRideable";
-import { V3 } from "../../utils";
-import { GaesupWorldContext } from "../../world/context";
 import { rideablePropType } from "./type";
 
 export function Rideable(props: rideablePropType) {
-  const { states, rideable } = useContext(GaesupWorldContext);
-  const { initRideable, ride, landing } = useRideable();
-  const [_rideable] = useState<{
-    position: THREE.Vector3;
-    rotation: THREE.Euler;
-  }>({
-    position: props.position || V3(0, 0, 0),
-    rotation: props.rotation || euler(),
-  });
-
-  useEffect(() => {
-    initRideable(props);
-  }, []);
-
-  useEffect(() => {
-    if (
-      states?.isRiding &&
-      rideable[props.objectkey] &&
-      !rideable[props.objectkey].visible
-    ) {
-      landing(props.objectkey);
-    }
-  }, [states?.isRiding]);
-
-  const onIntersectionEnter = async (e: CollisionEnterPayload) => {
-    await ride(e, props);
-  };
-
-  return (
-    <>
-      {rideable?.[props.objectkey]?.visible && (
-        <group userData={{ intangible: true }}>
-          {props.objectType === "vehicle" && (
-            <PassiveVehicle
-              controllerOptions={props.controllerOptions}
-              position={_rideable.position}
-              rotation={_rideable.rotation}
-              currentAnimation={"idle"}
-              url={props.url}
-              wheelUrl={props.wheelUrl}
-              ridingUrl={props.ridingUrl}
-              offset={props.offset}
-              enableRiding={props.enableRiding}
-              rigidBodyProps={props.rigidBodyProps}
-              sensor={true}
-              onIntersectionEnter={onIntersectionEnter}
-            />
-          )}
-          {props.objectType === "airplane" && (
-            <PassiveAirplane
-              controllerOptions={props.controllerOptions}
-              position={_rideable.position.clone()}
-              rotation={_rideable.rotation.clone()}
-              currentAnimation={"idle"}
-              url={props.url}
-              ridingUrl={props.ridingUrl}
-              offset={props.offset}
-              enableRiding={props.enableRiding}
-              rigidBodyProps={props.rigidBodyProps}
-              sensor={true}
-              onIntersectionEnter={onIntersectionEnter}
-            />
-          )}
-        </group>
-      )}
-    </>
-  );
+  //   const { states, rideable } = useContext(GaesupWorldContext);
+  //   const { initRideable, ride, landing } = useRideable();
+  //   const [_rideable] = useState<{
+  //     position: THREE.Vector3;
+  //     rotation: THREE.Euler;
+  //   }>({
+  //     position: props.position || V3(0, 0, 0),
+  //     rotation: props.rotation || euler(),
+  //   });
+  //
+  //   useEffect(() => {
+  //     initRideable(props);
+  //   }, []);
+  //
+  //   useEffect(() => {
+  //     if (
+  //       states?.isRiding &&
+  //       rideable[props.objectkey] &&
+  //       !rideable[props.objectkey].visible
+  //     ) {
+  //       landing(props.objectkey);
+  //     }
+  //   }, [states?.isRiding]);
+  //
+  //   const onIntersectionEnter = async (e: CollisionEnterPayload) => {
+  //     await ride(e, props);
+  //   };
+  //
+  //   return (
+  //     <>
+  //       {rideable?.[props.objectkey]?.visible && (
+  //         <group userData={{ intangible: true }}>
+  //           {props.objectType === "vehicle" && (
+  //             <PassiveVehicle
+  //               controllerOptions={props.controllerOptions}
+  //               position={_rideable.position}
+  //               rotation={_rideable.rotation}
+  //               currentAnimation={"idle"}
+  //               url={props.url}
+  //               wheelUrl={props.wheelUrl}
+  //               ridingUrl={props.ridingUrl}
+  //               offset={props.offset}
+  //               enableRiding={props.enableRiding}
+  //               rigidBodyProps={props.rigidBodyProps}
+  //               sensor={true}
+  //               onIntersectionEnter={onIntersectionEnter}
+  //             />
+  //           )}
+  //           {props.objectType === "airplane" && (
+  //             <PassiveAirplane
+  //               controllerOptions={props.controllerOptions}
+  //               position={_rideable.position.clone()}
+  //               rotation={_rideable.rotation.clone()}
+  //               currentAnimation={"idle"}
+  //               url={props.url}
+  //               ridingUrl={props.ridingUrl}
+  //               offset={props.offset}
+  //               enableRiding={props.enableRiding}
+  //               rigidBodyProps={props.rigidBodyProps}
+  //               sensor={true}
+  //               onIntersectionEnter={onIntersectionEnter}
+  //             />
+  //           )}
+  //         </group>
+  //       )}
+  //     </>
+  //   );
 }

package/dist/gaesup/tools/rideable/type.ts

@@ -3,6 +3,7 @@ import * as THREE from "three";
 import { controllerOptionsType } from "../../controller/type";
 
 export type rideablePropType = {
+  groundRay: any;
   objectkey: string;
   objectType?: "vehicle" | "airplane";
   controllerOptions: controllerOptionsType;

package/package.json

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