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

Editor updates

This commit is contained in:
Jack Andersen 2015-11-21 18:35:24 -10:00
parent fd8f72c5f0
commit b4c802d598
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -34,7 +34,7 @@ set(HECL_DATASPEC_PUSHES
HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP3);") HECL::Database::DATA_SPEC_REGISTRY.push_back(&Retro::SpecEntMP3);")
add_subdirectory(hecl) add_subdirectory(hecl)
add_subdirectory(libSpecter) add_subdirectory(libSpecter)
set(SPECTER_INCLUDE_DIR libSpecter/include) set(SPECTER_INCLUDE_DIR libSpecter/include libSpecter/freetype2/include)
add_subdirectory(NODLib) add_subdirectory(NODLib)
set(NODLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/NODLib/include) set(NODLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/NODLib/include)
add_definitions(-DZE_ATHENA_TYPES=1) add_definitions(-DZE_ATHENA_TYPES=1)

4
Editor/CMakeLists.txt
View File

@ -6,8 +6,8 @@ target_link_libraries(rude
RuntimeCommonInput RuntimeCommonInput
RuntimeCommon RuntimeCommon
DNAMP3 DNAMP2 DNAMP1 DNAMP3 DNAMP2 DNAMP1
DNACommon Specter DNACommon Specter SpecterFonts freetype
HECLDatabase HECLBlender HECLCommon AthenaCore NOD HECLDatabase HECLBlender HECLRuntime HECLCommon AthenaCore NOD
LogVisor AthenaLibYaml Boo ${PNG_LIB} squish xxhash Math LogVisor AthenaLibYaml Boo ${PNG_LIB} squish xxhash Math
${ZLIB_LIBRARIES} ${LZO_LIB} ${ZLIB_LIBRARIES} ${LZO_LIB}
${BOO_SYS_LIBS}) ${BOO_SYS_LIBS})

18
Editor/main.cpp
View File

@ -7,19 +7,37 @@ namespace RUDE
struct Application : boo::IApplicationCallback struct Application : boo::IApplicationCallback
{ {
HECL::Runtime::FileStoreManager m_fileMgr;
Specter::FontCache m_fontCache;
Specter::RootView m_rootView;
boo::IWindow* m_mainWindow; boo::IWindow* m_mainWindow;
bool m_running = true;
Application() : m_fileMgr(_S("rude")), m_fontCache(m_fileMgr), m_rootView(m_fontCache) {}
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);
while (m_running)
{
m_mainWindow->waitForRetrace();
}
return 0; return 0;
} }
void appQuitting(boo::IApplication*) void appQuitting(boo::IApplication*)
{ {
m_running = false;
} }
void appFilesOpen(boo::IApplication*, const std::vector<boo::SystemString>&) void appFilesOpen(boo::IApplication*, const std::vector<boo::SystemString>&)
{ {
} }
}; };
} }

2
libSpecter

@ -1 +1 @@
Subproject commit 9e975559867abef7aa4493999556aab176ae4d97 Subproject commit 13cfdc3db218d529adfa9476bf96a4817f4f32f3