gaesup-world 0.8.51 → 0.8.52

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

@@ -33,5 +33,5 @@ export declare const RigidBodyRef: import("react").ForwardRefExoticComponent<{
     rigidBodyProps?: import("@react-three/rapier").RigidBodyProps;
     outerGroupProps?: THREE.Group<THREE.Object3DEventMap>;
     innerGroupProps?: THREE.Group<THREE.Object3DEventMap>;
-    parts?: string[];
+    parts?: import("../../../controller/type").partsType;
 } & import("./type").ridingType & import("../../passive/type").innerRefType & import("../../../controller/initialize/callback/type").callbackType & import("react").RefAttributes<RapierRigidBody>>;

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

@@ -87,7 +87,9 @@ export var RigidBodyRef = forwardRef(function (props, ref) {
     return (_jsxs(RigidBody, __assign({ colliders: false, ref: ref, name: props.name, rotation: euler()
             .set(0, ((_a = props.rotation) === null || _a === void 0 ? void 0 : _a.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, { children: [_jsx(CapsuleCollider, { ref: props.colliderRef, args: [(size.y / 2 - size.x) * 1.2, size.x * 1.2], position: [0, (size.y / 2 + size.x / 2) * 1.2, 0] }), _jsxs(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, children: [props.children, props.parts &&
-                        props.parts.map(function (url, key) {
-                            return (_jsx(PartsGroupRef, { url: url, isActive: props.isActive, componentType: props.componentType, currentAnimation: props.currentAnimation }, key + url));
+                        props.parts.map(function (_a, key) {
+                            var url = _a.url, color = _a.color;
+                            console.log(url, color);
+                            return (_jsx(PartsGroupRef, { url: url, isActive: props.isActive, componentType: props.componentType, currentAnimation: props.currentAnimation, color: color }, key + url));
                         })] })] })));
 });

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

@@ -1,7 +1,8 @@
 import { componentTypeString } from "../../passive/type";
-export declare const PartsGroupRef: ({ url, isActive, componentType, currentAnimation, }: {
+export declare const PartsGroupRef: ({ url, isActive, componentType, currentAnimation, color, }: {
     url: string;
     isActive: boolean;
     componentType: componentTypeString;
     currentAnimation: string;
+    color?: string;
 }) => import("react/jsx-runtime").JSX.Element;

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

@@ -1,14 +1,15 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useAnimations, useGLTF } from "@react-three/drei";
 import { useGraph } from "@react-three/fiber";
+import { isEqual } from "lodash";
 import { useMemo } from "react";
 import * as THREE from "three";
 import { SkeletonUtils } from "three-stdlib";
 import playActions from "../../../animation/actions";
 export var PartsGroupRef = function (_a) {
-    var url = _a.url, isActive = _a.isActive, componentType = _a.componentType, currentAnimation = _a.currentAnimation;
+    var url = _a.url, isActive = _a.isActive, componentType = _a.componentType, currentAnimation = _a.currentAnimation, color = _a.color;
     var _b = useGLTF(url), scene = _b.scene, animations = _b.animations;
-    var clone = useMemo(function () { return SkeletonUtils.clone(scene); }, [scene]);
+    var clone = useMemo(function () { return SkeletonUtils.clone(scene); }, [scene, color]);
     var _c = useAnimations(animations), actions = _c.actions, ref = _c.ref;
     var nodes = useGraph(clone).nodes;
     var objectNode = Object.values(nodes).find(function (node) { return node.type === "Object3D"; });
@@ -20,12 +21,24 @@ export var PartsGroupRef = function (_a) {
         isActive: isActive,
     });
     return (_jsxs(_Fragment, { children: [_jsx("primitive", { object: objectNode, visible: false, receiveShadow: true, castShadow: true, ref: ref }), Object.keys(nodes).map(function (name, key) {
-                var node = nodes[name];
+                var node = nodes === null || nodes === void 0 ? void 0 : nodes[name];
                 if (node instanceof THREE.SkinnedMesh) {
-                    return (_jsx("skinnedMesh", { castShadow: true, receiveShadow: true, material: node.material, geometry: node.geometry, skeleton: node.skeleton }, key));
+                    if (isEqual("color", node) && color) {
+                        return (_jsx("skinnedMesh", { castShadow: true, receiveShadow: true, geometry: node.geometry, skeleton: node.skeleton, children: _jsx("meshStandardMaterial", { color: color }) }, key));
+                    }
+                    else {
+                        return (_jsx("skinnedMesh", { castShadow: true, receiveShadow: true, material: node.material, geometry: node.geometry, skeleton: node.skeleton }, key));
+                    }
                 }
-                else if (node instanceof THREE.Mesh) {
-                    return (_jsx("mesh", { castShadow: true, receiveShadow: true, material: node.material, geometry: node.geometry }, key));
+                else if (node instanceof THREE.Mesh &&
+                    isEqual("color", node) &&
+                    color) {
+                    if (isEqual("color", node) && color) {
+                        return (_jsx("mesh", { castShadow: true, receiveShadow: true, geometry: node.geometry, children: _jsx("meshStandardMaterial", { color: color }) }, key));
+                    }
+                    else {
+                        return (_jsx("mesh", { castShadow: true, receiveShadow: true, material: node.material, geometry: node.geometry }, key));
+                    }
                 }
             })] }));
 };

package/dist/gaesup/component/passive/type.d.ts

@@ -2,7 +2,7 @@ import { Collider } from "@dimforge/rapier3d-compat";
 import { CollisionEnterPayload, RapierRigidBody, RigidBodyProps, RigidBodyTypeString } from "@react-three/rapier";
 import { MutableRefObject } from "react";
 import * as THREE from "three";
-import { controllerOptionsType, groundRayType } from "../../controller/type";
+import { controllerOptionsType, groundRayType, partsType } from "../../controller/type";
 import { ridingType } from "../inner/common/type";
 export type componentTypeString = "character" | "vehicle" | "airplane";
 export type innerRefType = {
@@ -33,5 +33,5 @@ export type passivePropsType = {
     rigidBodyProps?: RigidBodyProps;
     outerGroupProps?: THREE.Group;
     innerGroupProps?: THREE.Group;
-    parts?: string[];
+    parts?: partsType;
 } & ridingType;

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

@@ -90,7 +90,14 @@ export interface controllerOtherPropType extends RigidBodyProps {
     rigidBodyProps?: RigidBodyProps;
     debug?: boolean;
 }
-export type partsType = string[];
+export type partType = {
+    url: string;
+    color?: string;
+    position?: THREE.Vector3;
+    rotation?: THREE.Euler;
+    scale?: THREE.Vector3;
+};
+export type partsType = partType[];
 export type controllerType = controllerOtherPropType & urlsType & Partial<gaesupControllerContextPropType> & callbackType & {
     controllerOptions?: controllerOptionsType;
     parts?: partsType;

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

@@ -0,0 +1,3 @@
+import * as THREE from "three";
+export declare const getTag: (node?: THREE.Mesh) => string;
+export declare const isEqual: (tag: string, node?: THREE.Mesh) => boolean;

package/dist/gaesup/utils/getTag.js

@@ -0,0 +1,4 @@
+// split한 태그의 첫번째 문자열을 가져오는 함수.
+export var getTag = function (node) { var _a, _b; return (_b = (_a = node === null || node === void 0 ? void 0 : node.name) === null || _a === void 0 ? void 0 : _a.split("_")) === null || _b === void 0 ? void 0 : _b[0]; };
+// 태그와 이름이 일치하는지 확인
+export var isEqual = function (tag, node) { var _a, _b; return ((_b = (_a = node === null || node === void 0 ? void 0 : node.name) === null || _a === void 0 ? void 0 : _a.split("_")) === null || _b === void 0 ? void 0 : _b[0]) === tag; };

package/package.json

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