Commit 8a1c8435 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 211537ca c22aaacb
No preview for this file type
...@@ -153,10 +153,12 @@ void SGUITTGlyph::preload(u32 char_index, FT_Face face, video::IVideoDriver* dri ...@@ -153,10 +153,12 @@ void SGUITTGlyph::preload(u32 char_index, FT_Face face, video::IVideoDriver* dri
} }
glyph_page = parent->getLastGlyphPageIndex(); glyph_page = parent->getLastGlyphPageIndex();
u32 texture_side_length = page->texture_size.Width; u32 texture_side_length = page->texture_size.Width - font_size;
u32 margin = font_size * 0.5;
u32 sprite_size = font_size * 1.5;
core::vector2di page_position( core::vector2di page_position(
(page->used_slots % (texture_side_length / font_size)) * font_size, (s32)(page->used_slots % (s32)(texture_side_length / sprite_size)) * sprite_size + margin,
(page->used_slots / (texture_side_length / font_size)) * font_size (s32)(page->used_slots / (s32)(texture_side_length / sprite_size)) * sprite_size + margin
); );
source_rect.UpperLeftCorner = page_position; source_rect.UpperLeftCorner = page_position;
source_rect.LowerRightCorner = core::vector2di(page_position.X + bits.width, page_position.Y + bits.rows); source_rect.LowerRightCorner = core::vector2di(page_position.X + bits.width, page_position.Y + bits.rows);
...@@ -466,7 +468,7 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) { ...@@ -466,7 +468,7 @@ CGUITTGlyphPage* CGUITTFont::createGlyphPage(const u8& pixel_mode) {
if (page) { if (page) {
// Determine the number of glyph slots on the page and add it to the list of pages. // Determine the number of glyph slots on the page and add it to the list of pages.
page->available_slots = (page_texture_size.Width / size) * (page_texture_size.Height / size); page->available_slots = (u32)((page_texture_size.Width - size) / (u32)(size * 1.5)) * (u32)((page_texture_size.Height - size) / (u32)(size * 1.5));
Glyph_Pages.push_back(page); Glyph_Pages.push_back(page);
} }
return page; return page;
......
...@@ -1069,6 +1069,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) { ...@@ -1069,6 +1069,7 @@ void Game::ShowElement(irr::gui::IGUIElement * win, int autoframe) {
btnCardDisplay[i]->setDrawImage(false); btnCardDisplay[i]->setDrawImage(false);
} }
win->setRelativePosition(irr::core::recti(center.X, center.Y, 0, 0)); win->setRelativePosition(irr::core::recti(center.X, center.Y, 0, 0));
win->setVisible(true);
fadingList.push_back(fu); fadingList.push_back(fu);
} }
void Game::HideElement(irr::gui::IGUIElement * win, bool set_action) { void Game::HideElement(irr::gui::IGUIElement * win, bool set_action) {
......
Subproject commit 8fcf28ce5eaeda7b19205e439f7a1986aafc5b76 Subproject commit 23aeb9a075603873c4a20b528e609b86465ab313
Subproject commit 19d3c54b209fd14861762bbf8213b8f52578e63a Subproject commit 0155bdcafdc2248c7e654d6f5fb5d60b206b236a
...@@ -657,6 +657,7 @@ ...@@ -657,6 +657,7 @@
!setname 0x12 青蛙 ガエル !setname 0x12 青蛙 ガエル
!setname 0x13 机皇 機皇 !setname 0x13 机皇 機皇
!setname 0x3013 机皇帝 機皇帝 !setname 0x3013 机皇帝 機皇帝
!setname 0x5013 机皇神 機皇神
!setname 0x6013 机皇兵 機皇兵 !setname 0x6013 机皇兵 機皇兵
#setname 0x14 N/A #setname 0x14 N/A
!setname 0x15 巨大战舰 巨大戦艦 !setname 0x15 巨大战舰 巨大戦艦
......
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