Skip to content

Commit f48c558

Browse files
committed
removed menu stuff from basic test state
1 parent 15dc945 commit f48c558

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

Qor/BasicState.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ BasicState :: BasicState(Qor* engine):
1818
m_pInput(engine->input()),
1919
m_pRoot(make_shared<Node>()),
2020
m_pPipeline(engine->pipeline()),
21-
m_pResources(engine->resources()),
22-
m_pCanvas(make_shared<Canvas>(
23-
engine->window()->size().x, engine->window()->size().y
24-
)),
25-
m_pMenuGUI(make_shared<MenuGUI>(
26-
engine->session()->active_profile(0)->controller().get(),
27-
&m_MenuContext,
28-
&m_MainMenu,
29-
m_pPipeline->partitioner(),
30-
m_pCanvas.get(),
31-
m_pResources,
32-
"PRESS START 2P",
33-
engine->window()->size().y / 30.0f,
34-
nullptr,
35-
7,
36-
1.5f,
37-
Canvas::LEFT,
38-
32.0f,
39-
MenuGUI::F_BOX,
40-
engine->window()
41-
))
21+
m_pResources(engine->resources())
22+
//m_pCanvas(make_shared<Canvas>(
23+
// engine->window()->size().x, engine->window()->size().y
24+
//)),
25+
//m_pMenuGUI(make_shared<MenuGUI>(
26+
// engine->session()->active_profile(0)->controller().get(),
27+
// &m_MenuContext,
28+
// &m_MainMenu,
29+
// m_pPipeline->partitioner(),
30+
// m_pCanvas.get(),
31+
// m_pResources,
32+
// "PRESS START 2P",
33+
// engine->window()->size().y / 30.0f,
34+
// nullptr,
35+
// 7,
36+
// 1.5f,
37+
// Canvas::LEFT,
38+
// 32.0f,
39+
// MenuGUI::F_BOX,
40+
// engine->window()
41+
//))
4242
{}
4343

4444
void BasicState :: preload()
@@ -67,14 +67,14 @@ void BasicState :: enter()
6767
m_pCamera->ortho();
6868
m_pPipeline->winding(true);
6969

70-
m_MainMenu.options().emplace_back("OPTION 1", []{
71-
});
72-
m_MainMenu.options().emplace_back("OPTION 2", []{
73-
});
74-
m_MainMenu.options().emplace_back("OPTION 3", []{
75-
});
76-
m_MenuContext.clear(&m_MainMenu);
77-
m_pRoot->add(m_pMenuGUI);
70+
//m_MainMenu.options().emplace_back("OPTION 1", []{
71+
//});
72+
//m_MainMenu.options().emplace_back("OPTION 2", []{
73+
//});
74+
//m_MainMenu.options().emplace_back("OPTION 3", []{
75+
//});
76+
//m_MenuContext.clear(&m_MainMenu);
77+
//m_pRoot->add(m_pMenuGUI);
7878

7979
//LOG("enter");
8080
//m_pRoot->add(Mesh::line(

Qor/BasicState.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ class BasicState:
5050
//std::shared_ptr<Font> m_pFont;
5151
//std::shared_ptr<Text> m_pText;
5252

53-
std::shared_ptr<Canvas> m_pCanvas;
54-
MenuContext m_MenuContext;
55-
Menu m_MainMenu;
56-
std::shared_ptr<MenuGUI> m_pMenuGUI;
53+
//std::shared_ptr<Canvas> m_pCanvas;
54+
//MenuContext m_MenuContext;
55+
//Menu m_MainMenu;
56+
//std::shared_ptr<MenuGUI> m_pMenuGUI;
5757
};
5858

5959
#endif

0 commit comments

Comments
 (0)