Uploading Edits

This commit is contained in:
2024-10-28 19:03:17 -04:00
parent ab5eccb93b
commit 2a9a9389ec
5 changed files with 29 additions and 19 deletions

View File

@@ -30,12 +30,12 @@ CPMAddPackage(
CPMAddPackage(
NAME JGL
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-35.zip
URL https://git.redacted.cc/josh/JGL/archive/Prerelease-37.zip
)
CPMAddPackage(
NAME JUI
URL https://git.redacted.cc/josh/ReJUI/archive/Prerelease-4.zip
URL https://git.redacted.cc/josh/ReJUI/archive/Prerelease-5.zip
)

View File

@@ -0,0 +1,11 @@
#pragma once
namespace CaveGame::Client
{
class BaseApp
{
};
}

View File

@@ -0,0 +1 @@
#include <Client/BaseApp.hpp>

View File

@@ -8,8 +8,7 @@ CaveGame::Client::MainMenu::MainMenu() : Scene()
using namespace JUI;
scene = new JUI::Scene();
scene->SetVisible(true);
scene->Visible(true);
}
void CaveGame::Client::MainMenu::Update(float elapsed) {
@@ -42,8 +41,9 @@ JUI::TextButton* CaveGame::Client::MainMenu::create_mainmenu_btn(const std::stri
btn->SetFont(font);
btn->SetTextSize(24);
btn->SetTextColor(Colors::White);
btn->BGColor(Colors::LightGray);
btn->SetSize({0, 40, 1.f, 0});
btn->BaseBGColor(Colors::LightGray);
btn->Size({0, 40, 1.f, 0});
btn->Center();
btn->SetContent(content);
return btn;
@@ -60,22 +60,22 @@ void CaveGame::Client::MainMenu::PassFont(JGL::Font passed) {
title->SetContent("CaveGame");
title->SetTextColor(Colors::White);
title->SetTextSize(64);
title->SetPosition({0,0,0.5f,0.2f});
title->SetSize({0,0, 0.3f,0.15f});
title->SetAnchorPoint({0.5f, 0.5f});
title->Position({0,0,0.5f,0.2f});
title->Size({0,0, 0.3f,0.15f});
title->AnchorPoint({0.5f, 0.5f});
title->Center();
title->BGColor(Colors::Black);
title->SetBorderStyling(Colors::Cyans::Cyan, 1);
button_group = new Rect(scene);
button_group->SetSize({250,400,0,0});
button_group->SetPosition({0, 0, 0.5f, 0.3f});
button_group->SetAnchorPoint({0.5f, 0.f});
button_group->Size({250,400,0,0});
button_group->Position({0, 0, 0.5f, 0.3f});
button_group->AnchorPoint({0.5f, 0.f});
button_group->BGColor(Colors::Black);
button_group->SetBorderStyling(Colors::Cyans::Cyan, 1);
auto* button_list = new JUI::VerticalListLayout(button_group);
button_list->SetPaddingBottom(5_px);
button_list->PaddingBottom(5_px);
auto* sp_btn = create_mainmenu_btn("Singleplayer", button_list);
auto* mp_btn = create_mainmenu_btn("Multiplayer", button_list);

View File

@@ -41,8 +41,6 @@ float z = 0;
namespace CaveGame::ClientApp
{
class CaveGameWindow : public ReWindow::RWindow
{
public:
@@ -89,7 +87,7 @@ namespace CaveGame::ClientApp
{
auto* item = new JUI::TextRect(parent);
item->SetFont(Jupiteroid);
item->SetSize({0,4+size,1.f,0.f});
item->Size({0,4+size,1.f,0.f});
item->SetTextSize(size);
item->SetContent(content);
item->AlignCenterHorizontally();
@@ -105,13 +103,13 @@ namespace CaveGame::ClientApp
credits_window = new JUI::Window(wm);
credits_window->SetTitleFont(Jupiteroid);
credits_window->SetTitle("Credits");
credits_window->SetSize({400, 400, 0, 0});
credits_window->Size({400, 400, 0, 0});
//credits_window->SetVisible(false);
//credits_window->SetDrag(true);
auto* listing = new JUI::VerticalListLayout(credits_window->GetViewportInstance());
listing->SetMarginBottom(4_px);
listing->MarginBottom(4_px);
line_item("CaveGame", 40, listing);
line_item("A Redacted Software Product", 16, listing);
@@ -139,7 +137,7 @@ namespace CaveGame::ClientApp
settings_window = new JUI::Window(wm);
settings_window->SetTitleFont(Jupiteroid);
settings_window->SetTitle("Settings");
settings_window->SetVisible(false);
settings_window->Visible(false);
}