[Scummvm-git-logs] scummvm master -> 31276ddca8098aff23bfb3a565d5553b453b30c7
sev-
noreply at scummvm.org
Sun Apr 26 21:43:10 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
2bb73f65d0 DIRECTOR: DT: Show cast type instead of Cast Member for kCastMemberSprites in Channels window
be22779ec2 DIRECTOR: Fix FilmLoop registration offset
31276ddca8 DIRECTOR: DT: Make execution context resizable
Commit: 2bb73f65d08b5d8578f968b3ed6f6ba21bb3fc0e
https://github.com/scummvm/scummvm/commit/2bb73f65d08b5d8578f968b3ed6f6ba21bb3fc0e
Author: ramyak-sharma (ramyaksharma1 at gmail.com)
Date: 2026-04-26T23:43:05+02:00
Commit Message:
DIRECTOR: DT: Show cast type instead of Cast Member for kCastMemberSprites in Channels window
Changed paths:
engines/director/debugger/dt-score.cpp
diff --git a/engines/director/debugger/dt-score.cpp b/engines/director/debugger/dt-score.cpp
index 7933e870505..ae11f63cbc9 100644
--- a/engines/director/debugger/dt-score.cpp
+++ b/engines/director/debugger/dt-score.cpp
@@ -1295,6 +1295,7 @@ void showChannels() {
ImGui::PopID();
}
+ // Channel number
ImGui::TableNextColumn();
bool isSelected = (_state->_selectedChannel == i + 1);
@@ -1310,6 +1311,7 @@ void showChannels() {
_state->_windowToRedraw = selectedWindow;
}
+ // Cast ID
ImGui::TableNextColumn();
if (sprite._castId.member) {
@@ -1318,37 +1320,62 @@ void showChannels() {
Common::Point position = channel.getPosition();
ImGui::Text("%s", sprite._castId.asString().c_str());
+
+ // visibility
ImGui::TableNextColumn();
colN = "##vis" + chNum;
if (ImGui::Checkbox(colN.c_str(), &channel._visible)) {
_state->_windowToRedraw = selectedWindow;
}
+
+ // inkData
ImGui::TableNextColumn();
ImGui::Text("0x%02x", sprite._inkData);
+
+ // ink
ImGui::TableNextColumn();
ImGui::Text("%d (%s)", sprite._ink, inkType2str(sprite._ink));
+
+ // trails
ImGui::TableNextColumn();
colN = "##trails" + chNum;
ImGui::Checkbox(colN.c_str(), &sprite._trails);
+
+ // stretch
ImGui::TableNextColumn();
colN = "##stretch" + chNum;
ImGui::Checkbox(colN.c_str(), &sprite._stretch);
+
+ // line
ImGui::TableNextColumn();
ImGui::Text("%d", sprite._thickness);
+
+ // dims
ImGui::TableNextColumn();
ImGui::Text("%dx%d@%d,%d", channel.getWidth(), channel.getHeight(), position.x, position.y);
+
+ // type
ImGui::TableNextColumn();
- ImGui::Text("%d (%s)", sprite._spriteType, spriteType2str(sprite._spriteType));
+ if (sprite._spriteType == kCastMemberSprite && sprite._cast)
+ ImGui::Text("%d (%s)", sprite._spriteType, castType2str(sprite._cast->_type));
+ else
+ ImGui::Text("%d (%s)", sprite._spriteType, spriteType2str(sprite._spriteType));
+
+ // fq
ImGui::TableNextColumn();
ImGui::PushID(i + 1);
ImGui::Text("%3d", sprite._foreColor); ImGui::SameLine();
ImGui::ColorButton("foreColor", convertColor(sprite._foreColor));
ImGui::PopID();
+
+ // bq
ImGui::TableNextColumn();
ImGui::PushID(i + 1);
ImGui::Text("%3d", sprite._backColor); ImGui::SameLine();
ImGui::ColorButton("backColor", convertColor(sprite._backColor));
ImGui::PopID();
+
+ // script
ImGui::TableNextColumn();
if (score->_version >= kFileVer600) {
@@ -1391,31 +1418,47 @@ void showChannels() {
}
}
+ // colorcode
ImGui::TableNextColumn();
ImGui::Text("0x%x", sprite._colorcode);
+
+ // blend amount
ImGui::TableNextColumn();
ImGui::Text("0x%x", sprite._blendAmount);
+
+ // unk3
ImGui::TableNextColumn();
ImGui::Text("0x%x", sprite._unk3);
+
+ // constraint
ImGui::TableNextColumn();
ImGui::Text("%d", channel._constraint);
+
+ // puppet
ImGui::TableNextColumn();
colN = "##puppet" + chNum;
ImGui::Checkbox(colN.c_str(), &sprite._puppet);
+
+ // moveable
ImGui::TableNextColumn();
colN = "##moveable" + chNum;
ImGui::Checkbox(colN.c_str(), &sprite._moveable);
+
+ // movieRate
ImGui::TableNextColumn();
if (channel._movieRate)
ImGui::Text("%f", channel._movieRate);
else
ImGui::Text("0");
+
+ // movieTime
ImGui::TableNextColumn();
if (channel._movieRate)
ImGui::Text("%d (%f)", channel._movieTime, (float)(channel._movieTime/60.0f));
else
ImGui::Text("0");
} else {
+ // invalid castID
ImGui::Text("000");
}
}
Commit: be22779ec2d012177dee614c0c4cb3245deed0da
https://github.com/scummvm/scummvm/commit/be22779ec2d012177dee614c0c4cb3245deed0da
Author: ramyak-sharma (ramyaksharma1 at gmail.com)
Date: 2026-04-26T23:43:05+02:00
Commit Message:
DIRECTOR: Fix FilmLoop registration offset
FilmLoopCastMember::getRegistrationOffset() always returned the center
(width/2, height/2), ignoring the _center flag.
Fix by returning (0, 0) when _center is false, and center only when
_center is true.
Fixes shifting of animal on clicking filmloops in shotgal.dir (guscarn-win)
Changed paths:
engines/director/castmember/filmloop.cpp
diff --git a/engines/director/castmember/filmloop.cpp b/engines/director/castmember/filmloop.cpp
index 1ca1764d6c3..2ee197445ae 100644
--- a/engines/director/castmember/filmloop.cpp
+++ b/engines/director/castmember/filmloop.cpp
@@ -254,11 +254,15 @@ void FilmLoopCastMember::unload() {
}
Common::Point FilmLoopCastMember::getRegistrationOffset() {
- return Common::Point(_initialRect.width() / 2, _initialRect.height() / 2);
+ if (_center)
+ return Common::Point(_initialRect.width() / 2, _initialRect.height() / 2);
+ return Common::Point(0, 0);
}
Common::Point FilmLoopCastMember::getRegistrationOffset(int16 currentWidth, int16 currentHeight) {
- return Common::Point(currentWidth / 2, currentHeight / 2);
+ if(_center)
+ return Common::Point(currentWidth / 2, currentHeight / 2);
+ return Common::Point(0, 0);
}
uint32 FilmLoopCastMember::getCastDataSize() {
Commit: 31276ddca8098aff23bfb3a565d5553b453b30c7
https://github.com/scummvm/scummvm/commit/31276ddca8098aff23bfb3a565d5553b453b30c7
Author: ramyak-sharma (ramyaksharma1 at gmail.com)
Date: 2026-04-26T23:43:05+02:00
Commit Message:
DIRECTOR: DT: Make execution context resizable
Changed paths:
engines/director/debugger/dt-scripts.cpp
diff --git a/engines/director/debugger/dt-scripts.cpp b/engines/director/debugger/dt-scripts.cpp
index 7c3ab1460eb..1690e10f034 100644
--- a/engines/director/debugger/dt-scripts.cpp
+++ b/engines/director/debugger/dt-scripts.cpp
@@ -548,7 +548,7 @@ void showExecutionContext() {
Window *currentWindow = g_director->getCurrentWindow();
bool scriptsRendered = false;
- if (ImGui::Begin("Execution Context", &_state->_w.executionContext, ImGuiWindowFlags_AlwaysAutoResize)) {
+ if (ImGui::Begin("Execution Context", &_state->_w.executionContext)) {
Window *stage = g_director->getStage();
g_director->setCurrentWindow(stage);
g_lingo->switchStateFromWindow();
@@ -557,7 +557,7 @@ void showExecutionContext() {
ImGui::PushID(windowID);
ImGui::PushStyleColor(ImGuiCol_ChildBg, ImGui::GetStyleColorVec4(ImGuiCol_FrameBg));
- ImGui::BeginChild("Window##", ImVec2(500.0f, 700.0f));
+ ImGui::BeginChild("Window##", ImGui::GetContentRegionAvail());
ImGui::Text("%s", stage->asString().c_str());
ImGui::Text("%s", stage->getCurrentMovie()->getMacName().c_str());
More information about the Scummvm-git-logs
mailing list