AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 17:04:55 +00:00
Code Issues Projects Releases Wiki Activity

Submoduel updates

Browse Source
This commit is contained in:
Jack Andersen
2015-11-25 21:38:56 -10:00
parent 67c2882dd2
commit f05227a5b0
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Editor/main.cpp
View File

@@ -17,7 +17,6 @@ struct Application : boo::IApplicationCallback
Zeus::CColor m_clearColor; Zeus::CColor m_clearColor;
bool m_running = true; bool m_running = true;
void onCVarModified(Retro::CVar* cvar) void onCVarModified(Retro::CVar* cvar)
{ {
if (cvar == m_cvarManager.findCVar("r_clearColor")) if (cvar == m_cvarManager.findCVar("r_clearColor"))
@@ -27,7 +26,7 @@ struct Application : boo::IApplicationCallback
Application() : Application() :
m_fileMgr(_S("rude")), m_fileMgr(_S("rude")),
m_fontCache(m_fileMgr), m_fontCache(m_fileMgr),
m_cvarManager(m_fileMgr){} m_cvarManager(m_fileMgr) {}
int appMain(boo::IApplication* app) int appMain(boo::IApplication* app)
{ {
@@ -40,21 +39,18 @@ struct Application : boo::IApplicationCallback
boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory(); boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory();
m_viewSystem.init(gf, &m_fontCache); m_viewSystem.init(gf, &m_fontCache);
Specter::FontTag mainFont = m_fontCache.prepMainFont(gf, false, 10.0, 72);
m_fontCache.closeBuiltinFonts();
Specter::RootView rootView(m_viewSystem, m_mainWindow); Specter::RootView rootView(m_viewSystem, m_mainWindow);
Specter::TextView textView(m_viewSystem, mainFont); boo::IGraphicsCommandQueue* gfxQ = m_mainWindow->getCommandQueue();
textView.typesetGlyphs("Hello, World!");
while (m_running) while (m_running)
{ {
m_cvarManager.update(); m_cvarManager.update();
m_mainWindow->waitForRetrace(); m_mainWindow->waitForRetrace();
rootView.draw(gfxQ);
gfxQ->flushBufferUpdates();
gfxQ->execute();
} }
return 0; return 0;
} }
void appQuitting(boo::IApplication*) void appQuitting(boo::IApplication*)

2
NODLib

Submodule NODLib updated: d94e89990f...2f1199d520

2
Runtime/CGameAllocator.cpp
View File

@@ -55,7 +55,7 @@ void CGameAllocator::Shutdown()
} }
void* CGameAllocator::Alloc(size_t sz, EHint, EScope, EType, const CCallStack&) void* CGameAllocator::Alloc(size_t sz, EHint, EScope, EType, const CCallStack&)
{ {
AllocLog.report(LogVisor::Warning, _S("Remind Phil to reimplement Alloc!!!!")); //AllocLog.report(LogVisor::Warning, _S("Remind Phil to reimplement Alloc!!!!"));
return malloc(sz); return malloc(sz);
} }
void CGameAllocator::Free(void* ptr) void CGameAllocator::Free(void* ptr)

2
hecl

Submodule hecl updated: e40b5138ea...c74e7d1fd8

2
libSpecter

Submodule libSpecter updated: 71fba378f0...822b16e3ce