[Scummvm-git-logs] scummvm master -> 3515dc79ebd418adc15af60ffdb7fa5c6a23176f
sev-
noreply at scummvm.org
Wed Jul 13 21:23:59 UTC 2022
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
57d91c8bdd GRAPHICS: Draw thick lines with wider rectangles for the time being
dbb1114269 DIRECTOR: Switch to wider rect primitives so visuals stay unchanged
d670adb4b9 WAGE: Switch to wider Rect primitives
3515dc79eb GRAPHICS: MACGUI: Switch to wider Rect primitives for now
Commit: 57d91c8bdd699c9a7ac74997d91ddaf5f668333b
https://github.com/scummvm/scummvm/commit/57d91c8bdd699c9a7ac74997d91ddaf5f668333b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-13T23:20:49+02:00
Commit Message:
GRAPHICS: Draw thick lines with wider rectangles for the time being
Changed paths:
graphics/primitives.cpp
diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp
index 7d24703f8cb..f1c31c4338d 100644
--- a/graphics/primitives.cpp
+++ b/graphics/primitives.cpp
@@ -109,12 +109,12 @@ void drawThickLine2(int x1, int y1, int x2, int y2, int thick, int color, void (
if (dx == 0) {
int xn = x1 - thick / 2;
Common::Rect r(xn, MIN(y1, y2), xn + thick - 1, MAX(y1, y2));
- drawFilledRect(r, color, plotProc, data);
+ drawFilledRect1(r, color, plotProc, data);
return;
} else if (dy == 0) {
int yn = y1 - thick / 2;
Common::Rect r(MIN(x1, x2), yn, MAX(x1, x2), yn + thick - 1);
- drawFilledRect(r, color, plotProc, data);
+ drawFilledRect1(r, color, plotProc, data);
return;
}
Commit: dbb1114269773eba2439080ef5b0ccae8289cc61
https://github.com/scummvm/scummvm/commit/dbb1114269773eba2439080ef5b0ccae8289cc61
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-13T23:22:35+02:00
Commit Message:
DIRECTOR: Switch to wider rect primitives so visuals stay unchanged
Changed paths:
engines/director/graphics.cpp
engines/director/sprite.cpp
diff --git a/engines/director/graphics.cpp b/engines/director/graphics.cpp
index bf8cb39f3dc..2a7388f1fe5 100644
--- a/engines/director/graphics.cpp
+++ b/engines/director/graphics.cpp
@@ -462,7 +462,7 @@ void DirectorPlotData::inkBlitShape(Common::Rect &srcRect) {
switch (ms->spriteType) {
case kRectangleSprite:
ms->pd = &plotFill;
- Graphics::drawFilledRect(fillAreaRect, ms->foreColor, d->getInkDrawPixel(), this);
+ Graphics::drawFilledRect1(fillAreaRect, ms->foreColor, d->getInkDrawPixel(), this);
// fall through
case kOutlinedRectangleSprite:
// if we have lineSize <= 0, means we are not drawing anything. so we may return directly.
@@ -473,11 +473,11 @@ void DirectorPlotData::inkBlitShape(Common::Rect &srcRect) {
if (!outline)
ms->tile = nullptr;
- Graphics::drawRect(strokeRect, ms->foreColor, d->getInkDrawPixel(), this);
+ Graphics::drawRect1(strokeRect, ms->foreColor, d->getInkDrawPixel(), this);
break;
case kRoundedRectangleSprite:
ms->pd = &plotFill;
- Graphics::drawRoundRect(fillAreaRect, 12, ms->foreColor, true, d->getInkDrawPixel(), this);
+ Graphics::drawRoundRect1(fillAreaRect, 12, ms->foreColor, true, d->getInkDrawPixel(), this);
// fall through
case kOutlinedRoundedRectangleSprite:
if (ms->lineSize <= 0)
@@ -487,7 +487,7 @@ void DirectorPlotData::inkBlitShape(Common::Rect &srcRect) {
if (!outline)
ms->tile = nullptr;
- Graphics::drawRoundRect(strokeRect, 12, ms->foreColor, false, d->getInkDrawPixel(), this);
+ Graphics::drawRoundRect1(strokeRect, 12, ms->foreColor, false, d->getInkDrawPixel(), this);
break;
case kOvalSprite:
ms->pd = &plotFill;
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index e9c5887067e..129d19aec58 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -153,11 +153,11 @@ void Sprite::createQDMatte() {
switch (_spriteType) {
case kOutlinedRectangleSprite:
case kRectangleSprite:
- Graphics::drawFilledRect(fillAreaRect, g_director->_wm->_colorBlack, g_director->_wm->getDrawPixel(), &plotFill);
+ Graphics::drawFilledRect1(fillAreaRect, g_director->_wm->_colorBlack, g_director->_wm->getDrawPixel(), &plotFill);
break;
case kOutlinedRoundedRectangleSprite:
case kRoundedRectangleSprite:
- Graphics::drawRoundRect(fillAreaRect, 12, g_director->_wm->_colorBlack, true, g_director->_wm->getDrawPixel(), &plotFill);
+ Graphics::drawRoundRect1(fillAreaRect, 12, g_director->_wm->_colorBlack, true, g_director->_wm->getDrawPixel(), &plotFill);
break;
case kOutlinedOvalSprite:
case kOvalSprite:
Commit: d670adb4b9fabdaba0a4c265dcf835cb8a3b81e3
https://github.com/scummvm/scummvm/commit/d670adb4b9fabdaba0a4c265dcf835cb8a3b81e3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-13T23:22:51+02:00
Commit Message:
WAGE: Switch to wider Rect primitives
Changed paths:
engines/wage/design.cpp
diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 965eb30aced..d3bca8c043c 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -281,7 +281,7 @@ void Design::drawRect(Graphics::ManagedSurface *surface, Common::ReadStream &in,
PlotData pd(surface, &patterns, fillType, 1, this);
if (fillType <= patterns.size())
- Graphics::drawFilledRect(r, kColorBlack, drawPixel, &pd);
+ Graphics::drawFilledRect1(r, kColorBlack, drawPixel, &pd);
pd.fillType = borderFillType;
pd.thickness = borderThickness;
@@ -311,13 +311,13 @@ void Design::drawRoundRect(Graphics::ManagedSurface *surface, Common::ReadStream
PlotData pd(surface, &patterns, fillType, 1, this);
if (fillType <= patterns.size())
- Graphics::drawRoundRect(r, arc / 2, kColorBlack, true, drawPixel, &pd);
+ Graphics::drawRoundRect1(r, arc / 2, kColorBlack, true, drawPixel, &pd);
pd.fillType = borderFillType;
pd.thickness = borderThickness;
if (borderThickness > 0 && borderFillType <= patterns.size())
- Graphics::drawRoundRect(r, arc / 2, kColorBlack, false, drawPixel, &pd);
+ Graphics::drawRoundRect1(r, arc / 2, kColorBlack, false, drawPixel, &pd);
}
void Design::drawPolygon(Graphics::ManagedSurface *surface, Common::ReadStream &in,
@@ -526,7 +526,7 @@ void Design::drawFilledRect(Graphics::ManagedSurface *surface, Common::Rect &rec
void Design::drawFilledRoundRect(Graphics::ManagedSurface *surface, Common::Rect &rect, int arc, int color, Graphics::MacPatterns &patterns, byte fillType) {
PlotData pd(surface, &patterns, fillType, 1, nullptr);
- Graphics::drawRoundRect(rect, arc, color, true, drawPixel, &pd);
+ Graphics::drawRoundRect1(rect, arc, color, true, drawPixel, &pd);
}
void Design::drawHLine(Graphics::ManagedSurface *surface, int x1, int x2, int y, int thickness, int color, Graphics::MacPatterns &patterns, byte fillType) {
Commit: 3515dc79ebd418adc15af60ffdb7fa5c6a23176f
https://github.com/scummvm/scummvm/commit/3515dc79ebd418adc15af60ffdb7fa5c6a23176f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-13T23:23:03+02:00
Commit Message:
GRAPHICS: MACGUI: Switch to wider Rect primitives for now
We need to eliminate their usage but that requires more testing
Changed paths:
graphics/macgui/macbutton.cpp
graphics/macgui/macmenu.cpp
graphics/macgui/macwindowborder.cpp
graphics/macgui/macwindowmanager.cpp
diff --git a/graphics/macgui/macbutton.cpp b/graphics/macgui/macbutton.cpp
index 47ef2f9f03c..da770765404 100644
--- a/graphics/macgui/macbutton.cpp
+++ b/graphics/macgui/macbutton.cpp
@@ -77,11 +77,11 @@ void MacButton::invertOuter() {
switch (_buttonType) {
case kCheckBox: {
Common::Rect c = Common::Rect(r.left + 1, r.top + 3, r.left + 9, r.top + 11);
- Graphics::drawRect(c, 0, _wm->getDrawPixel(), &_pd);
+ Graphics::drawRect1(c, 0, _wm->getDrawPixel(), &_pd);
}
break;
case kRound:
- Graphics::drawRoundRect(r, 4, 0, true, _wm->getDrawPixel(), &_pd);
+ Graphics::drawRoundRect1(r, 4, 0, true, _wm->getDrawPixel(), &_pd);
break;
case kRadio:
Graphics::drawEllipse(r.left + 1, r.top + 3, r.left + 10, r.top + 12, 0, false, _wm->getDrawPixel(), &_pd);
@@ -110,11 +110,11 @@ void MacButton::invertInner() {
break;
case kCBInsetBlack:
checkbox = Common::Rect(r.left + 2, r.top + 4, r.left + 2 + 6, r.top + 4 + 6);
- Graphics::drawFilledRect(checkbox, 0, _wm->getDrawPixel(), &_pd);
+ Graphics::drawFilledRect1(checkbox, 0, _wm->getDrawPixel(), &_pd);
break;
case kCBFilledBlack:
checkbox = Common::Rect(r.left + 1, r.top + 3, r.left + 1 + 8, r.top + 3 + 8);
- Graphics::drawFilledRect(checkbox, 0, _wm->getDrawPixel(), &_pd);
+ Graphics::drawFilledRect1(checkbox, 0, _wm->getDrawPixel(), &_pd);
break;
}
break;
@@ -145,11 +145,11 @@ bool MacButton::draw(bool forceRedraw) {
switch (_buttonType) {
case kCheckBox: {
Common::Rect c = Common::Rect(r.left, r.top + 2, r.left + 10, r.top + 2 + 10);
- Graphics::drawRect(c, 0, _wm->getDrawPixel(), &pd);
+ Graphics::drawRect1(c, 0, _wm->getDrawPixel(), &pd);
break;
}
case kRound:
- Graphics::drawRoundRect(r, 4, 0, false, _wm->getDrawPixel(), &pd);
+ Graphics::drawRoundRect1(r, 4, 0, false, _wm->getDrawPixel(), &pd);
break;
case kRadio:
Graphics::drawEllipse(r.left, r.top + 2, r.left + 11, r.top + 13, 0, false, _wm->getDrawPixel(), &pd);
diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 3a7b258e3c2..519389dc5a1 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -911,7 +911,7 @@ static void drawPixelPlain(int x, int y, int color, void *data) {
}
static void drawFilledRoundRect(ManagedSurface *surface, Common::Rect &rect, int arc, int color) {
- drawRoundRect(rect, arc, color, true, drawPixelPlain, surface);
+ drawRoundRect1(rect, arc, color, true, drawPixelPlain, surface);
}
static void underlineAccelerator(ManagedSurface *dst, const Font *font, const Common::UnicodeBiDiText &txt, int x, int y, int shortcutPos, uint32 color) {
diff --git a/graphics/macgui/macwindowborder.cpp b/graphics/macgui/macwindowborder.cpp
index 516dfff92b4..42100ac0019 100644
--- a/graphics/macgui/macwindowborder.cpp
+++ b/graphics/macgui/macwindowborder.cpp
@@ -170,7 +170,7 @@ void MacWindowBorder::drawScrollBar(ManagedSurface *g, MacWindowManager *wm) {
Common::Rect rr(rx1, ry1, rx2, ry2);
MacPlotData pd(g, nullptr, &wm->getPatterns(), 1, 0, 0, 1, wm->_colorWhite, true);
- Graphics::drawFilledRect(rr, wm->_colorWhite, wm->getDrawInvertPixel(), &pd);
+ Graphics::drawFilledRect1(rr, wm->_colorWhite, wm->getDrawInvertPixel(), &pd);
// after drawing, we set the _scrollSize negative, to indicate no more drawing is needed
// if win95 mode is enabled, then we keep on drawing the scrollbar
diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 21bd9368f92..7d80f1cbb04 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -807,7 +807,7 @@ void MacWindowManager::drawDesktop() {
MacPlotData pd(_desktop, nullptr, &_patterns, kPatternCheckers, 0, 0, 1, _colorWhite);
- Graphics::drawRoundRect(r, kDesktopArc, _colorBlack, true, getDrawPixel(), &pd);
+ Graphics::drawRoundRect1(r, kDesktopArc, _colorBlack, true, getDrawPixel(), &pd);
}
}
More information about the Scummvm-git-logs
mailing list