Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro
Commits
689f2691
Commit
689f2691
authored
Apr 05, 2018
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'resize' into test
parents
73ef8dd7
58ca41dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
gframe/drawing.cpp
gframe/drawing.cpp
+8
-8
ocgcore
ocgcore
+1
-1
script
script
+1
-1
No files found.
gframe/drawing.cpp
View file @
689f2691
...
...
@@ -57,15 +57,15 @@ void Game::DrawSelectionLine(irr::gui::IGUIElement* element, int width, irr::vid
float
w
=
pos
.
getWidth
();
float
h
=
pos
.
getHeight
();
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
(
recti
(
x2
-
(
w
*
(
linePatternD3D
+
1
)
/
15.0
)
-
1
-
width
,
y2
+
1
,
x2
+
1
+
width
,
y2
+
1
+
width
),
color
,
color
,
color
,
color
);
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
(
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
(
x1
-
1
-
width
,
y1
-
1
-
width
,
x1
+
(
w
*
(
linePatternD3D
+
1
)
/
15.0
)
+
1
+
width
,
y1
-
1
)
);
driver
->
draw2DRectangle
(
color
,
recti
(
x2
-
(
w
*
(
linePatternD3D
+
1
)
/
15.0
)
-
1
-
width
,
y2
+
1
,
x2
+
1
+
width
,
y2
+
1
+
width
)
);
driver
->
draw2DRectangle
(
color
,
recti
(
x1
-
1
-
width
,
y1
-
1
-
width
,
x1
-
1
,
y2
-
(
h
*
(
linePatternD3D
+
1
)
/
15.0
)
+
1
+
width
)
);
driver
->
draw2DRectangle
(
color
,
recti
(
x2
+
1
,
y1
+
(
h
*
(
linePatternD3D
+
1
)
/
15.0
)
-
1
-
width
,
x2
+
1
+
width
,
y2
+
1
+
width
)
);
}
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
(
recti
(
x1
-
1
-
width
,
y2
+
1
,
x2
-
(
w
*
(
linePatternD3D
-
14
)
/
15.0
)
+
1
+
width
,
y2
+
1
+
width
),
color
,
color
,
color
,
color
);
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
(
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
(
x1
-
1
-
width
+
(
w
*
(
linePatternD3D
-
14
)
/
15.0
),
y1
-
1
-
width
,
x2
+
1
+
width
,
y1
-
1
)
);
driver
->
draw2DRectangle
(
color
,
recti
(
x1
-
1
-
width
,
y2
+
1
,
x2
-
(
w
*
(
linePatternD3D
-
14
)
/
15.0
)
+
1
+
width
,
y2
+
1
+
width
)
);
driver
->
draw2DRectangle
(
color
,
recti
(
x1
-
1
-
width
,
y2
-
(
h
*
(
linePatternD3D
-
14
)
/
15.0
)
-
1
-
width
,
x1
-
1
,
y2
+
1
+
width
)
);
driver
->
draw2DRectangle
(
color
,
recti
(
x2
+
1
,
y1
-
1
-
width
,
x2
+
1
+
width
,
y1
+
(
h
*
(
linePatternD3D
-
14
)
/
15.0
)
+
1
+
width
)
);
}
}
void
Game
::
DrawBackGround
()
{
...
...
ocgcore
@
9a253618
Subproject commit
b2c4ad93e54a356738cf43a66beeb402bf43cd21
Subproject commit
9a253618906d678a5b0722b0f42e3c8f009e9c7d
script
@
8548beec
Subproject commit
eacd96e1bc6ed66c00947d30adacffd0157ba8e8
Subproject commit
8548beecbbb8e209a2c8c25b12e55d165533a395
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment