Skip to content
New issue

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

#

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

Already on GitHub? # to your account

feat(camera): add support for inverting X and Y axes #1

Merged
merged 1 commit into from
Nov 27, 2024
Merged

feat(camera): add support for inverting X and Y axes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/Ecctrl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ const Ecctrl: ForwardRefRenderFunction<CustomEcctrlRigidBody, EcctrlProps> = ({
camTargetPos = { x: 0, y: 0, z: 0 },
camMoveSpeed = 1,
camZoomSpeed = 1,
camInvertX = false,
camInvertY = false,
camCollision = true,
camCollisionOffset = 0.7,
camCollisionSpeedMult = 4,
Expand Down Expand Up @@ -569,6 +571,8 @@ const Ecctrl: ForwardRefRenderFunction<CustomEcctrlRigidBody, EcctrlProps> = ({
camCollisionOffset,
camCollisionSpeedMult,
camListenerTarget,
camInvertX,
camInvertY
};

/**
Expand Down Expand Up @@ -1566,6 +1570,8 @@ export interface EcctrlProps extends RigidBodyProps {
camTargetPos?: { x: number, y: number, z: number };
camMoveSpeed?: number;
camZoomSpeed?: number;
camInvertX?: boolean,
camInvertY?: boolean,
camCollision?: boolean;
camCollisionOffset?: number;
camCollisionSpeedMult?: number;
Expand Down
24 changes: 18 additions & 6 deletions src/hooks/useFollowCam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export const useFollowCam = function ({
camInitDir = { x: 0, y: 0 }, // in rad
camMoveSpeed = 1,
camZoomSpeed = 1,
camInvertX = false,
camInvertY = false,
camCollisionOffset = 0.7, // percentage
camCollisionSpeedMult = 4,
camListenerTarget = "domElement",
Expand All @@ -24,6 +26,14 @@ export const useFollowCam = function ({
const { scene, camera, gl } = useThree();
// const { rapier, world } = useRapier();

const camInvertXRef = useRef(camInvertX ? -1 : 1);
const camInvertYRef = useRef(camInvertY ? -1 : 1);

useEffect(() => {
camInvertXRef.current = camInvertX ? -1 : 1;
camInvertYRef.current = camInvertY ? -1 : 1;
}, [camInvertX, camInvertY]);

let isMouseDown = false;
let previousTouch1: Touch = null;
let previousTouch2: Touch = null;
Expand Down Expand Up @@ -64,8 +74,8 @@ export const useFollowCam = function ({
// Mouse move event
const onDocumentMouseMove = (e: MouseEvent) => {
if (document.pointerLockElement || isMouseDown) {
pivot.rotation.y -= e.movementX * 0.002 * camMoveSpeed;
const vy = followCam.rotation.x + e.movementY * 0.002 * camMoveSpeed;
pivot.rotation.y -= e.movementX * 0.002 * camMoveSpeed * camInvertXRef.current;
const vy = followCam.rotation.x + (e.movementY * camInvertYRef.current) * 0.002 * camMoveSpeed;

cameraDistance = followCam.position.length();

Expand Down Expand Up @@ -114,8 +124,8 @@ export const useFollowCam = function ({
const touch1MovementX = touch1.pageX - previousTouch1.pageX;
const touch1MovementY = touch1.pageY - previousTouch1.pageY;

pivot.rotation.y -= touch1MovementX * 0.005 * camMoveSpeed;
const vy = followCam.rotation.x + touch1MovementY * 0.005 * camMoveSpeed;
pivot.rotation.y -= touch1MovementX * 0.005 * camMoveSpeed * camInvertXRef.current;
const vy = followCam.rotation.x + (touch1MovementY * camInvertYRef.current) * 0.005 * camMoveSpeed;

cameraDistance = followCam.position.length();

Expand Down Expand Up @@ -155,8 +165,8 @@ export const useFollowCam = function ({
* Gamepad second joystick event
*/
const joystickCamMove = (movementX: number, movementY: number) => {
pivot.rotation.y -= movementX * 0.005 * camMoveSpeed * 5;
const vy = followCam.rotation.x + movementY * 0.005 * camMoveSpeed * 5;
pivot.rotation.y -= movementX * 0.005 * camMoveSpeed * 5 * camInvertXRef.current;
const vy = followCam.rotation.x + (movementY * camInvertYRef.current) * 0.005 * camMoveSpeed * 5;

cameraDistance = followCam.position.length();

Expand Down Expand Up @@ -327,6 +337,8 @@ export type UseFollowCamProps = {
camInitDir?: { x: number, y: number };
camMoveSpeed?: number;
camZoomSpeed?: number;
camInvertX?: boolean,
camInvertY?: boolean,
camCollisionOffset?: number;
camCollisionSpeedMult?: number;
camListenerTarget?: camListenerTargetType;
Expand Down