From b2548ba4ce295fcd94a50123fb543fac2ef2bc33 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 14 Nov 2024 14:46:23 -0500 Subject: add pk.h and major pkmem refactor Completely replaces the memory module with pkmem pkmem is a newer implementation of the same bucket memory structure. Also includes replacing pkstr.h with pk.h's pkstr --- src/camera.hpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/camera.hpp') diff --git a/src/camera.hpp b/src/camera.hpp index f4714c1..156aa5c 100644 --- a/src/camera.hpp +++ b/src/camera.hpp @@ -1,20 +1,19 @@ #ifndef PKE_CAMERA_HPP #define PKE_CAMERA_HPP +#include "vendor/pk.h" #include "components.hpp" -#include "macros.hpp" #include "vendor/glm_include.hpp" -#include "memory-type-defs.hpp" #include -TypeSafeInt_Const_Expr(PkeCameraType, uint8_t, 0xFF); -TypeSafeInt_Const_Expr(PkeCameraView, uint8_t, 0xFF); -TypeSafeInt_Const_Expr(PkeCameraStaleFlags, uint8_t, 0xFF); +TypeSafeInt_constexpr(PkeCameraType, uint8_t, 0xFF); +TypeSafeInt_constexpr(PkeCameraView, uint8_t, 0xFF); +TypeSafeInt_constexpr(PkeCameraStaleFlags, uint8_t, 0xFF); -struct CameraHandle : public PkeHandle {}; +struct CameraHandle : public pk_handle {}; -constexpr CameraHandle CameraHandle_MAX = CameraHandle{}; +constexpr CameraHandle CameraHandle_MAX = CameraHandle{ pk_handle_MAX_constexpr }; constexpr PkeCameraType PKE_CAMERA_TYPE_PERSPECTIVE = PkeCameraType{1 << 0}; constexpr PkeCameraType PKE_CAMERA_TYPE_ORTHOGONAL = PkeCameraType{1 << 1}; -- cgit v1.2.3