Skip to content

refactor: update EcctrlProps mode type to use String literal types #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

refactor: update EcctrlProps mode type to use String literal types #83

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fabd47a
refactor: update EcctrlProps mode type to use String literal types
clicktodev Jul 8, 2024
331718b
Merge branch 'pmndrs:main' into improve-mode-type
clicktodev Jul 15, 2024
307fee9
Update Ecctrl.tsx
clicktodev Jul 15, 2024
720276c
Update Ecctrl.tsx
clicktodev Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/Ecctrl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
// Animation temporary setups
animated = false,
// Mode setups
mode = null,
modes = null,
// Controller setups
controllerKeys = { forward: 12, backward: 13, leftward: 14, rightward: 15, jump: 2, action1: 11, action2: 3, action3: 1, action4: 0 },
// Other rigibody props from parent
Expand All @@ -133,11 +133,11 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
const setMoveToPoint = useGame((state) => state.setMoveToPoint)
const setCameraBased = useGame((state) => state.setCameraBased);
const getCameraBased = useGame((state) => state.getCameraBased);
const findMode = (mode: string, modes: string) => modes.split(" ").some(m => m === mode)
if (mode) {
if (findMode("PointToMove", mode)) isModePointToMove = true
if (findMode("FixedCamera", mode)) isModeFixedCamera = true
if (findMode("CameraBasedMovement", mode)) setCameraBased(true)
const findMode = (mode: Mode, modes: Mode[]) => modes.some(m => m === mode)
if (modes) {
if (findMode("PointToMove", modes)) isModePointToMove = true
if (findMode("FixedCamera", modes)) isModeFixedCamera = true
if (findMode("CameraBasedMovement", modes)) setCameraBased(true)
}

/**
Expand Down Expand Up @@ -1469,6 +1469,8 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({

export default forwardRef(Ecctrl);

export type Mode = "CameraBasedMovement" | "FixedCamera" | "PointToMove";

export interface EcctrlProps extends RigidBodyProps {
children?: ReactNode;
debug?: boolean;
Expand Down Expand Up @@ -1541,7 +1543,7 @@ export interface EcctrlProps extends RigidBodyProps {
// Animation temporary setups
animated?: boolean;
// Mode setups
mode?: string;
modes?: Mode[];
// Controller setups
controllerKeys?: { forward?: number, backward?: number, leftward?: number, rightward?: number, jump?: number, action1?: number, action2?: number, action3?: number, action4?: number }
// Other rigibody props from parent
Expand All @@ -1554,4 +1556,4 @@ export interface userDataType {
characterRotated?: boolean;
isOnMovingObject?: boolean;
excludeEcctrlRay?: boolean;
}
}