From 1b48d1382d2d57a822201f34743a51813798b348 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 18 Jan 2024 22:37:02 -0500 Subject: camera checkpoint - large refactor for attempting to let physics own camera position --- src/camera.hpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/camera.hpp') diff --git a/src/camera.hpp b/src/camera.hpp index 19e9da8..a2cce39 100644 --- a/src/camera.hpp +++ b/src/camera.hpp @@ -30,14 +30,12 @@ constexpr PkeCameraStaleFlags PKE_CAMERA_STALE_ALL = PkeCameraStaleFlags struct PkeCamera : public Entity_Base { CameraHandle camHandle = CameraHandle_MAX; - glm::vec3 pos = glm::vec3(0); - glm::quat rot = glm::quat{}; - glm::vec3 target = glm::vec3(0); PkeCameraType type = PkeCameraType_MAX; PkeCameraView view = PkeCameraView_MAX; PkeCameraStaleFlags stale = PkeCameraStaleFlags_MAX; struct Phys { CompInstance *inst = nullptr; + CompInstance *targetInst = nullptr; btTypedConstraint *constraint = nullptr; } phys; bool isPrimary = false; @@ -48,6 +46,7 @@ extern PkeCamera *ActiveCamera; void PkeCamera_Init(); PkeCamera &PkeCamera_Register(const InstPos &instPos); PkeCamera *PkeCamera_Get(CameraHandle handle); +PkeCamera *PkeCamera_Get(EntityHandle handle); void PkeCamera_AttachToInstance(CameraHandle cameraHandle, CompInstance *inst); void PkeCamera_DetachFromInstance(CameraHandle cameraHandle, CompInstance *inst); int64_t PkeCamera_GetBucketCount(); -- cgit v1.2.3