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

include/d/actor/d_a_alink.h

@@ -4550,6 +4550,7 @@ public:
 
 #if TARGET_PC
     void handleQuickTransform();
+    bool checkGyroAimItemContext();
 #endif
 };  // Size: 0x385C
 

include/d/d_bg_w_kcol.h

@@ -115,16 +115,7 @@ public:
         return pd;
     }
 
-    void getTri1Pos(KC_PrismData* pd, Vec** nrm) const {
-#if TARGET_PC
-        static Vec pos_v;
-        pos_v = m_pkc_head->m_pos_data[pd->pos_i];
-        be_swap(pos_v);
-        *nrm = &pos_v;
-#else
-        *nrm = &m_pkc_head->m_pos_data[pd->pos_i];
-#endif
-    }
+    void getTri1Pos(KC_PrismData* pd, Vec** nrm) const { *nrm = &m_pkc_head->m_pos_data[pd->pos_i]; }
 
 private:
     /* 0x18 */ KC_Header* m_pkc_head;

include/dusk/frame_interpolation.h

@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 struct cXyz;
+class camera_process_class;
 
 #ifdef __cplusplus
 namespace dusk {
@@ -14,6 +15,7 @@ namespace frame_interp {
 
 void ensure_initialized();
 
+void begin_record_camera();
 void begin_record();
 void end_record();
 void interpolate(float step);
@@ -25,12 +27,14 @@ void end_presentation_ui_pass();
 
 void open_child(const void* key, int32_t id);
 void close_child();
+void record_camera(::camera_process_class* cam, int camera_id);
 void record_final_mtx_raw(const Mtx* dest, const Mtx src);
 
 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);
 
 }  // namespace frame_interp
 }  // namespace dusk

include/dusk/gyro_aim.h

@@ -0,0 +1,10 @@
+#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

@@ -35,11 +35,13 @@ struct UserSettings {
         // QoL
         ConfigVar<bool> enableQuickTransform;
         ConfigVar<bool> hideTvSettingsScreen;
+        ConfigVar<bool> skipWarningScreen;
         ConfigVar<bool> biggerWallets;
         ConfigVar<bool> noReturnRupees;
         ConfigVar<bool> disableRupeeCutscenes;
         ConfigVar<bool> noSwordRecoil;
         ConfigVar<int> damageMultiplier;
+        ConfigVar<bool> noHeartDrops;
         ConfigVar<bool> instantDeath;
         ConfigVar<bool> fastClimbing;
         ConfigVar<bool> noMissClimbing;
@@ -60,6 +62,12 @@ struct UserSettings {
         ConfigVar<bool> noLowHpSound;
         ConfigVar<bool> midnasLamentNonStop;
 
+        // Input
+        ConfigVar<bool> enableGyroAim;
+        ConfigVar<float> gyroAimSensitivity;
+        ConfigVar<bool> gyroAimInvertPitch;
+        ConfigVar<bool> gyroAimInvertYaw;
+
         // Cheats
         ConfigVar<bool> enableFastIronBoots;
         ConfigVar<bool> canTransformAnywhere;
@@ -102,6 +110,7 @@ struct CollisionViewSettings {
 struct TransientSettings {
     CollisionViewSettings collisionView;
     bool skipFrameRateLimit;
+    bool moveLinkActive;
 };
 
 TransientSettings& getTransientSettings();