From 6bfa422bd53835a497496467b570d8d4284ae8ea Mon Sep 17 00:00:00 2001 From: devZoGok Date: Wed, 5 Aug 2026 19:07:54 +0300 Subject: [PATCH] adapted GUI to different resolutions --- Assets/Scripts/Gui/acsTechTree.lua | 2 +- Assets/Scripts/Gui/activeGameState.lua | 22 +++-- Assets/Scripts/Gui/aincTechTree.lua | 2 +- Assets/Scripts/Gui/audioTab.lua | 39 +++++++-- Assets/Scripts/Gui/console.lua | 36 ++++++-- Assets/Scripts/Gui/controlsTab.lua | 33 ++++++-- Assets/Scripts/Gui/defeat.lua | 6 +- Assets/Scripts/Gui/erTechTree.lua | 2 +- Assets/Scripts/Gui/gamePaused.lua | 9 +- Assets/Scripts/Gui/loadMap.lua | 26 ++++-- Assets/Scripts/Gui/loadingScreen.lua | 4 +- Assets/Scripts/Gui/mainMenu.lua | 27 ++++-- Assets/Scripts/Gui/mapEditor.lua | 93 ++++++++++++++++++--- Assets/Scripts/Gui/mapEditorMenu.lua | 18 +++- Assets/Scripts/Gui/mouseTab.lua | 44 ++++++++-- Assets/Scripts/Gui/newMap.lua | 67 +++++++++++---- Assets/Scripts/Gui/options.lua | 31 +++---- Assets/Scripts/Gui/playerSelection.lua | 2 +- Assets/Scripts/Gui/singlePlayerMenu.lua | 19 ++++- Assets/Scripts/Gui/statistics.lua | 53 +++++------- Assets/Scripts/Gui/tradingHub.lua | 46 +++++++++- Assets/Scripts/Gui/tradingPlayerGuiTray.lua | 14 ++-- Assets/Scripts/Gui/tradingScreen.lua | 4 +- Assets/Scripts/Gui/victory.lua | 6 +- Assets/Scripts/Gui/videoTab.lua | 53 ++++++------ mapEditorAppState.cpp | 23 +---- mapEditorAppState.h | 2 - statsButton.cpp | 2 +- 28 files changed, 480 insertions(+), 205 deletions(-) diff --git a/Assets/Scripts/Gui/acsTechTree.lua b/Assets/Scripts/Gui/acsTechTree.lua index 0b97011..70ddd46 100644 --- a/Assets/Scripts/Gui/acsTechTree.lua +++ b/Assets/Scripts/Gui/acsTechTree.lua @@ -84,7 +84,7 @@ gui = { trigger = 82, }, { - pos = {x = Pos.x + Size.x - (margin.right + 3 * techButtonSize.x), y = Pos.y + margin.top + 2 * heightOffset, z = .11}, + pos = {x = Pos.x + Size.x - (margin.right + 3.5 * techButtonSize.x), y = Pos.y + margin.top + 2 * heightOffset, z = .11}, size = techButtonSize, name = "Carriers", imagePath = baseTechPath .. 'carriers.jpg', diff --git a/Assets/Scripts/Gui/activeGameState.lua b/Assets/Scripts/Gui/activeGameState.lua index e03ec2c..cda4cd6 100644 --- a/Assets/Scripts/Gui/activeGameState.lua +++ b/Assets/Scripts/Gui/activeGameState.lua @@ -29,7 +29,7 @@ end eyeIcon = 'eye.png' refIcon = 'refineds.png' minimapSize = {x = 200, y = 200} -minimapPos = {x = 0, y = res.y - minimapSize.y, z = .85} +minimapPos = {x = 0, y = res.y - minimapSize.y, z = -.05} resTextScale = {x = .5, y = .5} resIconBasePath = 'Icons/Resources/' @@ -45,7 +45,7 @@ noHackTex = 'noHack.png' gui = { { guiType = GuiType.GUI_RECTANGLE, - pos = {x = minimapPos.x, y = minimapPos.y, z = .8}, + pos = {x = minimapPos.x, y = minimapPos.y, z = -.1}, size = minimapSize, color = {x = .5, y = .5, z = .5, w = .6} }, @@ -61,7 +61,7 @@ gui = { guiType = GuiType.TEXT, name = 'refineds', text = '', - pos = {x = s, y = s, z = 0}, + pos = {x = s, y = s, z = -.2}, scale = resTextScale, font = 'batang.ttf', fontFirstChar = 0, @@ -72,7 +72,7 @@ gui = { guiType = GuiType.TEXT, name = 'wealth', text = '', - pos = {x = s, y = 2 * s, z = 0}, + pos = {x = s, y = 2 * s, z = -.2}, scale = resTextScale, font = 'batang.ttf', fontFirstChar = 0, @@ -83,7 +83,7 @@ gui = { guiType = GuiType.TEXT, name = 'research', text = '', - pos = {x = s, y = 3 * s, z = 0}, + pos = {x = s, y = 3 * s, z = -.2}, scale = resTextScale, font = 'batang.ttf', fontFirstChar = 0, @@ -93,21 +93,21 @@ gui = { { guiType = GuiType.GUI_RECTANGLE, name = 'refineds', - pos = {x = 0, y = 0, z = 0}, + pos = {x = 0, y = 0, z = -.2}, size = {x = s, y = s}, imagePath = resIconBasePath .. 'refineds.png', }, { guiType = GuiType.GUI_RECTANGLE, name = 'wealth', - pos = {x = 0, y = 1 * s, z = 0}, + pos = {x = 0, y = 1 * s, z = -.2}, size = {x = s, y = s}, imagePath = resIconBasePath .. 'wealth.png', }, { guiType = GuiType.GUI_RECTANGLE, name = 'research', - pos = {x = 0, y = 2 * s, z = 0}, + pos = {x = 0, y = 2 * s, z = -.2}, size = {x = s, y = s}, imagePath = resIconBasePath .. 'research.png', }, @@ -116,16 +116,14 @@ gui = { buttonType = ButtonType.PLAYER_TRADE, name = 'Trade', guiScreen = 'tradingHub.lua', - pos = {x = minimapSize.x, y = res.y - minimapSize.y, z = 0}, + pos = {x = minimapSize.x, y = res.y - minimapSize.y, z = -.2}, size = {x = Size.x, y = minimapSize.y - .75 * sz}, trigger = 10 }, { guiType = GuiType.GUI_RECTANGLE, - pos = {x = minimapSize.x, y = res.y - .75 * sz, z = 0}, + pos = {x = minimapSize.x, y = res.y - .75 * sz, z = -.2}, size = {x = res.x - minimapPos.x, y = sz * .75}, color = {x = .6, y = .6, z = .6, w = .4} }, - --[[ - ]]-- } diff --git a/Assets/Scripts/Gui/aincTechTree.lua b/Assets/Scripts/Gui/aincTechTree.lua index 7782408..69a66dd 100644 --- a/Assets/Scripts/Gui/aincTechTree.lua +++ b/Assets/Scripts/Gui/aincTechTree.lua @@ -84,7 +84,7 @@ gui = { trigger = 82, }, { - pos = {x = Pos.x + Size.x - (margin.right + 3 * techButtonSize.x), y = Pos.y + margin.top + 2 * heightOffset, z = .11}, + pos = {x = Pos.x + Size.x - (margin.right + 3.5 * techButtonSize.x), y = Pos.y + margin.top + 2 * heightOffset, z = .11}, size = techButtonSize, name = "Carriers", imagePath = baseTechPath .. 'carriers.jpg', diff --git a/Assets/Scripts/Gui/audioTab.lua b/Assets/Scripts/Gui/audioTab.lua index 0419e1b..cc1f051 100644 --- a/Assets/Scripts/Gui/audioTab.lua +++ b/Assets/Scripts/Gui/audioTab.lua @@ -1,37 +1,58 @@ -numGui = 5 gui = { { - pos = {x = 110, y = 90, z = 0}, - size = {x = 100, y = 10}, + guiType = GuiType.TEXT, + name = '', + text = 'Audio', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + name = '', + text = 'Volume', + pos = {x = 20, y = 110, z = 0}, + scale = .2, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 370, y = 100, z = 0}, + size = {x = 60, y = 30}, guiType = GuiType.TEXTBOX, }, { - pos = {x = 110, y = 40, z = 0}, - size = {x = 100, y = 10}, + pos = {x = 120, y = 100, z = 0}, + size = {x = 200, y = 10}, guiType = GuiType.SLIDER, minValue = 0, maxValue = 100, numDependencies = 1, dependencies = { - {id = 0} + {id = 1} } }, { - pos = {x = 100, y = 400, z = 0}, + pos = {x = 20, y = 400, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Ok', buttonType = ButtonType.OK }, { - pos = {x = 260, y = 400, z = 0}, + pos = {x = 180, y = 400, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Restore defaults', buttonType = ButtonType.DEFAULTS }, { - pos = {x = 420, y = 400, z = 0}, + pos = {x = 340, y = 400, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Back', diff --git a/Assets/Scripts/Gui/console.lua b/Assets/Scripts/Gui/console.lua index 61e3e64..8e00b57 100644 --- a/Assets/Scripts/Gui/console.lua +++ b/Assets/Scripts/Gui/console.lua @@ -1,28 +1,46 @@ -numGui = 3 gui = { { - pos = {x = 100, y = 100, z = 0}, - size = {x = 300, y = 20}, + guiType = GuiType.TEXT, + text = 'Console', + name = '', + pos = {x = 20, y = 40, z = 0}, + scale = 0.5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 40, z = 0}, + size = {x = 600, y = 20}, guiType = GuiType.LISTBOX, listboxType = ListboxType.CONSOLE, numMaxDisplay = 10, closable = false }, { - pos = {x = 100, y = 510, z = 0}, - size = {x = 270, y = 20}, + pos = {x = 20, y = 510, z = 0}, + size = {x = 550, y = 20}, guiType = GuiType.TEXTBOX }, { - pos = {x = 380, y = 510, z = 0}, - size = {x = 20, y = 20}, + pos = {x = 590, y = 510, z = 0}, + size = {x = 30, y = 20}, guiType = GuiType.BUTTON, buttonType = ButtonType.CONSOLE_COMMAND_OK, name = 'OK', numDependencies = 2, dependencies = { - {id = 0}, - {id = 1} + {id = 1}, + {id = 2} } + }, + { + pos = {x = 630, y = 510, z = 0}, + size = {x = 40, y = 20}, + guiType = GuiType.BUTTON, + buttonType = ButtonType.BACK, + screen = 'gamePaused.lua', + name = 'Back' } } diff --git a/Assets/Scripts/Gui/controlsTab.lua b/Assets/Scripts/Gui/controlsTab.lua index 8518863..e639ee9 100644 --- a/Assets/Scripts/Gui/controlsTab.lua +++ b/Assets/Scripts/Gui/controlsTab.lua @@ -1,28 +1,49 @@ -numGui = 4 gui = { { - pos = {x = 110, y = 190, z = 0}, - size = {x = 360, y = 20}, + guiType = GuiType.TEXT, + name = '', + text = 'Controls', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + name = '', + text = 'Key bindings', + pos = {x = 20, y = 190, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 200, z = 0}, + size = {x = 470, y = 20}, guiType = GuiType.LISTBOX, listboxType = ListboxType.CONTROLS, numMaxDisplay = 5 }, { - pos = {x = 100, y = 400, z = 0}, + pos = {x = 20, y = 410, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Ok', buttonType = ButtonType.OK }, { - pos = {x = 260, y = 400, z = 0}, + pos = {x = 180, y = 410, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Restore defaults', buttonType = ButtonType.DEFAULTS }, { - pos = {x = 420, y = 400, z = 0}, + pos = {x = 340, y = 410, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Back', diff --git a/Assets/Scripts/Gui/defeat.lua b/Assets/Scripts/Gui/defeat.lua index a73a62c..f0e545d 100644 --- a/Assets/Scripts/Gui/defeat.lua +++ b/Assets/Scripts/Gui/defeat.lua @@ -7,16 +7,16 @@ music = { res = graphics.resolution overlaySize = {x = 600, y = 450} -overlayPos = {x = .5 * (res.x - overlaySize.x), y = 200, z = 0} +overlayPos = {x = .5 * (res.x - overlaySize.x), y = 100, z = .2} buttonSize = {x = 150, y = 40} -buttonInitPos = {x = .5 * (res.x - buttonSize.x), y = 350, z = .1} +buttonInitPos = {x = .5 * (res.x - buttonSize.x), y = 250, z = .3} gui = { { guiType = GuiType.TEXT, text = 'Defeat', name = 'D', - pos = {x = overlayPos.x + 20, y = overlayPos.y + 75, z = .1}, + pos = {x = overlayPos.x + 150, y = overlayPos.y + 75, z = .3}, scale = 1, font = 'batang.ttf', fontFirstChar = 0, diff --git a/Assets/Scripts/Gui/erTechTree.lua b/Assets/Scripts/Gui/erTechTree.lua index 795769f..c9c5373 100644 --- a/Assets/Scripts/Gui/erTechTree.lua +++ b/Assets/Scripts/Gui/erTechTree.lua @@ -84,7 +84,7 @@ gui = { trigger = 82, }, { - pos = {x = Pos.x + Size.x - (margin.right + 3 * techButtonSize.x), y = Pos.y + margin.top + 2 * heightOffset, z = .11}, + pos = {x = Pos.x + Size.x - (margin.right + 3.5 * techButtonSize.x), y = Pos.y + margin.top + 2 * heightOffset, z = .11}, size = techButtonSize, name = "Carriers", imagePath = baseTechPath .. 'carriers.jpg', diff --git a/Assets/Scripts/Gui/gamePaused.lua b/Assets/Scripts/Gui/gamePaused.lua index f9a4be1..92cedaf 100644 --- a/Assets/Scripts/Gui/gamePaused.lua +++ b/Assets/Scripts/Gui/gamePaused.lua @@ -1,8 +1,13 @@ Size = {x = 150, y = 50} -numGui = 5 gui = { { - pos = {x = 100, y = 100, z = 0}, + guiType = GuiType.GUI_RECTANGLE, + pos = {x = 0, y = 0, z = -.01}, + size = graphics.resolution, + color = {x = 0, y = 0, z = 0, w = .6} + }, + { + pos = {x = 100, y = 100, z = .3}, size = Size, guiType = GuiType.BUTTON, buttonType = ButtonType.RESUME, diff --git a/Assets/Scripts/Gui/loadMap.lua b/Assets/Scripts/Gui/loadMap.lua index 6538fda..1b65fc8 100644 --- a/Assets/Scripts/Gui/loadMap.lua +++ b/Assets/Scripts/Gui/loadMap.lua @@ -1,7 +1,17 @@ -numGui = 3 gui = { { - pos = {x = 110, y = 190, z = 0}, + guiType = GuiType.TEXT, + name = 't0', + text = 'Load map', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 100, z = 0}, size = {x = 360, y = 20}, guiType = GuiType.LISTBOX, addPlayerGui = false, @@ -9,19 +19,17 @@ gui = { numMaxDisplay = 5 }, { - pos = {x = 110, y = 250, z = 0}, - size = {x = 140, y = 40}, + pos = {x = 20, y = 210, z = 0}, + size = {x = 160, y = 40}, guiType = GuiType.BUTTON, name = 'Ok', buttonType = ButtonType.LOAD_MAP_OK, numDependencies = 1, - dependencies = { - {id = 0} - } + dependencies = {{id = 1}} }, { - pos = {x = 420, y = 400, z = 0}, - size = {x = 150, y = 50}, + pos = {x = 220, y = 210, z = 0}, + size = {x = 160, y = 40}, guiType = GuiType.BUTTON, name = 'Back', buttonType = ButtonType.BACK, diff --git a/Assets/Scripts/Gui/loadingScreen.lua b/Assets/Scripts/Gui/loadingScreen.lua index 159a0c6..41e4313 100644 --- a/Assets/Scripts/Gui/loadingScreen.lua +++ b/Assets/Scripts/Gui/loadingScreen.lua @@ -1,5 +1,7 @@ -initPos = {x = 850, y = 100, z = 0} +res = graphics.resolution + Size = {x = 200, y = 20} +initPos = {x = .5 * (res.x - Size.x), y = 100, z = 0} gui = { { diff --git a/Assets/Scripts/Gui/mainMenu.lua b/Assets/Scripts/Gui/mainMenu.lua index 8751fac..f3243f8 100644 --- a/Assets/Scripts/Gui/mainMenu.lua +++ b/Assets/Scripts/Gui/mainMenu.lua @@ -1,6 +1,12 @@ Size = {x = 150, y = 40} +res = graphics.resolution + +res = graphics.resolution +overlaySize = {x = 600, y = 450} +overlayPos = {x = .5 * (res.x - overlaySize.x), y = 100, z = 0} +buttonSize = {x = 150, y = 40} +buttonInitPos = {x = .5 * (res.x - buttonSize.x), y = 250, z = .1} -numGui = 4 music = { loop = true, shuffle = false, @@ -9,28 +15,39 @@ music = { } gui = { { - pos = {x = 110, y = 40, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Planet Fleet', + pos = {x = 20, y = 50, z = 0}, + scale = .75, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 0, y = 0, z = 1, w = 1} + }, + { + pos = {x = 20, y = 100, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Single player', buttonType = ButtonType.SINGLE_PLAYER }, { - pos = {x = 110, y = 90, z = 0}, + pos = {x = 20, y = 160, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Map editor', buttonType = ButtonType.MAP_EDITOR }, { - pos = {x = 110, y = 140, z = 0}, + pos = {x = 20, y = 220, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Options', buttonType = ButtonType.OPTIONS }, { - pos = {x = 110, y = 190, z = 0}, + pos = {x = 20, y = 280, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Exit', diff --git a/Assets/Scripts/Gui/mapEditor.lua b/Assets/Scripts/Gui/mapEditor.lua index 9fb8576..cb5f2dc 100644 --- a/Assets/Scripts/Gui/mapEditor.lua +++ b/Assets/Scripts/Gui/mapEditor.lua @@ -1,47 +1,120 @@ music = {tracks = {}} -numGui = 6 Size = {x = 140, y = 20} -startX = 100 +startX = 20 gui = { { - pos = {x = startX, y = 400, z = 0}, - size = Size, + guiType = GuiType.TEXT, + name = 'radius_', + text = '', + pos = {x = 0, y = 40, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = startX, y = 300, z = 0}, + size = {x = 80, y = 20}, guiType = GuiType.BUTTON, buttonType = ButtonType.EXPORT, name = 'Export' }, { - pos = {x = startX + Size.x + 10, y = 400, z = 0}, + pos = {x = startX + 110, y = 300, z = 0}, + size = {x = 170, y = 20}, + guiType = GuiType.BUTTON, + buttonType = ButtonType.BACK, + screen = 'mapEditorMenu.lua', + name = 'Back to map editor' + }, + { + guiType = GuiType.TEXT, + name = '', + text = 'Vehicles', + pos = {x = startX, y = 400, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = startX, y = 400, z = 0}, size = Size, guiType = GuiType.LISTBOX, listboxType = ListboxType.VEHICLES, numMaxDisplay = 5 }, { - pos = {x = startX + 2 * (Size.x + 10), y = 400, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Structures', + pos = {x = startX + 150, y = 400, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = startX + 150, y = 400, z = 0}, size = Size, guiType = GuiType.LISTBOX, listboxType = ListboxType.STRUCTURES, numMaxDisplay = 5 }, { - pos = {x = startX + 3 * (Size.x + 10), y = 400, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Resources', + pos = {x = startX + 2 * (Size.x + 10), y = 400, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = startX + 2 * (Size.x + 10), y = 400, z = 0}, size = Size, guiType = GuiType.LISTBOX, listboxType = ListboxType.RESOURCE_DEPOSITS, numMaxDisplay = 5 }, { - pos = {x = startX + 4 * (Size.x + 10), y = 400, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Skyboxes', + pos = {x = startX + 3 * (Size.x + 10), y = 400, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = startX + 3 * (Size.x + 10), y = 400, z = 0}, size = Size, guiType = GuiType.LISTBOX, listboxType = ListboxType.SKYBOX_TEXTURES, numMaxDisplay = 5 }, { - pos = {x = startX + 5 * (Size.x + 10), y = 400, z = 0}, - size = Size, + guiType = GuiType.TEXT, + name = '', + text = 'Land textures', + pos = {x = startX + 4 * (Size.x + 10), y = 400, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = startX + 4 * (Size.x + 10), y = 400, z = 0}, + size = {x = 170, y = 20}, guiType = GuiType.LISTBOX, listboxType = ListboxType.LAND_TEXTURES, numMaxDisplay = 5 diff --git a/Assets/Scripts/Gui/mapEditorMenu.lua b/Assets/Scripts/Gui/mapEditorMenu.lua index 5bae37a..aab0497 100644 --- a/Assets/Scripts/Gui/mapEditorMenu.lua +++ b/Assets/Scripts/Gui/mapEditorMenu.lua @@ -1,23 +1,33 @@ Size = {x = 150, y = 40} -numGui = 3 gui = { { - pos = {x = 110, y = 40, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Map editor', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 60, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'New map', buttonType = ButtonType.NEW_MAP }, { - pos = {x = 110, y = 90, z = 0}, + pos = {x = 20, y = 110, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Load map', buttonType = ButtonType.LOAD_MAP }, { - pos = {x = 110, y = 140, z = 0}, + pos = {x = 20, y = 160, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Back', diff --git a/Assets/Scripts/Gui/mouseTab.lua b/Assets/Scripts/Gui/mouseTab.lua index e9c34f4..d9c7595 100644 --- a/Assets/Scripts/Gui/mouseTab.lua +++ b/Assets/Scripts/Gui/mouseTab.lua @@ -1,23 +1,55 @@ -numGui = 6 gui = { { - pos = {x = 110, y = 80, z = 0}, - size = {x = 300, y = 10}, + guiType = GuiType.TEXT, + name = '', + text = 'Mouse', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + name = '', + text = 'Sensitivity', + pos = {x = 20, y = 110, z = 0}, + scale = .2, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 470, y = 100, z = 0}, + size = {x = 60, y = 30}, guiType = GuiType.TEXTBOX }, { - pos = {x = 110, y = 40, z = 0}, + pos = {x = 120, y = 100, z = 0}, size = {x = 300, y = 10}, minValue = 0, maxValue = 2, guiType = GuiType.SLIDER, numDependencies = 1, dependencies = { - {id = 0} + {id = 1} } }, { - pos = {x = 110, y = 110, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Reverse', + pos = {x = 20, y = 150, z = 0}, + scale = .2, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 110, y = 135, z = 0}, guiType = GuiType.CHECKBOX }, { diff --git a/Assets/Scripts/Gui/newMap.lua b/Assets/Scripts/Gui/newMap.lua index 2f0fc99..b416359 100644 --- a/Assets/Scripts/Gui/newMap.lua +++ b/Assets/Scripts/Gui/newMap.lua @@ -1,38 +1,77 @@ -Size = {x = 140, y = 40} +Size = {x = 200, y = 40} -numGui = 5 gui = { { - pos = {x = 110, y = 150, z = 0}, + guiType = GuiType.TEXT, + name = 't0', + text = 'New map', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + name = 't1', + text = 'Map name', + pos = {x = 20, y = 150, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 150, z = 0}, size = Size, guiType = GuiType.TEXTBOX }, { - pos = {x = 110, y = 190, z = 0}, + guiType = GuiType.TEXT, + name = 't2', + text = 'Width', + pos = {x = 20, y = 220, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 220, z = 0}, size = Size, guiType = GuiType.TEXTBOX }, { - pos = {x = 110, y = 220, z = 0}, + guiType = GuiType.TEXT, + name = 't3', + text = 'Height', + pos = {x = 20, y = 290, z = 0}, + scale = .25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 290, z = 0}, size = Size, guiType = GuiType.TEXTBOX }, { - pos = {x = 420, y = 400, z = 0}, - size = {x = 150, y = 50}, + pos = {x = 20, y = 400, z = 0}, + size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Ok', buttonType = ButtonType.NEW_MAP_OK, numDependencies = 3, - dependencies = { - {id = 0}, - {id = 1}, - {id = 2} - } + dependencies = {{id = 2}, {id = 4}, {id = 6}} }, { - pos = {x = 250, y = 400, z = 0}, - size = {x = 150, y = 50}, + pos = {x = 190, y = 400, z = 0}, + size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Back', buttonType = ButtonType.BACK, diff --git a/Assets/Scripts/Gui/options.lua b/Assets/Scripts/Gui/options.lua index d5be514..8276b2c 100644 --- a/Assets/Scripts/Gui/options.lua +++ b/Assets/Scripts/Gui/options.lua @@ -1,44 +1,47 @@ -Size = {x = 150, y = 40} +Size = {x = 120, y = 20} -numGui = 6 gui = { { - pos = {x = 110, y = 40, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Options', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 100, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Controls', buttonType = ButtonType.CONTROLS_TAB }, { - pos = {x = 270, y = 40, z = 0}, + pos = {x = 180, y = 100, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Mouse', buttonType = ButtonType.MOUSE_TAB }, { - pos = {x = 430, y = 40, z = 0}, + pos = {x = 340, y = 100, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Video', buttonType = ButtonType.VIDEO_TAB }, { - pos = {x = 590, y = 40, z = 0}, + pos = {x = 500, y = 100, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Audio', buttonType = ButtonType.AUDIO_TAB }, { - pos = {x = 750, y = 40, z = 0}, - size = Size, - guiType = GuiType.BUTTON, - name = 'Multiplayer', - buttonType = ButtonType.MULTIPLAYER_TAB - }, - { - pos = {x = 910, y = 100, z = 0}, + pos = {x = 20, y = 160, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Back', diff --git a/Assets/Scripts/Gui/playerSelection.lua b/Assets/Scripts/Gui/playerSelection.lua index 4b3ae1b..6230569 100644 --- a/Assets/Scripts/Gui/playerSelection.lua +++ b/Assets/Scripts/Gui/playerSelection.lua @@ -1,4 +1,4 @@ -playerListboxPos = {x = 110, y = 10, z = 0} +playerListboxPos = {x = 20, y = 10, z = 0} Pos = {x = playerListboxPos.x, y = playerListboxPos.y, z = playerListboxPos.z} FactionListboxSize = {x = 270, y = 20} Size = {x = 150, y = 20} diff --git a/Assets/Scripts/Gui/singlePlayerMenu.lua b/Assets/Scripts/Gui/singlePlayerMenu.lua index 71fb002..689f489 100644 --- a/Assets/Scripts/Gui/singlePlayerMenu.lua +++ b/Assets/Scripts/Gui/singlePlayerMenu.lua @@ -10,7 +10,18 @@ MAIN_PLAYER_ID = 0 gui = { { - pos = {x = 110, y = 310, z = 0}, + guiType = GuiType.TEXT, + name = '', + text = 'Singleplayer', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 310, z = 0}, size = Size, guiType = GuiType.LISTBOX, addPlayerGui = true, @@ -18,16 +29,16 @@ gui = { numMaxDisplay = 5 }, { - pos = {x = 110, y = 460, z = 0}, + pos = {x = 20, y = 460, z = 0}, size = Size, guiType = GuiType.BUTTON, buttonType = ButtonType.PLAY, name = 'Play', numDependencies = 4, - dependencies = {{id = 0}} + dependencies = {{id = 1}} }, { - pos = {x = 110 + Size.x + 10, y = 460, z = 0}, + pos = {x = 20 + Size.x + 10, y = 460, z = 0}, size = Size, guiType = GuiType.BUTTON, buttonType = ButtonType.BACK, diff --git a/Assets/Scripts/Gui/statistics.lua b/Assets/Scripts/Gui/statistics.lua index 346e552..56913f8 100644 --- a/Assets/Scripts/Gui/statistics.lua +++ b/Assets/Scripts/Gui/statistics.lua @@ -1,6 +1,7 @@ -headerHeight = 150 -statsInitHeight = 120 -statsSpace = 100 +headerHeight = 100 +statsInitLeft = .5 * res.x - 400 +statsInitHeight = 40 +statsSpace = 20 fontName = 'batang.ttf' gui = { @@ -8,8 +9,7 @@ gui = { guiType = GuiType.TEXT, text = 'Statistics', name = 'stat', - pos = {x = 850, y = 100, z = 0}, - zIndex = 0, + pos = {x = .4 * res.x, y = 50, z = 0}, scale = 0.5, font = fontName, fontFirstChar = 0, @@ -20,9 +20,8 @@ gui = { guiType = GuiType.TEXT, text = 'Player', name = 'pl', - pos = {x = 50, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 10, y = headerHeight, z = 0}, + scale = 0.18, font = fontName, fontFirstChar = 0, fontLastChar = 256, @@ -32,9 +31,8 @@ gui = { guiType = GuiType.TEXT, text = 'Vehicles built', name = 'vb', - pos = {x = 150, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 110, y = headerHeight, z = 0}, + scale = 0.18, font = fontName, fontFirstChar = 0, fontLastChar = 256, @@ -44,9 +42,8 @@ gui = { guiType = GuiType.TEXT, text = 'Vehicles destroyed', name = 'vd', - pos = {x = 450, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 220, y = headerHeight, z = 0}, + scale = 0.18, font = fontName, fontFirstChar = 0, fontLastChar = 256, @@ -56,9 +53,8 @@ gui = { guiType = GuiType.TEXT, text = 'Vehicles lost', name = 'vl', - pos = {x = 850, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 370, y = headerHeight, z = 0}, + scale = 0.18, font = fontName, fontFirstChar = 0, fontLastChar = 256, @@ -66,11 +62,10 @@ gui = { }, { guiType = GuiType.TEXT, - text = 'Structures built', + text = 'Structs built', name = 'sb', - pos = {x = 1050, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 480, y = headerHeight, z = 0}, + scale = 0.18, font = fontName, fontFirstChar = 0, fontLastChar = 256, @@ -78,11 +73,10 @@ gui = { }, { guiType = GuiType.TEXT, - text = 'Structures destroyed', + text = 'Structs destroyed', name = 'sd', - pos = {x = 1350, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 580, y = headerHeight, z = 0}, + scale = 0.18, font = fontName, fontFirstChar = 0, fontLastChar = 256, @@ -90,18 +84,17 @@ gui = { }, { guiType = GuiType.TEXT, - text = 'Structures lost', + text = 'Structs lost', name = 'sl', - pos = {x = 1720, y = headerHeight, z = 0}, - zIndex = 0, - scale = 0.3, + pos = {x = statsInitLeft + 720, y = headerHeight, z = 0}, + scale = 0.18, font = 'batang.ttf', fontFirstChar = 0, fontLastChar = 256, color = {x = 1, y = 1, z = 1, w = 1} }, { - pos = {x = 1700, y = 1000, z = 0}, + pos = {x = res.x - Size.x - 10, y = res.y - Size.y - 10, z = 0}, size = Size, guiType = GuiType.BUTTON, name = 'Back', diff --git a/Assets/Scripts/Gui/tradingHub.lua b/Assets/Scripts/Gui/tradingHub.lua index 552020e..62c0e9c 100644 --- a/Assets/Scripts/Gui/tradingHub.lua +++ b/Assets/Scripts/Gui/tradingHub.lua @@ -1,6 +1,6 @@ res = graphics.resolution -HubSize = {x = res.x * .3, y = res.y * .8} +HubSize = {x = 500, y = res.y * .8} HubPos = {x = .5 * (res.x - HubSize.x), y = 10, z = .1} HubMargin = {top = 10, left = 10, right = 10, bottom = 10} @@ -11,6 +11,50 @@ warIcon = 'Icons/PlayerStates/war.png' allianceIcon = 'Icons/PlayerStates/alliance.png' gui = { + { + guiType = GuiType.TEXT, + text = 'Trading hub', + name = '', + pos = {x = HubPos.x + .25 * HubSize.x, y = HubPos.y + HubMargin.top + 25, z = .11}, + scale = 0.5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + text = 'Name', + name = '', + pos = {x = HubPos.x + HubMargin.left, y = HubPos.y + HubMargin.top + 60, z = .11}, + scale = 0.25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + text = 'Status', + name = '', + pos = {x = HubPos.x + HubMargin.left + 130, y = HubPos.y + HubMargin.top + 60, z = .11}, + scale = 0.25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + text = 'Trade offers', + name = '', + pos = {x = HubPos.x + HubMargin.right + 200, y = HubPos.y + HubMargin.top + 60, z = .11}, + scale = 0.25, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, { guiType = GuiType.GUI_RECTANGLE, pos = HubPos, diff --git a/Assets/Scripts/Gui/tradingPlayerGuiTray.lua b/Assets/Scripts/Gui/tradingPlayerGuiTray.lua index 79098c5..2e126a4 100644 --- a/Assets/Scripts/Gui/tradingPlayerGuiTray.lua +++ b/Assets/Scripts/Gui/tradingPlayerGuiTray.lua @@ -1,17 +1,17 @@ res = graphics.resolution -buttonSize = {x = 100, y = 20} +buttonSize = {x = 60, y = 20} textboxSize = {x = 200, y = 20} -height = HubPos.y + HubMargin.top + lineId * 30 +height = HubPos.y + HubMargin.top + 90 + lineId * 70 gui = { { guiType = GuiType.TEXT, name = 'playerName', text = '', - pos = {x = HubPos.x + HubMargin.left, y = height + 35, z = .11}, - scale = {x = .2, y = .2}, + pos = {x = HubPos.x + HubMargin.left, y = height + 40, z = .11}, + scale = .2, font = 'batang.ttf', fontFirstChar = 0, fontLastChar = 256, @@ -19,8 +19,8 @@ gui = { }, { guiType = GuiType.GUI_RECTANGLE, - pos = {x = HubPos.x + HubMargin.left + 100, y = height, z = .11}, - size = {x = 50, y = 50}, + pos = {x = HubPos.x + HubMargin.left + 130, y = height, z = .11}, + size = {x = 40, y = 40}, imagePath = relationsIcon }, { @@ -35,7 +35,7 @@ gui = { buttonType = ButtonType.TRADING_SCREEN, name = 'Trade', guiScreen = 'tradingScreen.lua', - pos = {x = HubPos.x + HubSize.x - buttonSize.x - HubMargin.right, y = height + 25, z = .11}, + pos = {x = HubPos.x + HubSize.x - HubMargin.right - buttonSize.x, y = height + 25, z = .11}, size = buttonSize, trigger = 10, dependencies = {{id = 2}} diff --git a/Assets/Scripts/Gui/tradingScreen.lua b/Assets/Scripts/Gui/tradingScreen.lua index 2fab363..937e83b 100644 --- a/Assets/Scripts/Gui/tradingScreen.lua +++ b/Assets/Scripts/Gui/tradingScreen.lua @@ -3,7 +3,7 @@ HubMargin.top = 100 resTrayPos = {x = HubPos.x + HubMargin.left, y = HubPos.y + HubMargin.top} iconSize = {x = 25, y = 25} -textboxSize = {x = 200, y = 25} +textboxSize = {x = 150, y = 25} buttonSize = {x = 100, y = 20} @@ -117,7 +117,7 @@ gui = { buttonType = ButtonType.PLAYER_TRADE, name = 'Back', guiScreen = 'tradingHub.lua', - pos = {x = HubPos.x + HubSize.x - 3 * buttonSize.x - HubMargin.right, y = HubPos.y + HubSize.y - buttonSize.y - HubMargin.bottom, z = .2}, + pos = {x = HubPos.x + HubSize.x - 2 * buttonSize.x - 2 * HubMargin.right, y = HubPos.y + HubSize.y - buttonSize.y - HubMargin.bottom, z = .2}, size = buttonSize, trigger = 10 }, diff --git a/Assets/Scripts/Gui/victory.lua b/Assets/Scripts/Gui/victory.lua index 633459d..d969735 100644 --- a/Assets/Scripts/Gui/victory.lua +++ b/Assets/Scripts/Gui/victory.lua @@ -7,16 +7,16 @@ music = { res = graphics.resolution overlaySize = {x = 600, y = 450} -overlayPos = {x = .5 * (res.x - overlaySize.x), y = 200, z = 0} +overlayPos = {x = .5 * (res.x - overlaySize.x), y = 100, z = .2} buttonSize = {x = 150, y = 40} -buttonInitPos = {x = .5 * (res.x - buttonSize.x), y = 350, z = .1} +buttonInitPos = {x = .5 * (res.x - buttonSize.x), y = 250, z = .3} gui = { { guiType = GuiType.TEXT, text = 'VICTORY!!!', name = 'V', - pos = {x = overlayPos.x + 20, y = overlayPos.y + 75, z = .1}, + pos = {x = overlayPos.x + 20, y = overlayPos.y + 75, z = .3}, scale = 1, font = 'batang.ttf', fontFirstChar = 0, diff --git a/Assets/Scripts/Gui/videoTab.lua b/Assets/Scripts/Gui/videoTab.lua index 3ee280e..e0b0193 100644 --- a/Assets/Scripts/Gui/videoTab.lua +++ b/Assets/Scripts/Gui/videoTab.lua @@ -1,8 +1,29 @@ -numGui = 9 gui = { { - pos = {x = 210, y = 190, z = 0}, - size = {x = 360, y = 20}, + guiType = GuiType.TEXT, + name = '', + text = 'Video', + pos = {x = 20, y = 50, z = 0}, + scale = .5, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + guiType = GuiType.TEXT, + name = '', + text = 'Resolution', + pos = {x = 20, y = 100, z = 0}, + scale = .2, + font = 'batang.ttf', + fontFirstChar = 0, + fontLastChar = 256, + color = {x = 1, y = 1, z = 1, w = 1} + }, + { + pos = {x = 20, y = 100, z = 0}, + size = {x = 120, y = 20}, guiType = GuiType.LISTBOX, listboxType = ListboxType.RESOLUTION, numMaxDisplay = 5, @@ -14,41 +35,21 @@ gui = { } }, { - pos = {x = 110, y = 40, z = 0}, - guiType = GuiType.CHECKBOX - }, - { - pos = {x = 110, y = 70, z = 0}, - guiType = GuiType.CHECKBOX - }, - { - pos = {x = 110, y = 100, z = 0}, - guiType = GuiType.CHECKBOX - }, - { - pos = {x = 110, y = 130, z = 0}, - guiType = GuiType.CHECKBOX - }, - { - pos = {x = 110, y = 160, z = 0}, - guiType = GuiType.CHECKBOX - }, - { - pos = {x = 100, y = 400, z = 0}, + pos = {x = 20, y = 310, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Ok', buttonType = ButtonType.OK }, { - pos = {x = 260, y = 400, z = 0}, + pos = {x = 180, y = 310, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Restore defaults', buttonType = ButtonType.DEFAULTS }, { - pos = {x = 420, y = 400, z = 0}, + pos = {x = 340, y = 310, z = 0}, size = {x = 150, y = 20}, guiType = GuiType.BUTTON, name = 'Back', diff --git a/mapEditorAppState.cpp b/mapEditorAppState.cpp index 8a2f50d..0491e5c 100644 --- a/mapEditorAppState.cpp +++ b/mapEditorAppState.cpp @@ -5,6 +5,7 @@ #include "resourceDeposit.h" #include "gameObjectFactory.h" #include "gameObjectFrameController.h" +#include "concreteGuiManager.h" #include "player.h" #include "game.h" #include "map.h" @@ -624,8 +625,7 @@ namespace battleship{ } void MapEditorAppState::update(){ - radiusText->setText(L"Radius: " + to_wstring(mapEditor->getCircleRadius())); - weightsText->setText(L"Weights generated: " + to_wstring(mapEditor->isWeightsGenerated())); + ConcreteGuiManager::getSingleton()->getText("radius_")->setText(L"Radius: " + to_wstring(mapEditor->getCircleRadius())); CameraController *camCtr = CameraController::getSingleton(); @@ -641,25 +641,6 @@ namespace battleship{ void MapEditorAppState::onAttached(){ AbstractAppState::onAttached(); mapEditor = new MapEditor(mapName, mapSize, newMap); - - Root *root = Root::getSingleton(); - Material *mat = new Material(root->getLibPath() + "text"); - mat->addBoolUniform("texturingEnabled", false); - mat->addVec4Uniform("diffuseColor", Vector4::VEC_IJKL); - - string fontPath = GameManager::getSingleton()->getPath() + "Fonts/batang.ttf"; - radiusText = new Text(fontPath, L""); - radiusText->setMaterial(mat); - weightsText = new Text(fontPath, L""); - weightsText->setMaterial(mat); - - Node *radiusNode = new Node(Vector3(0, 100, 0)); - radiusNode->addText(radiusText); - root->getGuiNode()->attachChild(radiusNode); - - Node *weightsNode = new Node(Vector3(0, 200, 0)); - weightsNode->addText(weightsText); - root->getGuiNode()->attachChild(weightsNode); } void MapEditorAppState::onDettached(){} diff --git a/mapEditorAppState.h b/mapEditorAppState.h index 64281e0..7b4606a 100644 --- a/mapEditorAppState.h +++ b/mapEditorAppState.h @@ -16,7 +16,6 @@ namespace vb01{ class Texture; } - namespace battleship{ class MapEditor; @@ -90,7 +89,6 @@ namespace battleship{ std::string mapName; vb01::Vector2 mapSize; bool newMap; - vb01::Text *radiusText = nullptr, *weightsText = nullptr; }; } diff --git a/statsButton.cpp b/statsButton.cpp index d542bb9..3495f1f 100644 --- a/statsButton.cpp +++ b/statsButton.cpp @@ -43,11 +43,11 @@ namespace battleship{ categoryMat->addVec4Uniform("diffuseColor", Vector4(plCol.x, plCol.y, plCol.z, 1)); Text *categoryVal = new Text(GameManager::getSingleton()->getPath() + "Fonts/" + fontName, unitDataPairs[i].second); - categoryVal->setScale(category->getScale()); categoryVal->setMaterial(categoryMat); Node *categoryValNode = new Node(category->getNode()->getPosition() + Vector3(0, statsInitHeight + statsSpace * playerId, 0)); categoryValNode->addText(categoryVal); + categoryValNode->setScale(category->getNode()->getScale()); root->getGuiNode()->attachChild(categoryValNode); guiManager->addText(categoryVal);