gaesup-world 0.6.4 → 0.6.6

package/dist/gaesup/camera/detector/index.js

@@ -1,25 +1,28 @@
-import * as THREE from "three";
 export default function detector(cameraProp) {
-    var cameraRay = cameraProp.cameraRay, intersectObjectMap = cameraProp.intersectObjectMap;
-    var intersects = cameraRay.rayCast.intersectObjects(Object.values(intersectObjectMap));
-    var intersectId = {};
-    intersects.map(function (_a) {
-        var object = _a.object;
-        if (object instanceof THREE.Mesh) {
-            intersectId[object.uuid] = true;
-        }
-    });
-    Object.values(intersectObjectMap).map(function (mesh) {
-        if (mesh instanceof THREE.Mesh && mesh.material instanceof THREE.Material) {
-            var material = mesh.material;
-            if (intersectId[mesh.uuid]) {
-                material.opacity = 0.2;
-                material.transparent = true;
-            }
-            else {
-                material.opacity = 1;
-                material.transparent = false;
-            }
-        }
-    });
+    //   const { cameraRay, intersectObjectMap } = cameraProp;
+    //
+    //   const intersects = cameraRay.rayCast.intersectObjects(
+    //     Object.values(intersectObjectMap)
+    //   );
+    //
+    //   const intersectId = {};
+    //
+    //   intersects.map(({ object }) => {
+    //     if (object instanceof THREE.Mesh) {
+    //       intersectId[object.uuid] = true;
+    //     }
+    //   });
+    //
+    //   Object.values(intersectObjectMap).map((mesh) => {
+    //     if (mesh instanceof THREE.Mesh && mesh.material instanceof THREE.Material) {
+    //       const material = mesh.material;
+    //       if (intersectId[mesh.uuid]) {
+    //         material.opacity = 0.2;
+    //         material.transparent = true;
+    //       } else {
+    //         material.opacity = 1;
+    //         material.transparent = false;
+    //       }
+    //     }
+    //   });
 }

package/dist/gaesup/camera/index.d.ts

@@ -1,8 +1,2 @@
-import { controllerInnerType, refsType } from "../controller/type";
-export default function Camera({ refs, prop, control, }: {
-    refs: refsType;
-    prop: controllerInnerType;
-    control: {
-        [key: string]: boolean;
-    };
-}): import("react/jsx-runtime").JSX.Element;
+import { cameraPropType } from "../physics/type";
+export default function Camera(prop: cameraPropType): void;

package/dist/gaesup/camera/index.js

@@ -1,62 +1,56 @@
-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 { jsx as _jsx } from "react/jsx-runtime";
-import { CameraControls } from "@react-three/drei";
 import { useFrame } from "@react-three/fiber";
-import { useContext, useEffect, useMemo, useRef } from "react";
-import * as THREE from "three";
-import { GaesupControllerContext } from "../controller/context";
-import { GaesupWorldContext } from "../world/context";
 import normal, { makeNormalCameraPosition } from "./control/normal";
 import orbit from "./control/orbit";
