Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hide charlayers on area switch background changes

Browse Source 
only applicable on servers which send displayable background updates on area switch
This commit is contained in:
in1tiate 2024-06-11 18:10:22 -05:00
parent 7897033205
commit 8ca0acc5f4
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/animationlayer.cpp
View File

@ -257,6 +257,8 @@ void AnimationLayer::calculateFrameGeometry()
int x = (m_scaled_frame_size.width() - widget_size.width()) / 2; 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()); 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) if (m_transformation_mode_hint == Qt::FastTransformation)
{ {
m_transformation_mode = scale < 1.0 ? Qt::SmoothTransformation : 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); setFileName(file_path);
setPlayOnce(play_once); 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")); setStretchToFit(ao_app->get_emote_property(character, fileName, "stretch").startsWith("true"));
if (synchronize_frame && previous_frame_count == frameCount()) if (synchronize_frame && previous_frame_count == frameCount())
{ {

9
src/courtroom.cpp
View File

@ -1438,7 +1438,9 @@ void Courtroom::set_background(QString p_background, bool display)
{ {
ui_vp_speedlines->hide(); ui_vp_speedlines->hide();
ui_vp_player_char->stopPlayback(); ui_vp_player_char->stopPlayback();
ui_vp_player_char->hide();
ui_vp_sideplayer_char->stopPlayback(); ui_vp_sideplayer_char->stopPlayback();
ui_vp_sideplayer_char->hide();
ui_vp_effect->stopPlayback(); ui_vp_effect->stopPlayback();
ui_vp_effect->hide(); ui_vp_effect->hide();
ui_vp_message->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 pre_emote = ao_app->get_pre_emote(current_char, current_emote);
QString emote = ao_app->get_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"}; QStringList effects_to_check = {"_FrameScreenshake", "_FrameRealization", "_FrameSFX"};
foreach (QString f_effect, effects_to_check) foreach (QString f_effect, effects_to_check)
@ -2281,6 +2283,7 @@ void Courtroom::on_chat_return_pressed()
packet += "^"; packet += "^";
} }
packet_contents.append(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 // 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->loadCharacterEmote(m_chatmessage[OTHER_NAME], m_chatmessage[OTHER_EMOTE], kal::CharacterAnimationLayer::IdleEmote);
ui_vp_sideplayer_char->show();
ui_vp_sideplayer_char->setPlayOnce(false); ui_vp_sideplayer_char->setPlayOnce(false);
// Flip the pair character // 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->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); 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]); 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]; filename = m_chatmessage[EMOTE];
ui_vp_player_char->loadCharacterEmote(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE], kal::CharacterAnimationLayer::TalkEmote); 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->setPlayOnce(false);
ui_vp_player_char->show();
ui_vp_player_char->startPlayback(); ui_vp_player_char->startPlayback();
// Set the anim state accordingly // Set the anim state accordingly
} }
@ -3475,6 +3481,7 @@ void Courtroom::handle_ic_speaking()
filename = m_chatmessage[EMOTE]; filename = m_chatmessage[EMOTE];
ui_vp_player_char->loadCharacterEmote(m_chatmessage[CHAR_NAME], m_chatmessage[EMOTE], kal::CharacterAnimationLayer::IdleEmote); 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->setPlayOnce(false);
ui_vp_player_char->show();
ui_vp_player_char->startPlayback(); ui_vp_player_char->startPlayback();
} }