mirror of https://github.com/AxioDL/metaforce.git
Update submodules
This commit is contained in:
parent
df9111f52c
commit
05135198fd
|
@ -168,7 +168,18 @@ void SplashScreen::touchMove(const boo::STouchCoord& coord, uintptr_t tid)
|
||||||
|
|
||||||
void SplashScreen::charKeyDown(unsigned long charCode, boo::EModifierKey mods, bool isRepeat)
|
void SplashScreen::charKeyDown(unsigned long charCode, boo::EModifierKey mods, bool isRepeat)
|
||||||
{
|
{
|
||||||
skipBuildInAnimation();
|
if (skipBuildInAnimation())
|
||||||
|
return;
|
||||||
|
if (m_fileBrowser.m_view)
|
||||||
|
m_fileBrowser.m_view->charKeyDown(charCode, mods, isRepeat);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SplashScreen::specialKeyDown(boo::ESpecialKey key, boo::EModifierKey mods, bool isRepeat)
|
||||||
|
{
|
||||||
|
if (skipBuildInAnimation())
|
||||||
|
return;
|
||||||
|
if (m_fileBrowser.m_view)
|
||||||
|
m_fileBrowser.m_view->specialKeyDown(key, mods, isRepeat);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SplashScreen::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
void SplashScreen::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
|
|
||||||
namespace RUDE
|
namespace RUDE
|
||||||
{
|
{
|
||||||
|
static LogVisor::LogModule Log("Specter::SplashScreen");
|
||||||
|
|
||||||
class SplashScreen : public Specter::ModalWindow
|
class SplashScreen : public Specter::ModalWindow
|
||||||
{
|
{
|
||||||
ViewManager& m_vm;
|
ViewManager& m_vm;
|
||||||
|
@ -40,7 +42,11 @@ class SplashScreen : public Specter::ModalWindow
|
||||||
m_splash.m_fileBrowser.m_view.reset(
|
m_splash.m_fileBrowser.m_view.reset(
|
||||||
new Specter::FileBrowser(m_splash.rootView().viewRes(),
|
new Specter::FileBrowser(m_splash.rootView().viewRes(),
|
||||||
m_splash, m_splash.m_newString,
|
m_splash, m_splash.m_newString,
|
||||||
Specter::FileBrowser::Type::SaveFile));
|
Specter::FileBrowser::Type::SaveFile,
|
||||||
|
[](bool, const HECL::SystemString& path)
|
||||||
|
{
|
||||||
|
Log.report(LogVisor::Info, _S("Making project '%s'"), path.c_str());
|
||||||
|
}));
|
||||||
m_splash.updateSize();
|
m_splash.updateSize();
|
||||||
m_splash.m_newButt.mouseLeave(coord);
|
m_splash.m_newButt.mouseLeave(coord);
|
||||||
}
|
}
|
||||||
|
@ -57,7 +63,11 @@ class SplashScreen : public Specter::ModalWindow
|
||||||
m_splash.m_fileBrowser.m_view.reset(
|
m_splash.m_fileBrowser.m_view.reset(
|
||||||
new Specter::FileBrowser(m_splash.rootView().viewRes(),
|
new Specter::FileBrowser(m_splash.rootView().viewRes(),
|
||||||
m_splash, m_splash.m_openString,
|
m_splash, m_splash.m_openString,
|
||||||
Specter::FileBrowser::Type::OpenHECLProject));
|
Specter::FileBrowser::Type::OpenHECLProject,
|
||||||
|
[](bool, const HECL::SystemString& path)
|
||||||
|
{
|
||||||
|
Log.report(LogVisor::Info, _S("Opening project '%s'"), path.c_str());
|
||||||
|
}));
|
||||||
m_splash.updateSize();
|
m_splash.updateSize();
|
||||||
m_splash.m_openButt.mouseLeave(coord);
|
m_splash.m_openButt.mouseLeave(coord);
|
||||||
}
|
}
|
||||||
|
@ -74,7 +84,11 @@ class SplashScreen : public Specter::ModalWindow
|
||||||
m_splash.m_fileBrowser.m_view.reset(
|
m_splash.m_fileBrowser.m_view.reset(
|
||||||
new Specter::FileBrowser(m_splash.rootView().viewRes(),
|
new Specter::FileBrowser(m_splash.rootView().viewRes(),
|
||||||
m_splash, m_splash.m_extractString,
|
m_splash, m_splash.m_extractString,
|
||||||
Specter::FileBrowser::Type::OpenFile));
|
Specter::FileBrowser::Type::OpenFile,
|
||||||
|
[](bool, const HECL::SystemString& path)
|
||||||
|
{
|
||||||
|
Log.report(LogVisor::Info, _S("Extracting game '%s'"), path.c_str());
|
||||||
|
}));
|
||||||
m_splash.updateSize();
|
m_splash.updateSize();
|
||||||
m_splash.m_extractButt.mouseLeave(coord);
|
m_splash.m_extractButt.mouseLeave(coord);
|
||||||
}
|
}
|
||||||
|
@ -95,6 +109,7 @@ public:
|
||||||
void touchUp(const boo::STouchCoord&, uintptr_t);
|
void touchUp(const boo::STouchCoord&, uintptr_t);
|
||||||
void touchMove(const boo::STouchCoord&, uintptr_t);
|
void touchMove(const boo::STouchCoord&, uintptr_t);
|
||||||
void charKeyDown(unsigned long, boo::EModifierKey, bool);
|
void charKeyDown(unsigned long, boo::EModifierKey, bool);
|
||||||
|
void specialKeyDown(boo::ESpecialKey, boo::EModifierKey, bool);
|
||||||
|
|
||||||
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
|
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
|
||||||
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
||||||
|
|
|
@ -43,7 +43,8 @@ void ViewManager::SetupEditorView()
|
||||||
}
|
}
|
||||||
|
|
||||||
ViewManager::ViewManager(HECL::Runtime::FileStoreManager& fileMgr, HECL::CVarManager& cvarMgr)
|
ViewManager::ViewManager(HECL::Runtime::FileStoreManager& fileMgr, HECL::CVarManager& cvarMgr)
|
||||||
: m_cvarManager(cvarMgr), m_fontCache(fileMgr), m_translator(RUDE::SystemLocaleOrEnglish()),
|
: m_fileStoreManager(fileMgr), m_cvarManager(cvarMgr),
|
||||||
|
m_fontCache(fileMgr), m_translator(RUDE::SystemLocaleOrEnglish()),
|
||||||
m_setTo1(*this), m_setTo2(*this),
|
m_setTo1(*this), m_setTo2(*this),
|
||||||
m_split(*this),
|
m_split(*this),
|
||||||
m_space1(*this, "Hello, World!\n\n", "Hello Button", &m_setTo1),
|
m_space1(*this, "Hello, World!\n\n", "Hello Button", &m_setTo1),
|
||||||
|
@ -52,6 +53,16 @@ ViewManager::ViewManager(HECL::Runtime::FileStoreManager& fileMgr, HECL::CVarMan
|
||||||
|
|
||||||
ViewManager::~ViewManager() {}
|
ViewManager::~ViewManager() {}
|
||||||
|
|
||||||
|
void ViewManager::pushRecentProject(const HECL::SystemString& path)
|
||||||
|
{
|
||||||
|
m_recentProjects.push_back(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ViewManager::pushRecentFile(const HECL::SystemString& path)
|
||||||
|
{
|
||||||
|
m_recentFiles.push_back(path);
|
||||||
|
}
|
||||||
|
|
||||||
void ViewManager::init(boo::IApplication* app)
|
void ViewManager::init(boo::IApplication* app)
|
||||||
{
|
{
|
||||||
m_mainWindow = std::unique_ptr<boo::IWindow>(app->newWindow(_S("RUDE")));
|
m_mainWindow = std::unique_ptr<boo::IWindow>(app->newWindow(_S("RUDE")));
|
||||||
|
|
|
@ -11,6 +11,7 @@ class SplashScreen;
|
||||||
|
|
||||||
class ViewManager : public Specter::IViewManager
|
class ViewManager : public Specter::IViewManager
|
||||||
{
|
{
|
||||||
|
HECL::Runtime::FileStoreManager& m_fileStoreManager;
|
||||||
HECL::CVarManager& m_cvarManager;
|
HECL::CVarManager& m_cvarManager;
|
||||||
ProjectManager m_projManager;
|
ProjectManager m_projManager;
|
||||||
Specter::FontCache m_fontCache;
|
Specter::FontCache m_fontCache;
|
||||||
|
@ -22,6 +23,9 @@ class ViewManager : public Specter::IViewManager
|
||||||
|
|
||||||
HECL::CVar* m_cvPixelFactor;
|
HECL::CVar* m_cvPixelFactor;
|
||||||
|
|
||||||
|
std::vector<HECL::SystemString> m_recentProjects;
|
||||||
|
std::vector<HECL::SystemString> m_recentFiles;
|
||||||
|
|
||||||
bool m_updatePf = false;
|
bool m_updatePf = false;
|
||||||
float m_reqPf;
|
float m_reqPf;
|
||||||
|
|
||||||
|
@ -77,6 +81,12 @@ public:
|
||||||
ProjectManager& projectManager() {return m_projManager;}
|
ProjectManager& projectManager() {return m_projManager;}
|
||||||
const Specter::Translator* getTranslator() const {return &m_translator;}
|
const Specter::Translator* getTranslator() const {return &m_translator;}
|
||||||
|
|
||||||
|
const std::vector<HECL::SystemString>* recentProjects() const {return &m_recentProjects;}
|
||||||
|
void pushRecentProject(const HECL::SystemString& path);
|
||||||
|
|
||||||
|
const std::vector<HECL::SystemString>* recentFiles() const {return &m_recentFiles;}
|
||||||
|
void pushRecentFile(const HECL::SystemString& path);
|
||||||
|
|
||||||
void init(boo::IApplication* app);
|
void init(boo::IApplication* app);
|
||||||
bool proc();
|
bool proc();
|
||||||
void stop();
|
void stop();
|
||||||
|
|
2
hecl
2
hecl
|
@ -1 +1 @@
|
||||||
Subproject commit 6e7283d60737211a44bd87234b67a9d51801597e
|
Subproject commit ddb3e9c655ffc6528fee8ebb08b296b3d1cf9df3
|
|
@ -1 +1 @@
|
||||||
Subproject commit 190de88c239b5c2863b5b6fd34b98d417738b518
|
Subproject commit d53f0060f593e2a234e5ab84a2a32a27d4476a9d
|
Loading…
Reference in New Issue