MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove camera.mode dependency from low-level functions

Browse Source
This commit is contained in:
Crydsch 2022-08-30 17:37:42 +02:00
parent 3e8f7162df
commit c6e89224d9
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/rcamera.h
View File

@ -304,12 +304,11 @@ Vector3 GetCameraRight(Camera3D *camera)
} }
// Moves the camera in its forward direction // Moves the camera in its forward direction
void CameraMoveForward(Camera3D *camera, float distance) void CameraMoveForward(Camera3D *camera, float distance, bool moveInWorldPlane)
{ {
Vector3 forward = GetCameraForward(camera); Vector3 forward = GetCameraForward(camera);
if (camera->mode == CAMERA_FIRST_PERSON || if (moveInWorldPlane)
camera->mode == CAMERA_THIRD_PERSON)
{ {
// Project vector onto world plane // Project vector onto world plane
forward.y = 0; forward.y = 0;
@ -338,12 +337,11 @@ void CameraMoveUp(Camera3D *camera, float distance)
} }
// Moves the camera target in its current right direction // Moves the camera target in its current right direction
void CameraMoveRight(Camera3D *camera, float distance) void CameraMoveRight(Camera3D *camera, float distance, bool moveInWorldPlane)
{ {
Vector3 right = GetCameraRight(camera); Vector3 right = GetCameraRight(camera);
if (camera->mode == CAMERA_FIRST_PERSON || if (moveInWorldPlane)
camera->mode == CAMERA_THIRD_PERSON)
{ {
// Project vector onto world plane // Project vector onto world plane
right.y = 0; right.y = 0;
@ -376,8 +374,9 @@ void CameraZoom(Camera3D *camera, float delta)
// Rotates the camera around its up vector // Rotates the camera around its up vector
// Yaw is "looking left and right" // Yaw is "looking left and right"
// If rotateAroundTarget is false, the camera rotates around its position
// Note: angle must be provided in radians // Note: angle must be provided in radians
void CameraYaw(Camera3D *camera, float angle) void CameraYaw(Camera3D *camera, float angle, bool rotateAroundTarget)
{ {
// Rotation axis // Rotation axis
Vector3 up = GetCameraUp(camera); Vector3 up = GetCameraUp(camera);
@ -388,24 +387,25 @@ void CameraYaw(Camera3D *camera, float angle)
// Rotate view vector around up axis // Rotate view vector around up axis
target_position = Vector3RotateByAxisAngle(target_position, up, angle); target_position = Vector3RotateByAxisAngle(target_position, up, angle);
if (camera->mode == CAMERA_FREE || if (rotateAroundTarget)
camera->mode == CAMERA_FIRST_PERSON)
{
// Move target relative to position
camera->target = Vector3Add(camera->position, target_position);
}
else if (camera->mode == CAMERA_THIRD_PERSON ||
camera->mode == CAMERA_ORBITAL)
{ {
// Move position relative to target // Move position relative to target
camera->position = Vector3Subtract(camera->target, target_position); camera->position = Vector3Subtract(camera->target, target_position);
} }
else // rotate around camera.position
{
// Move target relative to position
camera->target = Vector3Add(camera->position, target_position);
}
} }
// Rotates the camera around its right vector // Rotates the camera around its right vector
// Pitch is "looking up and down" // Pitch is "looking up and down"
// lockView prevents camera overrotation (aka "somersaults")
// If rotateAroundTarget is false, the camera rotates around its position
// rotateUp rotates the up direction as well (typically only usefull in CAMERA_FREE)
// Note: angle must be provided in radians // Note: angle must be provided in radians
void CameraPitch(Camera3D *camera, float angle) void CameraPitch(Camera3D *camera, float angle, bool lockView, bool rotateAroundTarget, bool rotateUp)
{ {
// Up direction // Up direction
Vector3 up = GetCameraUp(camera); Vector3 up = GetCameraUp(camera);
@ -413,9 +413,7 @@ void CameraPitch(Camera3D *camera, float angle)
// View vector // View vector
Vector3 target_position = Vector3Subtract(camera->target, camera->position); Vector3 target_position = Vector3Subtract(camera->target, camera->position);
if (camera->mode == CAMERA_FIRST_PERSON || if (lockView)
camera->mode == CAMERA_THIRD_PERSON ||
camera->mode == CAMERA_ORBITAL)
{ {
// In these camera modes we clamp the Pitch angle // In these camera modes we clamp the Pitch angle
// to allow only viewing straight up or down. // to allow only viewing straight up or down.
@ -438,25 +436,22 @@ void CameraPitch(Camera3D *camera, float angle)
// Rotate view vector around right axis // Rotate view vector around right axis
target_position = Vector3RotateByAxisAngle(target_position, right, angle); target_position = Vector3RotateByAxisAngle(target_position, right, angle);
if (camera->mode == CAMERA_FREE) if (rotateAroundTarget)
{
// Move target relative to position
camera->target = Vector3Add(camera->position, target_position);
// Rotate up direction around right axis
camera->up = Vector3RotateByAxisAngle(camera->up, right, angle);
}
else if (camera->mode == CAMERA_FIRST_PERSON)
{
// Move target relative to position
camera->target = Vector3Add(camera->position, target_position);
}
else if (camera->mode == CAMERA_THIRD_PERSON ||
camera->mode == CAMERA_ORBITAL)
{ {
// Move position relative to target // Move position relative to target
camera->position = Vector3Subtract(camera->target, target_position); camera->position = Vector3Subtract(camera->target, target_position);
} }
else // rotate around camera.position
{
// Move target relative to position
camera->target = Vector3Add(camera->position, target_position);
}
if (rotateUp)
{
// Rotate up direction around right axis
camera->up = Vector3RotateByAxisAngle(camera->up, right, angle);
}
} }
// Rotates the camera around its forward vector // Rotates the camera around its forward vector
@ -525,25 +520,30 @@ void UpdateCamera(Camera3D *camera)
return; return;
} }
Vector2 mousePositionDelta = GetMouseDelta(); Vector2 mousePositionDelta = GetMouseDelta();
bool moveInWorldPlane = camera->mode == CAMERA_FIRST_PERSON || camera->mode == CAMERA_THIRD_PERSON;
bool rotateAroundTarget = camera->mode == CAMERA_THIRD_PERSON || camera->mode == CAMERA_ORBITAL;
bool lockView = camera->mode == CAMERA_FIRST_PERSON || camera->mode == CAMERA_THIRD_PERSON || camera->mode == CAMERA_ORBITAL;
bool rotateUp = camera->mode == CAMERA_FREE;
// Camera movement // Camera movement
if (IsKeyDown(KEY_W)) CameraMoveForward(camera, CAMERA_MOVE_SPEED); if (IsKeyDown(KEY_W)) CameraMoveForward(camera, CAMERA_MOVE_SPEED, moveInWorldPlane);
if (IsKeyDown(KEY_S)) CameraMoveForward(camera, -CAMERA_MOVE_SPEED); if (IsKeyDown(KEY_S)) CameraMoveForward(camera, -CAMERA_MOVE_SPEED, moveInWorldPlane);
if (IsKeyDown(KEY_D)) CameraMoveRight(camera, CAMERA_MOVE_SPEED); if (IsKeyDown(KEY_D)) CameraMoveRight(camera, CAMERA_MOVE_SPEED, moveInWorldPlane);
if (IsKeyDown(KEY_A)) CameraMoveRight(camera, -CAMERA_MOVE_SPEED); if (IsKeyDown(KEY_A)) CameraMoveRight(camera, -CAMERA_MOVE_SPEED, moveInWorldPlane);
if (IsKeyDown(KEY_SPACE)) CameraMoveUp(camera, CAMERA_MOVE_SPEED); if (IsKeyDown(KEY_SPACE)) CameraMoveUp(camera, CAMERA_MOVE_SPEED);
if (IsKeyDown(KEY_LEFT_CONTROL)) CameraMoveUp(camera, -CAMERA_MOVE_SPEED); if (IsKeyDown(KEY_LEFT_CONTROL)) CameraMoveUp(camera, -CAMERA_MOVE_SPEED);
// Camera rotation // Camera rotation
if (IsKeyDown(KEY_DOWN)) CameraPitch(camera, -CAMERA_ROTATION_SPEED); if (IsKeyDown(KEY_DOWN)) CameraPitch(camera, -CAMERA_ROTATION_SPEED, lockView, rotateAroundTarget, rotateUp);
if (IsKeyDown(KEY_UP)) CameraPitch(camera, CAMERA_ROTATION_SPEED); if (IsKeyDown(KEY_UP)) CameraPitch(camera, CAMERA_ROTATION_SPEED, lockView, rotateAroundTarget, rotateUp);
if (IsKeyDown(KEY_RIGHT)) CameraYaw(camera, -CAMERA_ROTATION_SPEED); if (IsKeyDown(KEY_RIGHT)) CameraYaw(camera, -CAMERA_ROTATION_SPEED, rotateAroundTarget);
if (IsKeyDown(KEY_LEFT)) CameraYaw(camera, CAMERA_ROTATION_SPEED); if (IsKeyDown(KEY_LEFT)) CameraYaw(camera, CAMERA_ROTATION_SPEED, rotateAroundTarget);
if (IsKeyDown(KEY_Q)) CameraRoll(camera, -CAMERA_ROTATION_SPEED); if (IsKeyDown(KEY_Q)) CameraRoll(camera, -CAMERA_ROTATION_SPEED);
if (IsKeyDown(KEY_E)) CameraRoll(camera, CAMERA_ROTATION_SPEED); if (IsKeyDown(KEY_E)) CameraRoll(camera, CAMERA_ROTATION_SPEED);
CameraYaw(camera, mousePositionDelta.x * -CAMERA_MOUSE_MOVE_SENSITIVITY); CameraYaw(camera, mousePositionDelta.x * -CAMERA_MOUSE_MOVE_SENSITIVITY, rotateAroundTarget);
CameraPitch(camera, mousePositionDelta.y * -CAMERA_MOUSE_MOVE_SENSITIVITY); CameraPitch(camera, mousePositionDelta.y * -CAMERA_MOUSE_MOVE_SENSITIVITY, lockView, rotateAroundTarget, rotateUp);
// Zoom target distance // Zoom target distance
CameraZoom(camera, -GetMouseWheelMove()); CameraZoom(camera, -GetMouseWheelMove());
@ -567,8 +567,8 @@ void UpdateCamera(Camera3D *camera)
camera->up = (Vector3){ 0.0f, 1.0f, 0.0f }; camera->up = (Vector3){ 0.0f, 1.0f, 0.0f };
camera->projection = CAMERA_ORTHOGRAPHIC; camera->projection = CAMERA_ORTHOGRAPHIC;
camera->fovy = 20.0f; // near plane width in CAMERA_ORTHOGRAPHIC camera->fovy = 20.0f; // near plane width in CAMERA_ORTHOGRAPHIC
CameraYaw(camera, -135 * DEG2RAD); CameraYaw(camera, -135 * DEG2RAD, rotateAroundTarget);
CameraPitch(camera, -45 * DEG2RAD); CameraPitch(camera, -45 * DEG2RAD, lockView, rotateAroundTarget, rotateUp);
} }
else if (camera->projection == CAMERA_ORTHOGRAPHIC) else if (camera->projection == CAMERA_ORTHOGRAPHIC)
{ {