From 8ca0acc5f4870db5fa7beae88340e96b48cf3b7c Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:10:22 -0500 Subject: [PATCH 1/2] hide charlayers on area switch background changes only applicable on servers which send displayable background updates on area switch --- src/animationlayer.cpp | 5 ++++- src/courtroom.cpp | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/animationlayer.cpp b/src/animationlayer.cpp index 708aef2..779e27c 100644 --- a/src/animationlayer.cpp +++ b/src/animationlayer.cpp @@ -257,6 +257,8 @@ void AnimationLayer::calculateFrameGeometry() int x = (m_scaled_frame_size.width() - widget_size.width()) / 2; m_display_rect = QRect(x, 0, widget_size.width(), m_scaled_frame_size.height()); + qDebug() << (scale < 1.0); + if (m_transformation_mode_hint == Qt::FastTransformation) { m_transformation_mode = scale < 1.0 ? Qt::SmoothTransformation : Qt::FastTransformation; @@ -459,7 +461,8 @@ void CharacterAnimationLayer::loadCharacterEmote(QString character, QString file setFileName(file_path); setPlayOnce(play_once); - setTransformationMode(ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling"))); + Qt::TransformationMode char_transform = ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling")); + setTransformationMode(char_transform); setStretchToFit(ao_app->get_emote_property(character, fileName, "stretch").startsWith("true")); if (synchronize_frame && previous_frame_count == frameCount()) { diff --git a/src/courtroom.cpp b/src/courtroom.cpp index c2c3421..2a5740b 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1438,7 +1438,9 @@ void Courtroom::set_background(QString p_background, bool display) { ui_vp_speedlines->hide(); ui_vp_player_char->stopPlayback(); + ui_vp_player_char->hide(); ui_vp_sideplayer_char->stopPlayback(); + ui_vp_sideplayer_char->hide(); ui_vp_effect->stopPlayback(); ui_vp_effect->hide(); ui_vp_message->hide(); @@ -2261,7 +2263,7 @@ void Courtroom::on_chat_return_pressed() QString pre_emote = ao_app->get_pre_emote(current_char, current_emote); QString emote = ao_app->get_emote(current_char, current_emote); - QStringList emotes_to_check = {pre_emote, "(b)" + emote, "(a)" + emote}; + QStringList emotes_to_check = {pre_emote, "(b)" + emote, "(a)" + emote, "(b)/" + emote, "(a)/" + emote}; QStringList effects_to_check = {"_FrameScreenshake", "_FrameRealization", "_FrameSFX"}; foreach (QString f_effect, effects_to_check) @@ -2281,6 +2283,7 @@ void Courtroom::on_chat_return_pressed() packet += "^"; } packet_contents.append(packet); + qDebug() << packet; } } @@ -2840,6 +2843,7 @@ void Courtroom::display_pair_character(QString other_charid, QString other_offse // Play the other pair character's idle animation ui_vp_sideplayer_char->loadCharacterEmote(m_chatmessage[OTHER_NAME], m_chatmessage[OTHER_EMOTE], kal::CharacterAnimationLayer::IdleEmote); + ui_vp_sideplayer_char->show(); ui_vp_sideplayer_char->setPlayOnce(false); // Flip the pair character @@ -3065,6 +3069,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP }; ui_vp_player_char->loadCharacterEmote(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE], kal::CharacterAnimationLayer::IdleEmote); + ui_vp_player_char->show(); ui_vp_player_char->setFlipped(m_chatmessage[FLIP].toInt() == 1); calculate_offset_and_setup_layer(ui_vp_player_char, scaled_new_pos, m_chatmessage[SELF_OFFSET]); @@ -3465,6 +3470,7 @@ void Courtroom::handle_ic_speaking() filename = m_chatmessage[EMOTE]; ui_vp_player_char->loadCharacterEmote(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE], kal::CharacterAnimationLayer::TalkEmote); ui_vp_player_char->setPlayOnce(false); + ui_vp_player_char->show(); ui_vp_player_char->startPlayback(); // Set the anim state accordingly } @@ -3475,6 +3481,7 @@ void Courtroom::handle_ic_speaking() filename = m_chatmessage[EMOTE]; ui_vp_player_char->loadCharacterEmote(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE], kal::CharacterAnimationLayer::IdleEmote); ui_vp_player_char->setPlayOnce(false); + ui_vp_player_char->show(); ui_vp_player_char->startPlayback(); } From 9eb9b6f965d6b7abec6d5bf447eb88151bbc2b92 Mon Sep 17 00:00:00 2001 From: in1tiate <32779090+in1tiate@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:13:17 -0500 Subject: [PATCH 2/2] remove accidentally included debug calls --- src/animationlayer.cpp | 5 +---- src/courtroom.cpp | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/animationlayer.cpp b/src/animationlayer.cpp index 779e27c..708aef2 100644 --- a/src/animationlayer.cpp +++ b/src/animationlayer.cpp @@ -257,8 +257,6 @@ void AnimationLayer::calculateFrameGeometry() int x = (m_scaled_frame_size.width() - widget_size.width()) / 2; m_display_rect = QRect(x, 0, widget_size.width(), m_scaled_frame_size.height()); - qDebug() << (scale < 1.0); - if (m_transformation_mode_hint == Qt::FastTransformation) { m_transformation_mode = scale < 1.0 ? Qt::SmoothTransformation : Qt::FastTransformation; @@ -461,8 +459,7 @@ void CharacterAnimationLayer::loadCharacterEmote(QString character, QString file setFileName(file_path); setPlayOnce(play_once); - Qt::TransformationMode char_transform = ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling")); - setTransformationMode(char_transform); + setTransformationMode(ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling"))); setStretchToFit(ao_app->get_emote_property(character, fileName, "stretch").startsWith("true")); if (synchronize_frame && previous_frame_count == frameCount()) { diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 2a5740b..2cb5143 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -2263,7 +2263,7 @@ void Courtroom::on_chat_return_pressed() QString pre_emote = ao_app->get_pre_emote(current_char, current_emote); QString emote = ao_app->get_emote(current_char, current_emote); - QStringList emotes_to_check = {pre_emote, "(b)" + emote, "(a)" + emote, "(b)/" + emote, "(a)/" + emote}; + QStringList emotes_to_check = {pre_emote, "(b)" + emote, "(a)" + emote}; QStringList effects_to_check = {"_FrameScreenshake", "_FrameRealization", "_FrameSFX"}; foreach (QString f_effect, effects_to_check) @@ -2283,7 +2283,6 @@ void Courtroom::on_chat_return_pressed() packet += "^"; } packet_contents.append(packet); - qDebug() << packet; } }