add (very) basic main menu
This commit is contained in:
@@ -80,8 +80,7 @@ Display::Display(int a_Width, int a_Height, const std::string& a_Title) :
|
||||
utils::LOG(utils::Format(
|
||||
"GL Context : %i.%i %s, Color : R:%i G:%i B:%i A:%i, Depth bits : %i", major, minor, mask_desc, r, g, b, a, depth));
|
||||
|
||||
utils::LOG(utils::Format(
|
||||
"MultiSamples : Buffers : %i, Samples : %i", mBuffers, mSamples));
|
||||
utils::LOG(utils::Format("MultiSamples : Buffers : %i, Samples : %i", mBuffers, mSamples));
|
||||
|
||||
SDL_GL_MakeCurrent(m_Window, m_GLContext);
|
||||
|
||||
@@ -148,7 +147,7 @@ void Display::PollEvents() {
|
||||
}
|
||||
|
||||
case SDL_EVENT_KEY_DOWN: {
|
||||
if(!event.key.repeat)
|
||||
if (!event.key.repeat)
|
||||
OnKeyDown(event.key.key);
|
||||
break;
|
||||
}
|
||||
@@ -166,6 +165,9 @@ void Display::PollEvents() {
|
||||
|
||||
void Display::Update(float a_Delta) {
|
||||
StateMachine::Update(a_Delta);
|
||||
#ifndef NDEBUG
|
||||
ImGui::ShowDemoWindow();
|
||||
#endif
|
||||
ImGui::Render();
|
||||
ImGuiIO& io = ImGui::GetIO();
|
||||
glViewport(0, 0, (int)io.DisplaySize.x, (int)io.DisplaySize.y);
|
||||
|
||||
16
src/td/display/menu/CreatePartyMenu.cpp
Normal file
16
src/td/display/menu/CreatePartyMenu.cpp
Normal file
@@ -0,0 +1,16 @@
|
||||
#include <td/display/menu/CreatePartyMenu.h>
|
||||
|
||||
#include <imgui.h>
|
||||
|
||||
namespace td {
|
||||
|
||||
CreatePartyMenu::CreatePartyMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
|
||||
|
||||
CreatePartyMenu::~CreatePartyMenu() {}
|
||||
|
||||
void CreatePartyMenu::Update() {
|
||||
ImGui::Text("CreatePartyMenu");
|
||||
m_StateStack.RenderBackButton();
|
||||
}
|
||||
|
||||
} // namespace td
|
||||
16
src/td/display/menu/JoinPartyMenu.cpp
Normal file
16
src/td/display/menu/JoinPartyMenu.cpp
Normal file
@@ -0,0 +1,16 @@
|
||||
#include <td/display/menu/JoinPartyMenu.h>
|
||||
|
||||
#include <imgui.h>
|
||||
|
||||
namespace td {
|
||||
|
||||
JoinPartyMenu::JoinPartyMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
|
||||
|
||||
JoinPartyMenu::~JoinPartyMenu() {}
|
||||
|
||||
void JoinPartyMenu::Update() {
|
||||
ImGui::Text("JoinPartyMenu");
|
||||
m_StateStack.RenderBackButton();
|
||||
}
|
||||
|
||||
} // namespace td
|
||||
28
src/td/display/menu/MainMenu.cpp
Normal file
28
src/td/display/menu/MainMenu.cpp
Normal file
@@ -0,0 +1,28 @@
|
||||
#include <td/display/menu/MainMenu.h>
|
||||
|
||||
#include <imgui.h>
|
||||
#include <td/display/menu/CreatePartyMenu.h>
|
||||
#include <td/display/menu/JoinPartyMenu.h>
|
||||
#include <td/display/menu/SettingsMenu.h>
|
||||
#include <td/display/state/DebugWorldState.h>
|
||||
|
||||
namespace td {
|
||||
|
||||
MainMenu::MainMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
|
||||
|
||||
MainMenu::~MainMenu() {}
|
||||
|
||||
void MainMenu::Update() {
|
||||
if (ImGui::Button("Create Party"))
|
||||
m_StateStack.PushState<CreatePartyMenu>();
|
||||
if (ImGui::Button("Join Party"))
|
||||
m_StateStack.PushState<JoinPartyMenu>();
|
||||
if (ImGui::Button("Settings"))
|
||||
m_StateStack.PushState<SettingsMenu>();
|
||||
#ifndef NDEBUG
|
||||
if (ImGui::Button("Debug world"))
|
||||
m_StateStack.ChangeState<DebugWorldState>();
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace td
|
||||
16
src/td/display/menu/SettingsMenu.cpp
Normal file
16
src/td/display/menu/SettingsMenu.cpp
Normal file
@@ -0,0 +1,16 @@
|
||||
#include <td/display/menu/SettingsMenu.h>
|
||||
|
||||
#include <imgui.h>
|
||||
|
||||
namespace td {
|
||||
|
||||
SettingsMenu::SettingsMenu(MainMenuState& a_MainMenu) : MainMenuState::Menu(a_MainMenu) {}
|
||||
|
||||
SettingsMenu::~SettingsMenu() {}
|
||||
|
||||
void SettingsMenu::Update() {
|
||||
ImGui::Text("SettingsMenu");
|
||||
m_StateStack.RenderBackButton();
|
||||
}
|
||||
|
||||
} // namespace td
|
||||
@@ -1,18 +1,31 @@
|
||||
#include <td/display/state/MainMenuState.h>
|
||||
|
||||
#include <td/display/state/DebugWorldState.h>
|
||||
#include <imgui.h>
|
||||
#include <td/display/menu/MainMenu.h>
|
||||
#include <td/display/state/DebugWorldState.h>
|
||||
|
||||
namespace td {
|
||||
|
||||
MainMenuState::MainMenuState(Display& a_Display) : DisplayState(a_Display) {}
|
||||
MainMenuState::MainMenuState(Display& a_Display) : DisplayState(a_Display) {
|
||||
PushState<MainMenu>();
|
||||
}
|
||||
|
||||
MainMenuState::~MainMenuState() {}
|
||||
|
||||
void MainMenuState::Update(float a_Delta) {
|
||||
ImGui::Begin("MainWindow");
|
||||
if(ImGui::Button("Start debug world"))
|
||||
m_StateMachine.ChangeState<DebugWorldState>();
|
||||
MainMenuStateStack::Update();
|
||||
ImGui::End();
|
||||
}
|
||||
|
||||
void MainMenuState::RenderBackButton() {
|
||||
if (ImGui::Button("Back"))
|
||||
PopState();
|
||||
}
|
||||
|
||||
void MainMenuState::OnKeyDown(SDL_Keycode a_Key) {
|
||||
if (a_Key == SDLK_ESCAPE)
|
||||
PopState();
|
||||
}
|
||||
|
||||
} // namespace td
|
||||
|
||||
@@ -16,7 +16,6 @@ WorldRenderer::~WorldRenderer() {}
|
||||
void WorldRenderer::Render(float a_Lerp) {
|
||||
m_Shader->Start();
|
||||
Renderer::Render(*m_WorldVao);
|
||||
ImGui::ShowDemoWindow();
|
||||
}
|
||||
|
||||
} // namespace render
|
||||
|
||||
Reference in New Issue
Block a user