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
苍蓝
ygopro
Commits
07cb023c
Commit
07cb023c
authored
Aug 03, 2017
by
zhyk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Mac crashing issue
parent
e0673598
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
6 deletions
+21
-6
gframe/CGUITTFont.cpp
gframe/CGUITTFont.cpp
+3
-4
gframe/CGUITTFont.h
gframe/CGUITTFont.h
+10
-0
gframe/deck_con.cpp
gframe/deck_con.cpp
+6
-1
gframe/game.cpp
gframe/game.cpp
+2
-1
No files found.
gframe/CGUITTFont.cpp
View file @
07cb023c
...
...
@@ -153,7 +153,7 @@ void SGUITTGlyph::preload(u32 char_index, FT_Face face, video::IVideoDriver* dri
}
glyph_page
=
parent
->
getLastGlyphPageIndex
();
u32
texture_side_length
=
page
->
texture
->
getOriginalSize
()
.
Width
;
u32
texture_side_length
=
page
->
texture
_size
.
Width
;
core
::
vector2di
page_position
(
(
page
->
used_slots
%
(
texture_side_length
/
font_size
))
*
font_size
,
(
page
->
used_slots
/
(
texture_side_length
/
font_size
))
*
font_size
...
...
@@ -443,9 +443,8 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
if
(
page_texture_size
.
Width
>
max_texture_size
.
Width
||
page_texture_size
.
Height
>
max_texture_size
.
Height
)
page_texture_size
=
max_texture_size
;
if
(
!
page
->
createPageTexture
(
pixel_mode
,
page_texture_size
))
// TODO: add error message?
return
0
;
page
->
texture_size
=
page_texture_size
;
page
->
pixel_mode
=
pixel_mode
;
if
(
page
)
{
// Determine the number of glyph slots on the page and add it to the list of pages.
...
...
gframe/CGUITTFont.h
View file @
07cb023c
...
...
@@ -143,6 +143,13 @@ public:
void
updateTexture
()
{
if
(
!
dirty
)
return
;
if
(
!
texture
)
{
if
(
!
createPageTexture
(
pixel_mode
,
texture_size
))
// TODO: add error message?
return
;
}
void
*
ptr
=
texture
->
lock
();
video
::
ECOLOR_FORMAT
format
=
texture
->
getColorFormat
();
core
::
dimension2du
size
=
texture
->
getOriginalSize
();
...
...
@@ -176,6 +183,9 @@ public:
core
::
array
<
core
::
vector2di
>
render_positions
;
core
::
array
<
core
::
recti
>
render_source_rects
;
core
::
dimension2du
texture_size
;
u8
pixel_mode
;
private:
core
::
array
<
const
SGUITTGlyph
*>
glyph_to_be_paged
;
video
::
IVideoDriver
*
driver
;
...
...
gframe/deck_con.cpp
View file @
07cb023c
...
...
@@ -96,7 +96,7 @@ void DeckBuilder::Terminate() {
mainGame
->
PopupElement
(
mainGame
->
wMainMenu
);
mainGame
->
device
->
setEventReceiver
(
&
mainGame
->
menuHandler
);
mainGame
->
wACMessage
->
setVisible
(
false
);
imageManager
.
ClearTexture
();
mainGame
->
ClearTextures
();
mainGame
->
scrFilter
->
setVisible
(
false
);
int
sel
=
mainGame
->
cbDBDecks
->
getSelected
();
if
(
sel
>=
0
)
...
...
@@ -224,6 +224,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame
->
env
->
addMessageBox
(
L""
,
dataManager
.
GetSysString
(
1410
));
break
;
}
// clear imgCard
mainGame
->
imgCard
->
setImage
(
imageManager
.
tCover
[
0
]);
// send result to server
char
deckbuf
[
1024
];
char
*
pdeck
=
deckbuf
;
BufferIO
::
WriteInt32
(
pdeck
,
deckManager
.
current_deck
.
main
.
size
()
+
deckManager
.
current_deck
.
extra
.
size
());
...
...
gframe/game.cpp
View file @
07cb023c
...
...
@@ -201,6 +201,7 @@ bool Game::Initialize() {
wCardImg
->
setBackgroundColor
(
0xc0c0c0c0
);
wCardImg
->
setVisible
(
false
);
imgCard
=
env
->
addImage
(
rect
<
s32
>
(
10
,
9
,
187
,
263
),
wCardImg
);
imgCard
->
setImage
(
imageManager
.
tCover
[
0
]);
imgCard
->
setUseAlphaChannel
(
true
);
//phase
wPhase
=
env
->
addStaticText
(
L""
,
rect
<
s32
>
(
480
,
310
,
855
,
330
));
...
...
@@ -1185,7 +1186,7 @@ void Game::AddDebugMsg(char* msg)
}
void
Game
::
ClearTextures
()
{
matManager
.
mCard
.
setTexture
(
0
,
0
);
mainGame
->
imgCard
->
setImage
(
0
);
mainGame
->
imgCard
->
setImage
(
imageManager
.
tCover
[
0
]
);
mainGame
->
btnPSAU
->
setImage
();
mainGame
->
btnPSDU
->
setImage
();
for
(
int
i
=
0
;
i
<=
4
;
++
i
)
{
...
...
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