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

src/d/actor/d_a_midna.cpp

@@ -419,9 +419,30 @@ int daMidna_c::createHeap() {
             return 0;
         }
 
+#if TARGET_PC
+        if (mpDemoFCTongueBmd != NULL) {
+            if(!daAlink_c::initDemoBck(&mpDemoFCTmpBck, "demo00_Midna_cut00_FC_tmp.bck")) {
+                return 0;
+            }
+
+            // Update Midna's eye maxLOD to prevent the eyes from disappearing
+            J3DTexture* tex = mpDemoFCTongueBmd->getModelData()->getTexture();
+            JUTNameTab* nametable = mpDemoFCTongueBmd->getModelData()->getTextureName();
+            if (tex != nullptr && nametable != nullptr) {
+                for (u16 i = 0; i < tex->getNum(); i++) {
+                    const char* tex_name = nametable->getName(i);
+                    if (tex_name != NULL && strcmp(tex_name, "midona_eyeball") == 0) {
+                        ResTIMG* timg = tex->getResTIMG(i);
+                        timg->maxLOD = 0;
+                    }
+                }
+            }
+        }
+#else
         if (mpDemoFCTongueBmd != NULL && !daAlink_c::initDemoBck(&mpDemoFCTmpBck, "demo00_Midna_cut00_FC_tmp.bck")) {
             return 0;
         }
+#endif
 
         modelData =
             (J3DModelData*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), "demo00_Midna_cut00_BD_tmp.bmd");
@@ -433,6 +454,21 @@ int daMidna_c::createHeap() {
 
             modelData->getMaterialNodePointer(2)->setMaterialAnm(mpEyeMatAnm[0]);
             modelData->getMaterialNodePointer(3)->setMaterialAnm(mpEyeMatAnm[1]);
+
+#if TARGET_PC
+            // Update Midna's eye maxLOD to prevent the eyes from disappearing
+            J3DTexture* tex = modelData->getTexture();
+            JUTNameTab* nametable = modelData->getTextureName();
+            if (tex != nullptr && nametable != nullptr) {
+                for (u16 i = 0; i < tex->getNum(); i++) {
+                    const char* tex_name = nametable->getName(i);
+                    if (tex_name != NULL && strcmp(tex_name, "midona_eyeball") == 0) {
+                        ResTIMG* timg = tex->getResTIMG(i);
+                        timg->maxLOD = 0;
+                    }
+                }
+            }
+#endif
         }
 
         if (!initDemoModel(&mpDemoBDMaskBmd, "demo00_Midna_cut00_BD_mask.bmd", 0)) {

src/dusk/ui/number_button.cpp

@@ -54,7 +54,7 @@ void NumberButton::set_value(Rml::String value) {
 }
 
 bool NumberButton::handle_nav_command(NavCommand cmd) {
-    if (cmd == NavCommand::Left || cmd == NavCommand::Right) {
+    if (!is_editing() && (cmd == NavCommand::Left || cmd == NavCommand::Right)) {
         const int newValue = std::clamp(
             mGetValue() + (cmd == NavCommand::Right ? mStep : -mStep), mMin, mMax);
         if (newValue != mGetValue()) {
@@ -66,4 +66,4 @@ bool NumberButton::handle_nav_command(NavCommand cmd) {
     return BaseStringButton::handle_nav_command(cmd);
 }
 
-}  // namespace dusk::ui
+}  // namespace dusk::ui

src/dusk/ui/string_button.cpp

@@ -24,7 +24,7 @@ void BaseStringButton::update() {
 }
 
 void BaseStringButton::start_editing() {
-    if (mInputElem != nullptr) {
+    if (is_editing()) {
         return;
     }
 
@@ -79,14 +79,14 @@ void BaseStringButton::request_stop_editing(bool commit, bool refocusRoot) {
 
 bool BaseStringButton::handle_nav_command(NavCommand cmd) {
     if (cmd == NavCommand::Confirm) {
-        if (mInputElem == nullptr) {
+        if (!is_editing()) {
             start_editing();
         } else {
             request_stop_editing(true, true);
         }
         return true;
     } else if (cmd == NavCommand::Cancel) {
-        if (mInputElem != nullptr) {
+        if (is_editing()) {
             request_stop_editing(false, true);
             return true;
         }
@@ -95,7 +95,7 @@ bool BaseStringButton::handle_nav_command(NavCommand cmd) {
 }
 
 void BaseStringButton::focus_input() {
-    if (mInputElem == nullptr) {
+    if (!is_editing()) {
         return;
     }
 
@@ -111,7 +111,7 @@ void BaseStringButton::focus_input() {
 void BaseStringButton::stop_editing(bool commit, bool refocusRoot) {
     mPendingStopEditing = false;
     mPendingInputFocusFrames = 0;
-    if (mInputElem == nullptr) {
+    if (!is_editing()) {
         return;
     }
     if (commit) {

src/dusk/ui/string_button.hpp

@@ -20,6 +20,7 @@ public:
     void request_stop_editing(bool commit, bool refocusRoot);
 
 protected:
+    bool is_editing() { return mInputElem != nullptr; }
     bool handle_nav_command(NavCommand cmd) override;
     virtual void set_value(Rml::String value) = 0;
     virtual Rml::String input_value() { return format_value(); }