-export default function Camera(_a) {
-    var refs = _a.refs, prop = _a.prop, control = _a.control;
-    var worldContext = useContext(GaesupWorldContext);
-    var controllerContext = useContext(GaesupControllerContext);
-    var mode = worldContext.mode, cameraOption = worldContext.cameraOption, activeState = worldContext.activeState;
-    var rigidBodyRef = refs.rigidBodyRef, outerGroupRef = refs.outerGroupRef;
-    var cameraRef = useRef();
-    var intersectObjectMap = useMemo(function () { return ({}); }, []);
-    var cameraProp = __assign(__assign({}, prop), { control: control, controllerContext: controllerContext, worldContext: worldContext, intersectObjectMap: intersectObjectMap });
-    cameraProp.cameraRay.rayCast = new THREE.Raycaster(cameraProp.cameraRay.origin, cameraProp.cameraRay.dir, 0, -cameraOption.maxDistance);
+export default function Camera(prop) {
+    // const worldContext = useContext(GaesupWorldContext);
+    // const controllerContext = useContext(GaesupControllerContext);
+    // const { mode, cameraOption, activeState } = worldContext;
+    // const cameraRef = useRef<CameraControls>();
+    // const intersectObjectMap: intersectObjectMapType = useMemo(() => ({}), []);
+    // const cameraProp: cameraPropType = {
+    //   ...prop,
+    //   // control,
+    //   controllerContext,
+    //   worldContext,
+    //   // intersectObjectMap,
+    // };
+    // cameraProp.cameraRay.rayCast = new THREE.Raycaster(
+    //   cameraProp.cameraRay.origin,
+    //   cameraProp.cameraRay.dir,
+    //   0,
+    //   -cameraOption.maxDistance
+    // );
     useFrame(function (state, delta) {
-        if (!rigidBodyRef ||
-            !rigidBodyRef.current ||
-            !outerGroupRef ||
-            !outerGroupRef.current)
-            return;
-        cameraProp.delta = delta;
-        cameraProp.state = state;
-        if (!worldContext.block.camera) {
-            if (mode.control === "orbit") {
-                orbit(cameraProp);
+        // if (
+        //   !rigidBodyRef ||
+        //   !rigidBodyRef.current ||
+        //   !outerGroupRef ||
+        //   !outerGroupRef.current
+        // )
+        //   return;
+        // cameraProp.delta = delta;
+        prop.state = state;
+        if (!prop.worldContext.block.camera) {
+            if (prop.worldContext.mode.control === "orbit") {
+                orbit(prop);
             }
-            else if (mode.control === "normal") {
-                normal(cameraProp);
+            else if (prop.worldContext.mode.control === "normal") {
+                normal(prop);
             }
         }
     });
     // zoom
-    useEffect(function () {
-        if (cameraRef.current) {
-            cameraRef.current.zoomTo(worldContext.cameraOption.zoom, true);
-        }
-    }, [worldContext.cameraOption.zoom]);
+    // useEffect(() => {
+    //   if (cameraRef.current) {
+    //     cameraRef.current.zoomTo(worldContext.cameraOption.zoom, true);
+    //   }
+    // }, [worldContext.cameraOption.zoom]);
     // 포커스가 아닐 때 카메라 activeStae 따라가기
     useFrame(function () {
-        if (!cameraOption.focus) {
-            cameraOption.target = activeState.position;
-            cameraOption.position = makeNormalCameraPosition(activeState, cameraOption);
+        if (!prop.worldContext.cameraOption.focus) {
+            prop.worldContext.cameraOption.target =
+                prop.worldContext.activeState.position;
+            prop.worldContext.cameraOption.position = makeNormalCameraPosition(prop.worldContext.activeState, prop.worldContext.cameraOption);
         }
     });
-    return _jsx(CameraControls, { ref: cameraRef });
 }

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

@@ -24,5 +24,5 @@ export function CharacterInnerRef(_a) {
     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, positionLerp: positionLerp, rotation: euler, type: type, 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(RigidBodyRef, { ref: rigidBodyRef, name: "character", position: position, positionLerp: positionLerp, rotation: euler, type: type, children: _jsxs(OuterGroupRef, { ref: outerGroupRef, 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/InnerGroupRef.js

@@ -1,10 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useGraph } from "@react-three/fiber";
-import { forwardRef, useMemo } from "react";
+import { useFrame, useGraph } from "@react-three/fiber";
+import { forwardRef, useContext, useMemo } from "react";
 import * as THREE from "three";
 import { SkeletonUtils } from "three-stdlib";
 import { useAnimations, useGLTF } from "@react-three/drei";
 import playActions from "../../../animation/actions";
+import Camera from "../../../camera";
+import { GaesupControllerContext } from "../../../controller/context";
+import { GaesupWorldContext } from "../../../world/context";
 export var InnerGroupRef = forwardRef(function (_a, ref) {
     var children = _a.children, type = _a.type, currentAnimation = _a.currentAnimation, url = _a.url, rotation = _a.rotation;
     var _b = useGLTF(url), scene = _b.scene, animations = _b.animations;
@@ -17,6 +20,17 @@ export var InnerGroupRef = forwardRef(function (_a, ref) {
     var clone = useMemo(function () { return SkeletonUtils.clone(scene); }, [scene]);
     var nodes = useGraph(clone).nodes;
     var objectNode = Object.values(nodes).find(function (node) { return node.type === "Object3D"; });
+    var worldContext = useContext(GaesupWorldContext);
+    var controllerContext = useContext(GaesupControllerContext);
+    var props = {
+        state: null,
+        worldContext: worldContext,
+        controllerContext: controllerContext,
+    };
+    useFrame(function (state) {
+        props.state = state;
+    });
+    Camera(props);
     return (_jsxs("group", { receiveShadow: true, castShadow: true, ref: ref, rotation: rotation, userData: { intangible: true }, children: [children, objectNode && animationRef && (_jsx("primitive", { object: objectNode, visible: false, receiveShadow: true, castShadow: true, ref: animationRef })), Object.keys(nodes).map(function (name, key) {
                 var node = nodes[name];
                 if (node instanceof THREE.SkinnedMesh) {

package/dist/gaesup/controller/index.js

@@ -10,9 +10,8 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo, useReducer, useRef } from "react";
-import Camera from "../camera";
 import { KeyboardControls } from "@react-three/drei";
 import { GaesupComponent } from "../component";
 import { GaesupWorldContext } from "../world/context";
@@ -71,5 +70,5 @@ export function GaesupControllerInner(props) {
         controllerContext: gaesupControl.value,
         controllerDispatch: gaesupControl.dispatch,
     });
-    return (_jsxs(GaesupControllerContext.Provider, { value: gaesupControl.value, children: [_jsx(Camera, { refs: refs, prop: prop, control: prop.keyControl }), _jsx(GaesupControllerDispatchContext.Provider, { value: gaesupControl.dispatch, children: _jsx(GaesupComponent, { props: prop, refs: refs, urls: props.urls }) })] }));
+    return (_jsx(GaesupControllerContext.Provider, { value: gaesupControl.value, children: _jsx(GaesupControllerDispatchContext.Provider, { value: gaesupControl.dispatch, children: _jsx(GaesupComponent, { props: prop, refs: refs, urls: props.urls }) }) }));
 }

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

@@ -1,6 +1,6 @@
 import { Collider, Ray, RayColliderToi } from "@dimforge/rapier3d-compat";
-import { GroupProps } from "@react-three/fiber";
-import { RapierRigidBody, RigidBodyProps } from "@react-three/rapier";
+import { GroupProps, Props } from "@react-three/fiber";
+import { PhysicsProps, RapierRigidBody, RigidBodyProps } from "@react-three/rapier";
 import { ReactNode, RefObject } from "react";
 import * as THREE from "three";
 import { cameraRayType } from "../camera/type";
@@ -81,5 +81,7 @@ export interface controllerOtherPropType extends RigidBodyProps {
     groupProps?: GroupProps;
     rigidBodyProps?: RigidBodyProps;
     debug?: boolean;
+    CanvasProps?: Partial<Props>;
+    PhysicsProps?: Partial<PhysicsProps>;
 }
 export type controllerType = controllerOtherPropType & Partial<gaesupControllerContextPropType> & callbackType;

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

@@ -1,7 +1,7 @@
 import { quat } from "@react-three/rapier";
 import { V3 } from "../../utils/vector";
 export default function direction(prop) {
-    var innerGroupRef = prop.innerGroupRef, rigidBodyRef = prop.rigidBodyRef, _a = prop.worldContext, joystick = _a.joystick, activeState = _a.activeState, control = _a.control, mode = _a.mode, airplane = prop.controllerContext.airplane, matchSizes = prop.matchSizes;
+    var innerGroupRef = prop.innerGroupRef, _a = prop.worldContext, joystick = _a.joystick, activeState = _a.activeState, control = _a.control, mode = _a.mode, airplane = prop.controllerContext.airplane, matchSizes = prop.matchSizes;
     var forward = control.forward, backward = control.backward, leftward = control.leftward, rightward = control.rightward, shift = control.shift, space = control.space;
     var angleDelta = airplane.angleDelta, maxAngle = airplane.maxAngle, accelRatio = airplane.accelRatio;
     if (!matchSizes || !matchSizes["airplaneUrl"])

package/dist/gaesup/physics/index.js

@@ -10,7 +10,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { useFrame } from "@react-three/fiber";
-import { useRapier } from "@react-three/rapier";
 import { useContext, useEffect } from "react";
 import { GaesupControllerContext } from "../controller/context";
 import { useGaesupGltf } from "../hooks/useGaesupGltf";
@@ -21,7 +20,6 @@ import characterCalculation from "./character";
 import check from "./check";
 import vehicleCalculation from "./vehicle";
 export default function calculation(prop) {
-    var world = useRapier().world;
     var worldContext = useContext(GaesupWorldContext);
     var controllerContext = useContext(GaesupControllerContext);
     var dispatch = useContext(GaesupWorldDispatchContext);
@@ -46,7 +44,7 @@ export default function calculation(prop) {
             return null;
         if (block.control)
             return null;
-        var calcProp = __assign(__assign({}, prop), { state: state, delta: delta, worldContext: worldContext, controllerContext: controllerContext, dispatch: dispatch, world: world, matchSizes: getSizesByUrls(controllerContext === null || controllerContext === void 0 ? void 0 : controllerContext.urls) });
+        var calcProp = __assign(__assign({}, prop), { state: state, delta: delta, worldContext: worldContext, controllerContext: controllerContext, dispatch: dispatch, matchSizes: getSizesByUrls(controllerContext === null || controllerContext === void 0 ? void 0 : controllerContext.urls) });
         if (mode.type === "vehicle")
             vehicleCalculation(calcProp);
         else if (mode.type === "character")

package/dist/gaesup/physics/type.d.ts

@@ -1,5 +1,4 @@
 import { RootState } from "@react-three/fiber";
-import { World } from "@dimforge/rapier3d-compat";
 import * as THREE from "three";
 import { gaesupControllerType } from "../controller/context/type";
 import { controllerInnerType, refsType } from "../controller/type";
@@ -19,19 +18,12 @@ export type calcPropType = controllerInnerType & {
     };
     delta?: number;
     dispatch?: dispatchType<gaesupWorldContextType>;
-    world: World;
 };
 export type intersectObjectMapType = {
     [uuid: string]: THREE.Mesh;
 };
-export type cameraPropType = controllerInnerType & {
-    control: {
-        [key: string]: boolean;
-    };
+export type cameraPropType = {
     state?: RootState;
     worldContext?: gaesupWorldContextType;
     controllerContext?: gaesupControllerType;
-    intersectObjectMap?: intersectObjectMapType;
-    delta?: number;
-    dist?: number;
 };

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

@@ -1,7 +1,7 @@
 import { vec3 } from "@react-three/rapier";
 import { V3 } from "../../utils/vector";
 export function joystick(prop) {
-    var state = prop.state, _a = prop.worldContext, activeState = _a.activeState, joystick = _a.joystick;
+    var _a = prop.worldContext, activeState = _a.activeState, joystick = _a.joystick;
     var zAxis = joystick.joyStickOrigin.isOn ? 1 : 0;
     var front = vec3().set(zAxis, 0, zAxis);
     if (joystick.joyStickOrigin.isCenter)

package/dist/gaesup/physics/vehicle/impulse.d.ts

@@ -1,16 +1,2 @@
 import { calcPropType } from "../type";
-/**
- * This function applies an impulse to a rigid body in the game world.
- *
- * @param {calcPropType} prop - An object containing properties necessary for applying the impulse.
- * @param {object} prop.rigidBodyRef - A reference to the rigid body to which the impulse is applied.
- * @param {object} prop.worldContext - An object representing the current state of the game world.
- * @param {object} prop.controllerContext - An object containing controller-specific context data.
- * @param {object} prop.controllerContext.vehicle - An object representing the vehicle controller context.
- * @param {number} prop.controllerContext.vehicle.maxSpeed - The maximum speed of the vehicle.
- *
- * This function calculates the current speed of the rigid body and compares it to the maximum speed.
- * If the current speed is greater than the maximum speed, no impulse is applied.
- * Otherwise, an impulse is applied to the rigid body in the direction specified by `activeState.dir.
- */
 export default function impulse(prop: calcPropType): void;

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

@@ -1,24 +1,9 @@
 import { vec3 } from "@react-three/rapier";
-/**
- * This function applies an impulse to a rigid body in the game world.
- *
- * @param {calcPropType} prop - An object containing properties necessary for applying the impulse.
- * @param {object} prop.rigidBodyRef - A reference to the rigid body to which the impulse is applied.
- * @param {object} prop.worldContext - An object representing the current state of the game world.
- * @param {object} prop.controllerContext - An object containing controller-specific context data.
- * @param {object} prop.controllerContext.vehicle - An object representing the vehicle controller context.
- * @param {number} prop.controllerContext.vehicle.maxSpeed - The maximum speed of the vehicle.
- *
- * This function calculates the current speed of the rigid body and compares it to the maximum speed.
- * If the current speed is greater than the maximum speed, no impulse is applied.
- * Otherwise, an impulse is applied to the rigid body in the direction specified by `activeState.dir.
- */
 export default function impulse(prop) {
     var rigidBodyRef = prop.rigidBodyRef, _a = prop.worldContext, activeState = _a.activeState, control = _a.control, mode = _a.mode, joystick = _a.joystick, vehicle = prop.controllerContext.vehicle;
     var shift = control.shift;
     var maxSpeed = vehicle.maxSpeed, accelRatio = vehicle.accelRatio;
     var velocity = rigidBodyRef.current.linvel();
-    // const V = vec3(velocity).length();
     // a = v / t (t = 1) (approximate calculation)
     var V = vec3(velocity).length();
     if (V < maxSpeed) {

package/package.json

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