Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

include/dusk/frame_interpolation.h

@@ -6,7 +6,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-struct cXyz;
 class camera_process_class;
 
 #ifdef __cplusplus
@@ -15,7 +14,6 @@ namespace frame_interp {
 
 void ensure_initialized();
 
-void begin_record_camera();
 void begin_record();
 void end_record();
 void interpolate(float step);
@@ -39,8 +37,17 @@ void record_final_mtx_raw_tagged(const Mtx* dest, const Mtx src, uint64_t stable
 bool lookup_replacement(const void* source, Mtx out);
 bool lookup_concat_replacement(const void* lhs, const void* rhs, Mtx out);
 
-void camera_eye_from_view_mtx(MtxP view_mtx, cXyz* o_eye);
-bool build_star_view(Mtx o_view, Mtx o_cam_billboard_base, cXyz* o_anchor_eye, float* o_fovy);
+void begin_presentation_camera();
+void end_presentation_camera();
+
+struct PresentationCameraScope {
+    PresentationCameraScope() { begin_presentation_camera(); }
+    ~PresentationCameraScope() { end_presentation_camera(); }
+    PresentationCameraScope(const PresentationCameraScope&) = delete;
+    PresentationCameraScope& operator=(const PresentationCameraScope&) = delete;
+    PresentationCameraScope(PresentationCameraScope&&) = delete;
+    PresentationCameraScope& operator=(PresentationCameraScope&&) = delete;
+};
 
 uint64_t alloc_simple_shadow_pair_base();
 }  // namespace frame_interp

include/dusk/gyro.h

@@ -0,0 +1,17 @@
+#ifndef DUSK_GYRO_H
+#define DUSK_GYRO_H
+
+namespace dusk::gyro {
+void read(float dt);
+void getAimDeltas(float& out_yaw, float& out_pitch);
+bool queryGyroAimItemContext();
+
+void rollgoalTick(bool play_active, s16 camera_yaw);
+void rollgoalTableOffset(s16& out_ax, s16& out_az);
+
+extern bool s_sensor_keep_alive;
+bool get_sensor_keep_alive();
+void set_sensor_keep_alive(bool value);
+}  // namespace dusk::gyro
+
+#endif

include/dusk/gyro_aim.h

@@ -1,10 +0,0 @@
-#ifndef DUSK_GYRO_AIM_H
-#define DUSK_GYRO_AIM_H
-
-namespace dusk::gyro_aim {
-void read(float dt, bool context_active);
-void consumeAimDeltas(float& out_yaw_rad, float& out_pitch_rad);
-bool queryGyroAimItemContext();
-}  // namespace dusk::gyro_aim
-
-#endif

include/dusk/settings.h

@@ -81,10 +81,14 @@ struct UserSettings {
 
         // Input
         ConfigVar<bool> enableGyroAim;
-        ConfigVar<float> gyroAimSensitivityX;
-        ConfigVar<float> gyroAimSensitivityY;
-        ConfigVar<bool> gyroAimInvertPitch;
-        ConfigVar<bool> gyroAimInvertYaw;
+        ConfigVar<bool> enableGyroRollgoal;
+        ConfigVar<float> gyroSensitivityX;
+        ConfigVar<float> gyroSensitivityY;
+        ConfigVar<float> gyroSensitivityRollgoal;
+        ConfigVar<float> gyroSmoothing;
+        ConfigVar<float> gyroDeadband;
+        ConfigVar<bool> gyroInvertPitch;
+        ConfigVar<bool> gyroInvertYaw;
 
         // Cheats
         ConfigVar<bool> enableFastIronBoots;
@@ -106,6 +110,7 @@ struct UserSettings {
         ConfigVar<bool> showPipelineCompilation;
         ConfigVar<bool> wasPresetChosen;
         ConfigVar<bool> enableCrashReporting;
+        ConfigVar<bool> duskMenuOpen;
     } backend;
 };