@@ -27,10 +27,10 @@ MenuState :: MenuState(
27
27
m_pResources(engine->resources ()),
28
28
m_pRoot(make_shared<Node>()),
29
29
m_pCanvas(make_shared<Canvas>(
30
- m_pQor ->window ()->size().x, m_pQor ->window()->size().y
30
+ engine ->window ()->size().x, engine ->window()->size().y
31
31
)),
32
32
m_pMenuGUI(make_shared<MenuGUI>(
33
- m_pQor ->session ()->profile(0 )->controller().get(),
33
+ engine ->session ()->profile(0 )->controller().get(),
34
34
&m_MenuContext,
35
35
&m_MainMenu,
36
36
m_pPipeline->partitioner(),
@@ -51,7 +51,7 @@ void MenuState :: preload()
51
51
m_pCamera->listen (true );
52
52
53
53
// try{
54
- // m_pScene = m_pResources->cache_as <Scene>("menu.json");
54
+ // m_pScene = m_pResources->cache_cast <Scene>("menu.json");
55
55
// }catch(const std::exception& e){
56
56
// ERRORf(GENERAL, "scene problem: %s", e.what());
57
57
// }
@@ -69,7 +69,7 @@ void MenuState :: preload()
69
69
logo->add_modifier (make_shared<Wrap>(Prefab::quad_wrap (
70
70
glm::vec2 (0 .0f , 1 .0f ), glm::vec2 (1 .0f , 0 .0f )
71
71
)));
72
- auto tex = m_pResources->cache_as <ITexture>(" qorpse.png" );
72
+ auto tex = m_pResources->cache_cast <ITexture>(" qorpse.png" );
73
73
logo->material (make_shared<MeshMaterial>(tex));
74
74
logo->move (vec3 (
75
75
win->center ().x ,
@@ -169,13 +169,13 @@ void MenuState :: enter()
169
169
// m_MainMenu.name("Qorpse");
170
170
m_MainMenu.options ().emplace_back (" New Game" , [this ]{
171
171
m_pDone = make_shared<std::function<void ()>>([this ]{
172
- m_pQor->change_state (m_pQor-> states (). class_id ( " game" ) );
172
+ m_pQor->change_state (" game" );
173
173
});
174
174
m_pMenuGUI->pause ();
175
175
});
176
176
m_MainMenu.options ().emplace_back (" Continue" , [this ]{
177
177
m_pDone = make_shared<std::function<void ()>>([this ]{
178
- m_pQor->change_state (m_pQor-> states (). class_id ( " game" ) );
178
+ m_pQor->change_state (" game" );
179
179
});
180
180
m_pMenuGUI->pause ();
181
181
});
0 commit comments