From c9f52b7223685d2e7fca925594171f94dd8c6e3b Mon Sep 17 00:00:00 2001 From: TrickyLeifa Date: Wed, 15 May 2024 00:00:17 +0200 Subject: Ported to CMake, ... * Ported the project to CMake * Android and Mac support dropped for the time being. * Tests, BASS and Discord-RPC are now options * Restructured and reformated the project. * Merged `include` and `src` * Renamed `resource` to `data` * Renamed various files * External libraries headers are no longer included in `src` * Replaced header guards with #pragma once * Multiple refactors (keywords, headers) * Added Qt6 compatibility * Removed various unused functions and headers * Reworked AOPacket * When content is passed to AOPacket, it should be ensured that the content is already decoded. * Encoding/decoding are now static methods. * Fixed various memory leaks * Removed animation code for AOImage * AOImage is always using static images * Simplified ChatLogPiece --- src/aoemotepreview.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/aoemotepreview.h (limited to 'src/aoemotepreview.h') diff --git a/src/aoemotepreview.h b/src/aoemotepreview.h new file mode 100644 index 00000000..ac86ff00 --- /dev/null +++ b/src/aoemotepreview.h @@ -0,0 +1,31 @@ +#pragma once + +#include "aolayer.h" +#include + +class AOEmotePreview : public QWidget +{ + Q_OBJECT + +public: + AOEmotePreview(AOApplication *p_ao_app, QWidget *parent = nullptr); + + void set_widgets(); + void play(QString emote, QString char_name, bool flipped = false, int self_offset = 0, int self_offset_v = 0); + +protected: + void resizeEvent(QResizeEvent *); + +private: + AOApplication *ao_app; + + QString m_emote; + QString m_char; + + QWidget *ui_viewport; + BackgroundLayer *ui_vp_background; + SplashLayer *ui_vp_speedlines; + CharLayer *ui_vp_player_char; + BackgroundLayer *ui_vp_desk; + QLabel *ui_size_label; +}; -- cgit From 1ef96383c8f7ed136a0e028aef0835b4838b5e95 Mon Sep 17 00:00:00 2001 From: TrickyLeifa Date: Fri, 17 May 2024 16:39:30 +0200 Subject: Lightly reworked `NetworkManager`, ... * Lightly reworked `NetworkManager` * Added new modules to handle various connection types. * TCP * WebSocket * Added general string splitter alias based on Qt version. * Replaced `lobby_constructed` and `courtroom_constructed` * Refactored and partially reimplemented the following classes: * `AOBlipPlayer` * `AOEmotePreview` * `AOMusicPlayer` * `AOSfxPlayer` * `AOTextArea` --- src/aoemotepreview.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/aoemotepreview.h') diff --git a/src/aoemotepreview.h b/src/aoemotepreview.h index ac86ff00..0cf88c9e 100644 --- a/src/aoemotepreview.h +++ b/src/aoemotepreview.h @@ -8,19 +8,20 @@ class AOEmotePreview : public QWidget Q_OBJECT public: - AOEmotePreview(AOApplication *p_ao_app, QWidget *parent = nullptr); + AOEmotePreview(AOApplication *ao_app, QWidget *parent = nullptr); - void set_widgets(); - void play(QString emote, QString char_name, bool flipped = false, int self_offset = 0, int self_offset_v = 0); + void display(QString character, QString emote, bool flipped = false, int xOffset = 0, int yOffset = 0); + + void updateViewportGeometry(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *event); private: AOApplication *ao_app; + QString m_character; QString m_emote; - QString m_char; QWidget *ui_viewport; BackgroundLayer *ui_vp_background; -- cgit