Skip to content

Y
ygopro-2pick
Commit 689f2691 authored by mercury233's avatar mercury233
Browse files
Options

Merge branch 'resize' into test

parents 73ef8dd7 58ca41dd
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
gframe/drawing.cpp
View file @ 689f2691
...@@ -57,15 +57,15 @@ void Game::DrawSelectionLine(irr::gui::IGUIElement* element, int width, irr::vid ...@@ -57,15 +57,15 @@ void Game::DrawSelectionLine(irr::gui::IGUIElement* element, int width, irr::vid
float w = pos.getWidth(); float w = pos.getWidth();
float h = pos.getHeight(); float h = pos.getHeight();
if(linePatternD3D < 15) { if(linePatternD3D < 15) {
driver->draw2DRectangle(recti(x1 - 1 - width, y1 - 1 - width, x1 + (w * (linePatternD3D + 1) / 15.0) + 1 + width, y1 - 1), color, color, color, color); driver->draw2DRectangle(color, recti(x1 - 1 - width, y1 - 1 - width, x1 + (w * (linePatternD3D + 1) / 15.0) + 1 + width, y1 - 1));
driver->draw2DRectangle(recti(x2 - (w * (linePatternD3D + 1) / 15.0) - 1 - width, y2 + 1, x2 + 1 + width, y2 + 1 + width), color, color, color, color); driver->draw2DRectangle(color, recti(x2 - (w * (linePatternD3D + 1) / 15.0) - 1 - width, y2 + 1, x2 + 1 + width, y2 + 1 + width));
driver->draw2DRectangle(recti(x1 - 1 - width, y1 - 1 - width, x1 - 1, y2 - (h * (linePatternD3D + 1) / 15.0) + 1 + width), color, color, color, color); driver->draw2DRectangle(color, recti(x1 - 1 - width, y1 - 1 - width, x1 - 1, y2 - (h * (linePatternD3D + 1) / 15.0) + 1 + width));
driver->draw2DRectangle(recti(x2 + 1, y1 + (h * (linePatternD3D + 1) / 15.0) - 1 - width, x2 + 1 + width, y2 + 1 + width), color, color, color, color); driver->draw2DRectangle(color, recti(x2 + 1, y1 + (h * (linePatternD3D + 1) / 15.0) - 1 - width, x2 + 1 + width, y2 + 1 + width));
} else { } else {
driver->draw2DRectangle(recti(x1 - 1 - width + (w * (linePatternD3D - 14) / 15.0), y1 - 1 - width, x2 + 1 + width, y1 - 1), color, color, color, color); driver->draw2DRectangle(color, recti(x1 - 1 - width + (w * (linePatternD3D - 14) / 15.0), y1 - 1 - width, x2 + 1 + width, y1 - 1));
driver->draw2DRectangle(recti(x1 - 1 - width, y2 + 1, x2 - (w * (linePatternD3D - 14) / 15.0) + 1 + width, y2 + 1 + width), color, color, color, color); driver->draw2DRectangle(color, recti(x1 - 1 - width, y2 + 1, x2 - (w * (linePatternD3D - 14) / 15.0) + 1 + width, y2 + 1 + width));
driver->draw2DRectangle(recti(x1 - 1 - width, y2 - (h * (linePatternD3D - 14) / 15.0) - 1 - width, x1 - 1, y2 + 1 + width), color, color, color, color); driver->draw2DRectangle(color, recti(x1 - 1 - width, y2 - (h * (linePatternD3D - 14) / 15.0) - 1 - width, x1 - 1, y2 + 1 + width));
driver->draw2DRectangle(recti(x2 + 1, y1 - 1 - width, x2 + 1 + width, y1 + (h * (linePatternD3D - 14) / 15.0) + 1 + width), color, color, color, color); driver->draw2DRectangle(color, recti(x2 + 1, y1 - 1 - width, x2 + 1 + width, y1 + (h * (linePatternD3D - 14) / 15.0) + 1 + width));
} }
} }
void Game::DrawBackGround() { void Game::DrawBackGround() {
......
ocgcore @ 9a253618
Subproject commit b2c4ad93e54a356738cf43a66beeb402bf43cd21 Subproject commit 9a253618906d678a5b0722b0f42e3c8f009e9c7d
script @ 8548beec
Subproject commit eacd96e1bc6ed66c00947d30adacffd0157ba8e8 Subproject commit 8548beecbbb8e209a2c8c25b12e55d165533a395
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment