Skip to content

refactor, fix and feat: Camera Rotation Handling + setCameraRotation Function #125

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor, fix and feat: Camera Rotation Handling + setCameraRotation Function #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23100c4
refactor: add functions to simplify code and fix rotateCamera function
Ki2lian Nov 28, 2024
e86a36b
feat: add setCameraRotation function
Ki2lian Nov 28, 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
21 changes: 19 additions & 2 deletions src/Ecctrl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import { useEffect, useRef, useMemo, useState, useImperativeHandle, forwardRef, type ReactNode, type ForwardRefRenderFunction } from "react";
import * as THREE from "three";
import { useControls } from "leva";
import { useFollowCam } from "./hooks/useFollowCam";
import { updateFollowCamRotation, useFollowCam } from "./hooks/useFollowCam";
import { useGame } from "./stores/useGame";
import { useJoystickControls } from "./stores/useJoystickControls";
import { QueryFilterFlags } from "@dimforge/rapier3d-compat";
Expand Down Expand Up @@ -138,6 +138,7 @@ const Ecctrl: ForwardRefRenderFunction<CustomEcctrlRigidBody, EcctrlProps> = ({
if (characterRef.current) {
characterRef.current.rotateCamera = rotateCamera;
characterRef.current.rotateCharacterOnY = rotateCharacterOnY;
characterRef.current.setCameraRotation = setCameraRotation;
return characterRef.current!;
}
return null;
Expand Down Expand Up @@ -871,10 +872,11 @@ const Ecctrl: ForwardRefRenderFunction<CustomEcctrlRigidBody, EcctrlProps> = ({
*/
const rotateCamera = (x: number, y: number) => {
pivot.rotation.y += y;
followCam.rotation.x = Math.min(
const limitedX = Math.min(
Math.max(followCam.rotation.x + x, camLowLimit),
camUpLimit
);
updateFollowCamRotation(followCam, limitedX);
};

/**
Expand All @@ -884,6 +886,20 @@ const Ecctrl: ForwardRefRenderFunction<CustomEcctrlRigidBody, EcctrlProps> = ({
modelEuler.y += rad;
};

/**
* Set camera rotation
* @param {number} x - The x angle in radians
* @param {number} y - The y angle in radians
*/
const setCameraRotation = (x: number, y: number) => {
pivot.rotation.y = y;
const limitedX = Math.min(
Math.max(x, camLowLimit),
camUpLimit
);
updateFollowCamRotation(followCam, limitedX);
};

useEffect(() => {
// Initialize directional light
if (followLight) {
Expand Down Expand Up @@ -1542,6 +1558,7 @@ export type camListenerTargetType = "document" | "domElement";
export interface CustomEcctrlRigidBody extends RapierRigidBody {
rotateCamera?: (x: number, y: number) => void;
rotateCharacterOnY?: (rad: number) => void;
setCameraRotation?: (x: number, y: number) => void;
}

export interface EcctrlProps extends RigidBodyProps {
Expand Down
29 changes: 16 additions & 13 deletions src/hooks/useFollowCam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ import { useEffect, useMemo, useRef } from "react";
import * as THREE from "three";
import type { camListenerTargetType } from "../Ecctrl";

export const updateFollowCamRotation = (followCam: THREE.Object3D<THREE.Object3DEventMap>, vy: number) => {
const cameraDistance = followCam.position.length();
followCam.rotation.x = vy;
updateFollowCamPosition(followCam, cameraDistance, vy);
}

export const updateFollowCamPosition = (followCam: THREE.Object3D<THREE.Object3DEventMap>, distance: number, vy: number) => {
followCam.position.y = -distance * Math.sin(-vy);
followCam.position.z = -distance * Math.cos(-vy);
}

export const useFollowCam = function ({
disableFollowCam = false,
disableFollowCamPos = null,
Expand Down Expand Up @@ -70,9 +81,7 @@ export const useFollowCam = function ({
cameraDistance = followCam.position.length();

if (vy >= camLowLimit && vy <= camUpLimit) {
followCam.rotation.x = vy;
followCam.position.y = -cameraDistance * Math.sin(-vy);
followCam.position.z = -cameraDistance * Math.cos(-vy);
updateFollowCamRotation(followCam, vy);
}
}
return false;
Expand All @@ -85,8 +94,7 @@ export const useFollowCam = function ({

if (vz >= camMaxDis && vz <= camMinDis) {
originZDis.current = vz;
followCam.position.z = originZDis.current * Math.cos(-vy);
followCam.position.y = originZDis.current * Math.sin(-vy);
updateFollowCamPosition(followCam, originZDis.current, vy);
}
return false;
};
Expand Down Expand Up @@ -120,9 +128,7 @@ export const useFollowCam = function ({
cameraDistance = followCam.position.length();

if (vy >= camLowLimit && vy <= camUpLimit) {
followCam.rotation.x = vy;
followCam.position.y = -cameraDistance * Math.sin(-vy);
followCam.position.z = -cameraDistance * Math.cos(-vy);
updateFollowCamRotation(followCam, vy);
}
}

Expand All @@ -142,8 +148,7 @@ export const useFollowCam = function ({

if (vz >= camMaxDis && vz <= camMinDis) {
originZDis.current = vz;
followCam.position.z = originZDis.current * Math.cos(-vy);
followCam.position.y = originZDis.current * Math.sin(-vy);
updateFollowCamPosition(followCam, originZDis.current, vy);
}
}

Expand All @@ -161,9 +166,7 @@ export const useFollowCam = function ({
cameraDistance = followCam.position.length();

if (vy >= camLowLimit && vy <= camUpLimit) {
followCam.rotation.x = vy;
followCam.position.y = -cameraDistance * Math.sin(-vy);
followCam.position.z = -cameraDistance * Math.cos(vy);
updateFollowCamRotation(followCam, vy);
}
}

Expand Down