updated camera speeds with GetFrameTime

raysan5 · Oct 4, 2024 · 5670312 · 5670312
1 parent 96d91a3
commit 5670312
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/rcamera.h b/src/rcamera.h
@@ -444,34 +444,40 @@ void UpdateCamera(Camera *camera, int mode)
  bool lockView = ((mode == CAMERA_FREE) || (mode == CAMERA_FIRST_PERSON) || (mode == CAMERA_THIRD_PERSON) || (mode == CAMERA_ORBITAL));
  bool rotateUp = false;
 
+ // Camera speeds based on frame time
+ float cameraMoveSpeed = CAMERA_MOVE_SPEED*GetFrameTime();
+ float cameraRotationSpeed = CAMERA_ROTATION_SPEED*GetFrameTime();
+ float cameraPanSpeed = CAMERA_PAN_SPEED*GetFrameTime();
+ float cameraOrbitalSpeed = CAMERA_ORBITAL_SPEED*GetFrameTime();
+
  if (mode == CAMERA_CUSTOM) {}
  else if (mode == CAMERA_ORBITAL)
  {
  // Orbital can just orbit
- Matrix rotation = MatrixRotate(GetCameraUp(camera), CAMERA_ORBITAL_SPEED*GetFrameTime());
+ Matrix rotation = MatrixRotate(GetCameraUp(camera), cameraOrbitalSpeed);
  Vector3 view = Vector3Subtract(camera->position, camera->target);
  view = Vector3Transform(view, rotation);
  camera->position = Vector3Add(camera->target, view);
  }
  else
  {
  // Camera rotation
- if (IsKeyDown(KEY_DOWN)) CameraPitch(camera, -CAMERA_ROTATION_SPEED, lockView, rotateAroundTarget, rotateUp);
- if (IsKeyDown(KEY_UP)) CameraPitch(camera, CAMERA_ROTATION_SPEED, lockView, rotateAroundTarget, rotateUp);
- if (IsKeyDown(KEY_RIGHT)) CameraYaw(camera, -CAMERA_ROTATION_SPEED, rotateAroundTarget);
- if (IsKeyDown(KEY_LEFT)) CameraYaw(camera, CAMERA_ROTATION_SPEED, rotateAroundTarget);
- if (IsKeyDown(KEY_Q)) CameraRoll(camera, -CAMERA_ROTATION_SPEED);
- if (IsKeyDown(KEY_E)) CameraRoll(camera, CAMERA_ROTATION_SPEED);
+ if (IsKeyDown(KEY_DOWN)) CameraPitch(camera, -cameraRotationSpeed, lockView, rotateAroundTarget, rotateUp);
+ if (IsKeyDown(KEY_UP)) CameraPitch(camera, cameraRotationSpeed, lockView, rotateAroundTarget, rotateUp);
+ if (IsKeyDown(KEY_RIGHT)) CameraYaw(camera, -cameraRotationSpeed, rotateAroundTarget);
+ if (IsKeyDown(KEY_LEFT)) CameraYaw(camera, cameraRotationSpeed, rotateAroundTarget);
+ if (IsKeyDown(KEY_Q)) CameraRoll(camera, -cameraRotationSpeed);
+ if (IsKeyDown(KEY_E)) CameraRoll(camera, cameraRotationSpeed);
 
  // Camera movement
  // Camera pan (for CAMERA_FREE)
  if ((mode == CAMERA_FREE) && (IsMouseButtonDown(MOUSE_BUTTON_MIDDLE)))
  {
  const Vector2 mouseDelta = GetMouseDelta();
- if (mouseDelta.x > 0.0f) CameraMoveRight(camera, CAMERA_PAN_SPEED, moveInWorldPlane);
- if (mouseDelta.x < 0.0f) CameraMoveRight(camera, -CAMERA_PAN_SPEED, moveInWorldPlane);
- if (mouseDelta.y > 0.0f) CameraMoveUp(camera, -CAMERA_PAN_SPEED);
- if (mouseDelta.y < 0.0f) CameraMoveUp(camera, CAMERA_PAN_SPEED);
+ if (mouseDelta.x > 0.0f) CameraMoveRight(camera, cameraPanSpeed, moveInWorldPlane);
+ if (mouseDelta.x < 0.0f) CameraMoveRight(camera, -cameraPanSpeed, moveInWorldPlane);
+ if (mouseDelta.y > 0.0f) CameraMoveUp(camera, -cameraPanSpeed);
+ if (mouseDelta.y < 0.0f) CameraMoveUp(camera, cameraPanSpeed);
  }
  else
  {
@@ -481,7 +487,6 @@ void UpdateCamera(Camera *camera, int mode)
  }
 
  // Keyboard support
- float cameraMoveSpeed = CAMERA_MOVE_SPEED*GetFrameTime();
  if (IsKeyDown(KEY_W)) CameraMoveForward(camera, cameraMoveSpeed, moveInWorldPlane);
  if (IsKeyDown(KEY_A)) CameraMoveRight(camera, -cameraMoveSpeed, moveInWorldPlane);
  if (IsKeyDown(KEY_S)) CameraMoveForward(camera, -cameraMoveSpeed, moveInWorldPlane);