christoph/cpp-masssprings
1
Fork 0
Code Releases Activity

small refactor

Browse Source
This commit is contained in:
Christoph Urlacher
2026-02-28 17:57:24 +01:00
parent 3f71603961
commit ef0ce51cbe
36 changed files with 4146 additions and 3560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/camera.cpp
View File

@ -5,69 +5,66 @@
#include <raymath.h>
#ifdef TRACY
#include "tracy.hpp"
#include <tracy/Tracy.hpp>
#endif
auto OrbitCamera3D::Rotate(Vector2 last_mouse, Vector2 mouse) -> void {
Vector2 dx = Vector2Subtract(mouse, last_mouse);
auto orbit_camera::rotate(const Vector2 last_mouse, const Vector2 mouse) -> void
{
const auto [dx, dy] = Vector2Subtract(mouse, last_mouse);
angle_x -= dx.x * ROT_SPEED / 200.0;
angle_y += dx.y * ROT_SPEED / 200.0;
angle_x -= dx * ROT_SPEED / 200.0f;
angle_y += dy * ROT_SPEED / 200.0f;
angle_y = Clamp(angle_y, -1.5, 1.5); // Prevent flipping
}
auto OrbitCamera3D::Pan(Vector2 last_mouse, Vector2 mouse) -> void {
Vector2 dx = Vector2Subtract(mouse, last_mouse);
auto orbit_camera::pan(const Vector2 last_mouse, const Vector2 mouse) -> void
{
const auto [dx, dy] = Vector2Subtract(mouse, last_mouse);
float speed;
if (IsKeyDown(KEY_LEFT_SHIFT)) {
speed = distance * PAN_SPEED / 1000.0 * PAN_MULTIPLIER;
speed = distance * PAN_SPEED / 1000.0f * PAN_MULTIPLIER;
} else {
speed = distance * PAN_SPEED / 1000.0;
speed = distance * PAN_SPEED / 1000.0f;
}
// The panning needs to happen in camera coordinates, otherwise rotating the
// camera breaks it
Vector3 forward =
Vector3Normalize(Vector3Subtract(camera.target, camera.position));
Vector3 right = Vector3Normalize(Vector3CrossProduct(forward, camera.up));
Vector3 up = Vector3Normalize(Vector3CrossProduct(right, forward));
const Vector3 forward = Vector3Normalize(Vector3Subtract(camera.target, camera.position));
const Vector3 right = Vector3Normalize(Vector3CrossProduct(forward, camera.up));
const Vector3 up = Vector3Normalize(Vector3CrossProduct(right, forward));
Vector3 offset = Vector3Add(Vector3Scale(right, -dx.x * speed),
Vector3Scale(up, dx.y * speed));
const Vector3 offset = Vector3Add(Vector3Scale(right, -dx * speed), Vector3Scale(up, dy * speed));
target = Vector3Add(target, offset);
}
auto OrbitCamera3D::Update(const Vector3 &current_target,
const Vector3 &mass_center, bool lock,
bool mass_center_lock) -> void {
auto orbit_camera::update(const Vector3& current_target, const Vector3& mass_center, const bool lock,
const bool mass_center_lock) -> void
{
if (lock) {
if (mass_center_lock) {
target = Vector3MoveTowards(
target, mass_center,
CAMERA_SMOOTH_SPEED * GetFrameTime() *
Vector3Length(Vector3Subtract(target, mass_center)));
target = Vector3MoveTowards(target, mass_center,
CAMERA_SMOOTH_SPEED * GetFrameTime() * Vector3Length(
Vector3Subtract(target, mass_center)));
} else {
target = Vector3MoveTowards(
target, current_target,
CAMERA_SMOOTH_SPEED * GetFrameTime() *
Vector3Length(Vector3Subtract(target, current_target)));
target = Vector3MoveTowards(target, current_target,
CAMERA_SMOOTH_SPEED * GetFrameTime() * Vector3Length(
Vector3Subtract(target, current_target)));
}
}
distance = Clamp(distance, MIN_CAMERA_DISTANCE, MAX_CAMERA_DISTANCE);
int actual_distance = distance;
float actual_distance = distance;
if (projection == CAMERA_ORTHOGRAPHIC) {
actual_distance = MAX_CAMERA_DISTANCE;
}
// Spherical coordinates
float x = cos(angle_y) * sin(angle_x) * actual_distance;
float y = sin(angle_y) * actual_distance;
float z = cos(angle_y) * cos(angle_x) * actual_distance;
const float x = cos(angle_y) * sin(angle_x) * actual_distance;
const float y = sin(angle_y) * actual_distance;
const float z = cos(angle_y) * cos(angle_x) * actual_distance;
fov = Clamp(fov, MIN_FOV, MAX_FOV);
@ -75,4 +72,4 @@ auto OrbitCamera3D::Update(const Vector3 &current_target,
camera.target = target;
camera.fovy = fov;
camera.projection = projection;
}
}