[Scummvm-git-logs] scummvm master -> c8bd5774952f231f2ba4d5465a7bee1587cc08ec
sev-
noreply at scummvm.org
Sat Nov 2 19:12:37 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
632d20dc47 QDENGINE: DT: Print frame number for personages
5f7e562ebe QDENGINE: DT: Replace animation flags with icons
c8bd577495 QDENGINE: DT: Replaced game object flags with icons
Commit: 632d20dc4773c14d55868064fff06c775bcd7466
https://github.com/scummvm/scummvm/commit/632d20dc4773c14d55868064fff06c775bcd7466
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-02T20:12:08+01:00
Commit Message:
QDENGINE: DT: Print frame number for personages
Changed paths:
engines/qdengine/debugger/debugtools.cpp
diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index 526bfa93fc6..724c98b98af 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -443,12 +443,14 @@ void showScenePersonages() {
qdGameDispatcher *dp = qdGameDispatcher::get_dispatcher();
if (dp && ((scene = dp->get_active_scene()))) {
if (!scene->getPersonages()->empty()) {
- if (ImGui::BeginTable("Personages", 6, ImGuiTableFlags_Borders)) {
+ if (ImGui::BeginTable("Personages", 7, ImGuiTableFlags_Borders)) {
ImGuiTableFlags flags = ImGuiTableColumnFlags_WidthFixed;
ImGui::TableSetupColumn("Name", flags);
ImGui::TableSetupColumn("Flags", flags);
ImGui::TableSetupColumn("Control", flags);
ImGui::TableSetupColumn("Movement", flags);
+
+ ImGui::TableSetupColumn("Frame", flags);
ImGui::TableSetupColumn("Anim Flags", flags);
ImGui::TableSetupColumn("Anim Status", flags);
@@ -477,6 +479,10 @@ void showScenePersonages() {
qdAnimation *anim = it->get_animation();
ImGui::TableNextColumn();
+ ImGui::Text("%d", anim->get_cur_frame_number());
+
+ ImGui::TableNextColumn();
+
ImGui::Text(qdAnimation::flag2str(anim->flags(), true).c_str());
ImGui::TableNextColumn();
Commit: 5f7e562ebee7a4e423b5618a820bb6582a640019
https://github.com/scummvm/scummvm/commit/5f7e562ebee7a4e423b5618a820bb6582a640019
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-02T20:12:12+01:00
Commit Message:
QDENGINE: DT: Replace animation flags with icons
Changed paths:
engines/qdengine/debugger/debugtools.cpp
engines/qdengine/qdcore/qd_animation.cpp
engines/qdengine/qdcore/qd_animation.h
diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index 724c98b98af..b68d26aa5bc 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -483,7 +483,8 @@ void showScenePersonages() {
ImGui::TableNextColumn();
- ImGui::Text(qdAnimation::flag2str(anim->flags(), true).c_str());
+ ImGui::Text(qdAnimation::flag2str(anim->flags(), true, true).c_str());
+ ImGui::SetItemTooltip(qdAnimation::flag2str(anim->flags(), true).c_str());
ImGui::TableNextColumn();
diff --git a/engines/qdengine/qdcore/qd_animation.cpp b/engines/qdengine/qdcore/qd_animation.cpp
index 62640637d2b..61a18f405f1 100644
--- a/engines/qdengine/qdcore/qd_animation.cpp
+++ b/engines/qdengine/qdcore/qd_animation.cpp
@@ -22,6 +22,8 @@
#include "common/debug.h"
#include "common/file.h"
+#include "backends/imgui/IconsMaterialSymbols.h"
+
#include "qdengine/qdengine.h"
#include "qdengine/qd_fwd.h"
@@ -1182,33 +1184,37 @@ uint32 qdAnimation::resource_data_size() const {
}
#endif
-#define defFlag(x) { x, #x }
+#define defFlag(x, i) { x, #x, i }
struct FlagsList {
int f;
const char *s;
+ const char *i;
} static flagList[] = {
- defFlag(QD_ANIMATION_FLAG_REFERENCE),
- defFlag(QD_ANIMATION_FLAG_REFERENCE),
- defFlag(QD_ANIMATION_FLAG_LOOP),
- defFlag(QD_ANIMATION_FLAG_FLIP_HORIZONTAL),
- defFlag(QD_ANIMATION_FLAG_FLIP_VERTICAL),
- defFlag(QD_ANIMATION_FLAG_BLACK_FON),
- defFlag(QD_ANIMATION_FLAG_SUPPRESS_ALPHA),
- defFlag(QD_ANIMATION_FLAG_CROP),
- defFlag(QD_ANIMATION_FLAG_COMPRESS),
- defFlag(QD_ANIMATION_FLAG_TILE_COMPRESS),
+ defFlag(QD_ANIMATION_FLAG_REFERENCE, ICON_MS_ARTICLE_SHORTCUT),
+ defFlag(QD_ANIMATION_FLAG_LOOP, ICON_MS_REPEAT),
+ defFlag(QD_ANIMATION_FLAG_FLIP_HORIZONTAL, ICON_MS_ARROWS_OUTWARD),
+ defFlag(QD_ANIMATION_FLAG_FLIP_VERTICAL, ICON_MS_HEIGHT),
+ defFlag(QD_ANIMATION_FLAG_BLACK_FON, ICON_MS_BACKGROUND_REPLACE),
+ defFlag(QD_ANIMATION_FLAG_SUPPRESS_ALPHA, ICON_MS_IMAGE),
+ defFlag(QD_ANIMATION_FLAG_CROP, ICON_MS_CROP),
+ defFlag(QD_ANIMATION_FLAG_COMPRESS, ICON_MS_COMPRESS),
+ defFlag(QD_ANIMATION_FLAG_TILE_COMPRESS, ICON_MS_GRID_VIEW),
};
-Common::String qdAnimation::flag2str(int fl, bool truncate) {
+Common::String qdAnimation::flag2str(int fl, bool truncate, bool icon) {
Common::String res;
for (int i = 0; i < ARRAYSIZE(flagList); i++) {
if (fl & flagList[i].f) {
- if (!res.empty())
- res += " | ";
+ if (!icon) {
+ if (!res.empty())
+ res += " | ";
- res += &flagList[i].s[truncate ? 18 : 0];
+ res += &flagList[i].s[truncate ? 18 : 0];
+ } else {
+ res += flagList[i].i;
+ }
fl &= ~flagList[i].f;
}
diff --git a/engines/qdengine/qdcore/qd_animation.h b/engines/qdengine/qdcore/qd_animation.h
index 7f153a1fa03..59e7c398ed2 100644
--- a/engines/qdengine/qdcore/qd_animation.h
+++ b/engines/qdengine/qdcore/qd_animation.h
@@ -273,7 +273,7 @@ public:
return _tileAnimation;
}
- static Common::String flag2str(int fl, bool truncate = false);
+ static Common::String flag2str(int fl, bool truncate = false, bool icon = false);
static Common::String status2str(int fl, bool truncate = false);
private:
Commit: c8bd5774952f231f2ba4d5465a7bee1587cc08ec
https://github.com/scummvm/scummvm/commit/c8bd5774952f231f2ba4d5465a7bee1587cc08ec
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-02T20:12:12+01:00
Commit Message:
QDENGINE: DT: Replaced game object flags with icons
Changed paths:
engines/qdengine/debugger/debugtools.cpp
engines/qdengine/qdcore/qd_game_object_state.cpp
engines/qdengine/qdcore/qd_game_object_state.h
diff --git a/engines/qdengine/debugger/debugtools.cpp b/engines/qdengine/debugger/debugtools.cpp
index b68d26aa5bc..4ffa62960be 100644
--- a/engines/qdengine/debugger/debugtools.cpp
+++ b/engines/qdengine/debugger/debugtools.cpp
@@ -466,7 +466,8 @@ void showScenePersonages() {
ImGui::TableNextColumn();
qdGameObjectState *st = it->get_state(it->cur_state());
- ImGui::Text("%s", st ? qdGameObjectState::flag2str(st->flags(), true).c_str() : "<none>");
+ ImGui::Text("%s", st ? qdGameObjectState::flag2str(st->flags(), true, true).c_str() : "<none>");
+ ImGui::SetItemTooltip("%s", st ? qdGameObjectState::flag2str(st->flags(), true).c_str() : "<none>");
ImGui::TableNextColumn();
diff --git a/engines/qdengine/qdcore/qd_game_object_state.cpp b/engines/qdengine/qdcore/qd_game_object_state.cpp
index 51c394f6ec6..6f9aa0cdbdf 100644
--- a/engines/qdengine/qdcore/qd_game_object_state.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_state.cpp
@@ -21,6 +21,8 @@
#include "common/debug.h"
+#include "backends/imgui/IconsMaterialSymbols.h"
+
#include "qdengine/qd_fwd.h"
#include "qdengine/system/graphics/gr_dispatcher.h"
#include "qdengine/system/sound/snd_dispatcher.h"
@@ -226,51 +228,55 @@ bool qdGameObjectState::is_default() const {
return false;
}
-#define defFlag(x) { qdGameObjectState::x, #x }
+#define defFlag(x, i) { qdGameObjectState::x, #x, i }
struct FlagsList {
int f;
const char *s;
+ const char *i;
} static flagList[] = {
- defFlag(QD_OBJ_STATE_FLAG_HIDDEN),
- defFlag(QD_OBJ_STATE_FLAG_NOT_IN_TRIGGERS),
- defFlag(QD_OBJ_STATE_FLAG_RESTORE_PREV_STATE),
- defFlag(QD_OBJ_STATE_FLAG_HIDE_OBJECT),
- defFlag(QD_OBJ_STATE_FLAG_GLOBAL_OWNER),
- defFlag(QD_OBJ_STATE_FLAG_INVENTORY),
- defFlag(QD_OBJ_STATE_FLAG_MOVE_TO_INVENTORY),
- defFlag(QD_OBJ_STATE_FLAG_MOVE_TO_INVENTORY_FAILED),
- defFlag(QD_OBJ_STATE_FLAG_HAS_BOUND),
- defFlag(QD_OBJ_STATE_FLAG_ACTIVATION_TIMER),
- defFlag(QD_OBJ_STATE_FLAG_ACTIVATION_TIMER_END),
- defFlag(QD_OBJ_STATE_FLAG_DIALOG_PHRASE),
- defFlag(QD_OBJ_STATE_FLAG_SOUND_SYNC),
- defFlag(QD_OBJ_STATE_FLAG_ENABLE_INTERRUPT),
- defFlag(QD_OBJ_STATE_FLAG_WAS_ACTIVATED),
- defFlag(QD_OBJ_STATE_FLAG_DISABLE_WALK_INTERRUPT),
- defFlag(QD_OBJ_STATE_FLAG_MOUSE_STATE),
- defFlag(QD_OBJ_STATE_FLAG_MOUSE_HOVER_STATE),
- defFlag(QD_OBJ_STATE_FLAG_STAY_IN_INVENTORY),
- defFlag(QD_OBJ_STATE_FLAG_FORCED_LOAD),
- defFlag(QD_OBJ_STATE_FLAG_ENABLE_SKIP),
- defFlag(QD_OBJ_STATE_FLAG_MOVE_TO_ZONE),
- defFlag(QD_OBJ_STATE_FLAG_MOVE_ON_OBJECT),
- defFlag(QD_OBJ_STATE_FLAG_ACTIVATE_PERSONAGE),
- defFlag(QD_OBJ_STATE_FLAG_AUTO_LOAD),
- defFlag(QD_OBJ_STATE_FLAG_AUTO_SAVE),
- defFlag(QD_OBJ_STATE_FLAG_FADE_IN),
- defFlag(QD_OBJ_STATE_FLAG_FADE_OUT),
+ defFlag(QD_OBJ_STATE_FLAG_HIDDEN, ICON_MS_VISIBILITY_OFF),
+ defFlag(QD_OBJ_STATE_FLAG_NOT_IN_TRIGGERS, ICON_MS_STEP_OVER),
+ defFlag(QD_OBJ_STATE_FLAG_RESTORE_PREV_STATE, ICON_MS_SETTINGS_BACKUP_RESTORE),
+ defFlag(QD_OBJ_STATE_FLAG_HIDE_OBJECT, ICON_MS_HIDE_IMAGE),
+ defFlag(QD_OBJ_STATE_FLAG_GLOBAL_OWNER, ICON_MS_PUBLIC),
+ defFlag(QD_OBJ_STATE_FLAG_INVENTORY, ICON_MS_INVENTORY),
+ defFlag(QD_OBJ_STATE_FLAG_MOVE_TO_INVENTORY, ICON_MS_MOVE_TO_INBOX),
+ defFlag(QD_OBJ_STATE_FLAG_MOVE_TO_INVENTORY_FAILED, ICON_MS_INBOX_CUSTOMIZE),
+ defFlag(QD_OBJ_STATE_FLAG_HAS_BOUND, ICON_MS_OUTDOOR_GARDEN),
+ defFlag(QD_OBJ_STATE_FLAG_ACTIVATION_TIMER, ICON_MS_TIMER),
+ defFlag(QD_OBJ_STATE_FLAG_ACTIVATION_TIMER_END, ICON_MS_ALARM_ON),
+ defFlag(QD_OBJ_STATE_FLAG_DIALOG_PHRASE, ICON_MS_CHAT),
+ defFlag(QD_OBJ_STATE_FLAG_SOUND_SYNC, ICON_MS_BRAND_AWARENESS),
+ defFlag(QD_OBJ_STATE_FLAG_ENABLE_INTERRUPT, ICON_MS_FRONT_HAND),
+ defFlag(QD_OBJ_STATE_FLAG_WAS_ACTIVATED, ICON_MS_MANUFACTURING),
+ defFlag(QD_OBJ_STATE_FLAG_DISABLE_WALK_INTERRUPT, ICON_MS_PERSON_OFF),
+ defFlag(QD_OBJ_STATE_FLAG_MOUSE_STATE, ICON_MS_MOUSE),
+ defFlag(QD_OBJ_STATE_FLAG_MOUSE_HOVER_STATE, ICON_MS_TOUCHPAD_MOUSE),
+ defFlag(QD_OBJ_STATE_FLAG_STAY_IN_INVENTORY, ICON_MS_ASSIGNMENT_ADD),
+ defFlag(QD_OBJ_STATE_FLAG_FORCED_LOAD, ICON_MS_UPLOAD_FILE),
+ defFlag(QD_OBJ_STATE_FLAG_ENABLE_SKIP, ICON_MS_SKIP_NEXT),
+ defFlag(QD_OBJ_STATE_FLAG_MOVE_TO_ZONE, ICON_MS_DETECTION_AND_ZONE),
+ defFlag(QD_OBJ_STATE_FLAG_MOVE_ON_OBJECT, ICON_MS_PICTURE_IN_PICTURE),
+ defFlag(QD_OBJ_STATE_FLAG_ACTIVATE_PERSONAGE, ICON_MS_PERSON),
+ defFlag(QD_OBJ_STATE_FLAG_AUTO_LOAD, ICON_MS_UPLOAD),
+ defFlag(QD_OBJ_STATE_FLAG_AUTO_SAVE, ICON_MS_DOWNLOAD),
+ defFlag(QD_OBJ_STATE_FLAG_FADE_IN, ICON_MS_MASKED_TRANSITIONS),
+ defFlag(QD_OBJ_STATE_FLAG_FADE_OUT, ICON_MS_TRANSITION_FADE),
};
-Common::String qdGameObjectState::flag2str(int fl, bool truncate) {
+Common::String qdGameObjectState::flag2str(int fl, bool truncate, bool icon) {
Common::String res;
for (int i = 0; i < ARRAYSIZE(flagList); i++) {
if (fl & flagList[i].f) {
- if (!res.empty())
- res += " | ";
+ if (!icon) {
+ if (!res.empty())
+ res += " | ";
- res += &flagList[i].s[truncate ? 18 : 0];
+ res += &flagList[i].s[truncate ? 18 : 0];
+ } else
+ res += flagList[i].i;
fl &= ~flagList[i].f;
}
diff --git a/engines/qdengine/qdcore/qd_game_object_state.h b/engines/qdengine/qdcore/qd_game_object_state.h
index fe9904e7b02..4e87804c9d2 100644
--- a/engines/qdengine/qdcore/qd_game_object_state.h
+++ b/engines/qdengine/qdcore/qd_game_object_state.h
@@ -567,7 +567,7 @@ public:
_transform_speed = tr_speed;
}
- static Common::String flag2str(int fl, bool truncate = false);
+ static Common::String flag2str(int fl, bool truncate = false, bool icon = false);
protected:
More information about the Scummvm-git-logs
mailing list