diff options
38 files changed, 46 insertions, 4 deletions
diff --git a/assets/fonts/OpenSans-Bold.ttf b/assets/fonts/OpenSans-Bold.ttf Binary files differnew file mode 100644 index 0000000..3a53300 --- /dev/null +++ b/assets/fonts/OpenSans-Bold.ttf diff --git a/assets/fonts/OpenSans-BoldItalic.ttf b/assets/fonts/OpenSans-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..5133a56 --- /dev/null +++ b/assets/fonts/OpenSans-BoldItalic.ttf diff --git a/assets/fonts/OpenSans-ExtraBold.ttf b/assets/fonts/OpenSans-ExtraBold.ttf Binary files differnew file mode 100644 index 0000000..2b4ba63 --- /dev/null +++ b/assets/fonts/OpenSans-ExtraBold.ttf diff --git a/assets/fonts/OpenSans-ExtraBoldItalic.ttf b/assets/fonts/OpenSans-ExtraBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..b6a9f4f --- /dev/null +++ b/assets/fonts/OpenSans-ExtraBoldItalic.ttf diff --git a/assets/fonts/OpenSans-Italic.ttf b/assets/fonts/OpenSans-Italic.ttf Binary files differnew file mode 100644 index 0000000..6d869c5 --- /dev/null +++ b/assets/fonts/OpenSans-Italic.ttf diff --git a/assets/fonts/OpenSans-Light.ttf b/assets/fonts/OpenSans-Light.ttf Binary files differnew file mode 100644 index 0000000..1bd1532 --- /dev/null +++ b/assets/fonts/OpenSans-Light.ttf diff --git a/assets/fonts/OpenSans-LightItalic.ttf b/assets/fonts/OpenSans-LightItalic.ttf Binary files differnew file mode 100644 index 0000000..5081650 --- /dev/null +++ b/assets/fonts/OpenSans-LightItalic.ttf diff --git a/assets/fonts/OpenSans-Medium.ttf b/assets/fonts/OpenSans-Medium.ttf Binary files differnew file mode 100644 index 0000000..117ce67 --- /dev/null +++ b/assets/fonts/OpenSans-Medium.ttf diff --git a/assets/fonts/OpenSans-MediumItalic.ttf b/assets/fonts/OpenSans-MediumItalic.ttf Binary files differnew file mode 100644 index 0000000..5d23fed --- /dev/null +++ b/assets/fonts/OpenSans-MediumItalic.ttf diff --git a/assets/fonts/OpenSans-Regular.ttf b/assets/fonts/OpenSans-Regular.ttf Binary files differnew file mode 100644 index 0000000..705966c --- /dev/null +++ b/assets/fonts/OpenSans-Regular.ttf diff --git a/assets/fonts/OpenSans-SemiBold.ttf b/assets/fonts/OpenSans-SemiBold.ttf Binary files differnew file mode 100644 index 0000000..5d39dde --- /dev/null +++ b/assets/fonts/OpenSans-SemiBold.ttf diff --git a/assets/fonts/OpenSans-SemiBoldItalic.ttf b/assets/fonts/OpenSans-SemiBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..367ab79 --- /dev/null +++ b/assets/fonts/OpenSans-SemiBoldItalic.ttf diff --git a/assets/fonts/OpenSans_Condensed-Bold.ttf b/assets/fonts/OpenSans_Condensed-Bold.ttf Binary files differnew file mode 100644 index 0000000..b0054ae --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-Bold.ttf diff --git a/assets/fonts/OpenSans_Condensed-BoldItalic.ttf b/assets/fonts/OpenSans_Condensed-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..6402128 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-BoldItalic.ttf diff --git a/assets/fonts/OpenSans_Condensed-ExtraBold.ttf b/assets/fonts/OpenSans_Condensed-ExtraBold.ttf Binary files differnew file mode 100644 index 0000000..cb468b5 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-ExtraBold.ttf diff --git a/assets/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf b/assets/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..d22b11e --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-ExtraBoldItalic.ttf diff --git a/assets/fonts/OpenSans_Condensed-Italic.ttf b/assets/fonts/OpenSans_Condensed-Italic.ttf Binary files differnew file mode 100644 index 0000000..7a40de1 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-Italic.ttf diff --git a/assets/fonts/OpenSans_Condensed-Light.ttf b/assets/fonts/OpenSans_Condensed-Light.ttf Binary files differnew file mode 100644 index 0000000..2b9c16f --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-Light.ttf diff --git a/assets/fonts/OpenSans_Condensed-LightItalic.ttf b/assets/fonts/OpenSans_Condensed-LightItalic.ttf Binary files differnew file mode 100644 index 0000000..23c6280 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-LightItalic.ttf diff --git a/assets/fonts/OpenSans_Condensed-Medium.ttf b/assets/fonts/OpenSans_Condensed-Medium.ttf Binary files differnew file mode 100644 index 0000000..e42ee36 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-Medium.ttf diff --git a/assets/fonts/OpenSans_Condensed-MediumItalic.ttf b/assets/fonts/OpenSans_Condensed-MediumItalic.ttf Binary files differnew file mode 100644 index 0000000..830c187 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-MediumItalic.ttf diff --git a/assets/fonts/OpenSans_Condensed-Regular.ttf b/assets/fonts/OpenSans_Condensed-Regular.ttf Binary files differnew file mode 100644 index 0000000..4f2fb27 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-Regular.ttf diff --git a/assets/fonts/OpenSans_Condensed-SemiBold.ttf b/assets/fonts/OpenSans_Condensed-SemiBold.ttf Binary files differnew file mode 100644 index 0000000..45f2c21 --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-SemiBold.ttf diff --git a/assets/fonts/OpenSans_Condensed-SemiBoldItalic.ttf b/assets/fonts/OpenSans_Condensed-SemiBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..8dd9bcb --- /dev/null +++ b/assets/fonts/OpenSans_Condensed-SemiBoldItalic.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-Bold.ttf b/assets/fonts/OpenSans_SemiCondensed-Bold.ttf Binary files differnew file mode 100644 index 0000000..b60406e --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-Bold.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-BoldItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..eb97f18 --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-BoldItalic.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-ExtraBold.ttf b/assets/fonts/OpenSans_SemiCondensed-ExtraBold.ttf Binary files differnew file mode 100644 index 0000000..b9b6bda --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-ExtraBold.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..2c8f934 --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-ExtraBoldItalic.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-Italic.ttf b/assets/fonts/OpenSans_SemiCondensed-Italic.ttf Binary files differnew file mode 100644 index 0000000..601a1fa --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-Italic.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-Light.ttf b/assets/fonts/OpenSans_SemiCondensed-Light.ttf Binary files differnew file mode 100644 index 0000000..fcef5fd --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-Light.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-LightItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-LightItalic.ttf Binary files differnew file mode 100644 index 0000000..db6b275 --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-LightItalic.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-Medium.ttf b/assets/fonts/OpenSans_SemiCondensed-Medium.ttf Binary files differnew file mode 100644 index 0000000..e75244a --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-Medium.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-MediumItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-MediumItalic.ttf Binary files differnew file mode 100644 index 0000000..1caac86 --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-MediumItalic.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-Regular.ttf b/assets/fonts/OpenSans_SemiCondensed-Regular.ttf Binary files differnew file mode 100644 index 0000000..565ccde --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-Regular.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-SemiBold.ttf b/assets/fonts/OpenSans_SemiCondensed-SemiBold.ttf Binary files differnew file mode 100644 index 0000000..082c1a8 --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-SemiBold.ttf diff --git a/assets/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf b/assets/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf Binary files differnew file mode 100644 index 0000000..b829909 --- /dev/null +++ b/assets/fonts/OpenSans_SemiCondensed-SemiBoldItalic.ttf diff --git a/assets/scripts/mainMenu.lua b/assets/scripts/mainMenu.lua index 2f6b342..d08d82a 100644 --- a/assets/scripts/mainMenu.lua +++ b/assets/scripts/mainMenu.lua @@ -1,18 +1,29 @@ movementSpeed = 3; bannerTextureWidth = 509; +buttonHeight = 50; +buttonWidth = 110; +bigButtonWidth = 150; +bigButtonHeight = buttonHeight; function Setup() setRenderPlayer(false) setBgImage("assets/backgrounds/city-background-1.png") end -function TestButtonFunction() - setBgImage("assets/gui/mainMenu_banner.png") +function Local2PButton() +end + +function MultiplayerButton() +end + +function SettingsButton() end function Update() queueTextureForRender("assets/gui/mainMenu_banner.png", WIDTH // 2 - bannerTextureWidth // 2, 0) - queueButtonForRender("Local 2P", 0, 0, 100, 50, "TestButtonFunction"); + queueButtonForRender("Local 2P", WIDTH // 2 - buttonWidth // 2, HEIGHT // 2 - buttonHeight // 2, buttonWidth, buttonHeight, "Local2PButton"); + queueButtonForRender("Multiplayer", WIDTH // 2 - bigButtonWidth // 2, HEIGHT // 2 - bigButtonHeight // 2 + 55, bigButtonWidth, bigButtonHeight, "MultiplayerButton"); + queueButtonForRender("Settings", WIDTH // 2 - buttonWidth // 2, HEIGHT // 2 - buttonHeight // 2 + 55 + 55, buttonWidth, buttonHeight, "SettingsButton"); -- if keys[getKeycodeByName("RIGHT")] or keys[getKeycodeByName("D")] then -- movePlayer(movementSpeed, 0) diff --git a/src/main.cpp b/src/main.cpp index e4dadc0..ee291a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -230,6 +230,18 @@ int main() { SDL_SetWindowTitle(window, "Showdown of the Sticks"); SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND); + if (TTF_Init() == -1) { + std::cerr << "TTF_Init failed: " << TTF_GetError() << std::endl; + return 1; + } + + globalFont = TTF_OpenFont("assets/fonts/OpenSans-Regular.ttf", 24); + if (!globalFont) { + std::cerr << "Failed to load font: " << TTF_GetError() << std::endl; + return 1; + } + + if (!(IMG_Init(IMG_INIT_PNG) & IMG_INIT_PNG)) { std::cerr << "Failed to initialize SDL_image: " << IMG_GetError() << std::endl; return 1; @@ -265,7 +277,7 @@ int main() { } else { lua_pop(L, 1); } - + SDL_Delay(25); } } } @@ -302,6 +314,25 @@ int main() { for (const auto& button: buttonList) { SDL_SetRenderDrawColor(renderer, 252, 210, 77, 255); SDL_RenderFillRect(renderer, &button.rect); + if (globalFont) { + SDL_Color white = {255, 255, 255, 255}; + SDL_Surface* textSurface = TTF_RenderText_Blended(globalFont, button.text.c_str(), white); + if (textSurface) { + SDL_Texture* textTexture = SDL_CreateTextureFromSurface(renderer, textSurface); + SDL_Rect textRect; + textRect.w = textSurface->w; + textRect.h = textSurface->h; + textRect.x = button.rect.x + (button.rect.w - textRect.w) / 2; + textRect.y = button.rect.y + (button.rect.h - textRect.h) / 2; + + SDL_FreeSurface(textSurface); + + if (textTexture) { + SDL_RenderCopy(renderer, textTexture, nullptr, &textRect); + SDL_DestroyTexture(textTexture); + } + } + } } |