AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Submodule updates

This commit is contained in:
Jack Andersen 2015-11-25 14:25:17 -10:00
parent 6c78f91fa7
commit f34d777e30
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Editor/main.cpp
View File

@ -11,9 +11,9 @@ struct Application : boo::IApplicationCallback
{ {
HECL::Runtime::FileStoreManager m_fileMgr; HECL::Runtime::FileStoreManager m_fileMgr;
Specter::FontCache m_fontCache; Specter::FontCache m_fontCache;
Specter::RootView m_rootView;
Retro::CVarManager m_cvarManager;
boo::IWindow* m_mainWindow; boo::IWindow* m_mainWindow;
Specter::ViewSystem m_viewSystem;
Retro::CVarManager m_cvarManager;
Zeus::CColor m_clearColor; Zeus::CColor m_clearColor;
bool m_running = true; bool m_running = true;
@ -27,13 +27,11 @@ struct Application : boo::IApplicationCallback
Application() : Application() :
m_fileMgr(_S("rude")), m_fileMgr(_S("rude")),
m_fontCache(m_fileMgr), m_fontCache(m_fileMgr),
m_rootView(m_fontCache),
m_cvarManager(m_fileMgr){} m_cvarManager(m_fileMgr){}
int appMain(boo::IApplication* app) int appMain(boo::IApplication* app)
{ {
m_mainWindow = app->newWindow(_S("RUDE")); m_mainWindow = app->newWindow(_S("RUDE"));
m_rootView.setWindow(m_mainWindow, 1.0f);
m_cvarManager.serialize(); m_cvarManager.serialize();
Retro::CVar* tmp = m_cvarManager.findCVar("r_clearcolor"); Retro::CVar* tmp = m_cvarManager.findCVar("r_clearcolor");
Retro::CVar::ListenerFunc listen = std::bind(&Application::onCVarModified, this, std::placeholders::_1); Retro::CVar::ListenerFunc listen = std::bind(&Application::onCVarModified, this, std::placeholders::_1);
@ -41,9 +39,15 @@ struct Application : boo::IApplicationCallback
tmp->addListener(listen); tmp->addListener(listen);
boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory(); boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory();
m_fontCache.prepMainFont(gf, false, 10.0, 72); m_viewSystem.init(gf, &m_fontCache);
Specter::FontTag mainFont = m_fontCache.prepMainFont(gf, false, 10.0, 72);
m_fontCache.closeBuiltinFonts(); m_fontCache.closeBuiltinFonts();
Specter::RootView rootView(m_viewSystem, m_mainWindow);
Specter::TextView textView(m_viewSystem, mainFont);
textView.typesetGlyphs("Hello, World!");
while (m_running) while (m_running)
{ {
m_cvarManager.update(); m_cvarManager.update();

2
hecl

@ -1 +1 @@
Subproject commit e6b2da35bd713ce87cff07a1ddc16364e9fc3d6b Subproject commit e40b5138ead775b5583bf68cd0b14f5161714c78

2
libSpecter

@ -1 +1 @@
Subproject commit 5439312ef6ed189206080b7282fc91dcdaa2a1d8 Subproject commit 304290728738be2aa7eb81b0e47b066cdcd2f5e6