mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 18:24:55 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
369
Editor/main.cpp
369
Editor/main.cpp
@@ -9,192 +9,160 @@
|
||||
#include "hecl/Console.hpp"
|
||||
|
||||
static logvisor::Module AthenaLog("Athena");
|
||||
static void AthenaExc(athena::error::Level level, const char* file,
|
||||
const char*, int line, const char* fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
AthenaLog.report(logvisor::Level(level), fmt, ap);
|
||||
va_end(ap);
|
||||
static void AthenaExc(athena::error::Level level, const char* file, const char*, int line, const char* fmt, ...) {
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
AthenaLog.report(logvisor::Level(level), fmt, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
static logvisor::Module Log{"URDE"};
|
||||
|
||||
static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf)
|
||||
{
|
||||
hecl::SystemString features;
|
||||
auto AddFeature = [&features](const hecl::SystemChar* str)
|
||||
{
|
||||
if (!features.empty())
|
||||
features += _SYS_STR(", ");
|
||||
features += str;
|
||||
};
|
||||
if (cpuInf.AESNI)
|
||||
AddFeature(_SYS_STR("AES-NI"));
|
||||
if (cpuInf.SSE1)
|
||||
AddFeature(_SYS_STR("SSE"));
|
||||
if (cpuInf.SSE2)
|
||||
AddFeature(_SYS_STR("SSE2"));
|
||||
if (cpuInf.SSE3)
|
||||
AddFeature(_SYS_STR("SSE3"));
|
||||
if (cpuInf.SSSE3)
|
||||
AddFeature(_SYS_STR("SSSE3"));
|
||||
if (cpuInf.SSE4a)
|
||||
AddFeature(_SYS_STR("SSE4a"));
|
||||
if (cpuInf.SSE41)
|
||||
AddFeature(_SYS_STR("SSE4.1"));
|
||||
if (cpuInf.SSE42)
|
||||
AddFeature(_SYS_STR("SSE4.2"));
|
||||
if (cpuInf.AVX)
|
||||
AddFeature(_SYS_STR("AVX"));
|
||||
if (cpuInf.AVX2)
|
||||
AddFeature(_SYS_STR("AVX2"));
|
||||
return features;
|
||||
static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) {
|
||||
hecl::SystemString features;
|
||||
auto AddFeature = [&features](const hecl::SystemChar* str) {
|
||||
if (!features.empty())
|
||||
features += _SYS_STR(", ");
|
||||
features += str;
|
||||
};
|
||||
if (cpuInf.AESNI)
|
||||
AddFeature(_SYS_STR("AES-NI"));
|
||||
if (cpuInf.SSE1)
|
||||
AddFeature(_SYS_STR("SSE"));
|
||||
if (cpuInf.SSE2)
|
||||
AddFeature(_SYS_STR("SSE2"));
|
||||
if (cpuInf.SSE3)
|
||||
AddFeature(_SYS_STR("SSE3"));
|
||||
if (cpuInf.SSSE3)
|
||||
AddFeature(_SYS_STR("SSSE3"));
|
||||
if (cpuInf.SSE4a)
|
||||
AddFeature(_SYS_STR("SSE4a"));
|
||||
if (cpuInf.SSE41)
|
||||
AddFeature(_SYS_STR("SSE4.1"));
|
||||
if (cpuInf.SSE42)
|
||||
AddFeature(_SYS_STR("SSE4.2"));
|
||||
if (cpuInf.AVX)
|
||||
AddFeature(_SYS_STR("AVX"));
|
||||
if (cpuInf.AVX2)
|
||||
AddFeature(_SYS_STR("AVX2"));
|
||||
return features;
|
||||
}
|
||||
|
||||
struct Application : boo::IApplicationCallback
|
||||
{
|
||||
hecl::Runtime::FileStoreManager m_fileMgr;
|
||||
hecl::CVarManager m_cvarManager;
|
||||
hecl::CVarCommons m_cvarCommons;
|
||||
std::unique_ptr<ViewManager> m_viewManager;
|
||||
struct Application : boo::IApplicationCallback {
|
||||
hecl::Runtime::FileStoreManager m_fileMgr;
|
||||
hecl::CVarManager m_cvarManager;
|
||||
hecl::CVarCommons m_cvarCommons;
|
||||
std::unique_ptr<ViewManager> m_viewManager;
|
||||
|
||||
std::atomic_bool m_running = {true};
|
||||
std::atomic_bool m_running = {true};
|
||||
|
||||
Application() :
|
||||
m_fileMgr(_SYS_STR("urde")),
|
||||
m_cvarManager(m_fileMgr),
|
||||
m_cvarCommons(m_cvarManager)
|
||||
{
|
||||
m_viewManager = std::make_unique<ViewManager>(m_fileMgr, m_cvarManager);
|
||||
Application() : m_fileMgr(_SYS_STR("urde")), m_cvarManager(m_fileMgr), m_cvarCommons(m_cvarManager) {
|
||||
m_viewManager = std::make_unique<ViewManager>(m_fileMgr, m_cvarManager);
|
||||
}
|
||||
|
||||
virtual ~Application() = default;
|
||||
|
||||
int appMain(boo::IApplication* app) {
|
||||
initialize(app);
|
||||
m_viewManager->init(app);
|
||||
while (m_running.load()) {
|
||||
if (!m_viewManager->proc())
|
||||
break;
|
||||
}
|
||||
m_viewManager->stop();
|
||||
m_viewManager->projectManager().saveProject();
|
||||
m_cvarManager.serialize();
|
||||
m_viewManager.reset();
|
||||
return 0;
|
||||
}
|
||||
void appQuitting(boo::IApplication*) { m_running.store(false); }
|
||||
void appFilesOpen(boo::IApplication*, const std::vector<boo::SystemString>& paths) {
|
||||
for (const auto& path : paths) {
|
||||
hecl::ProjectRootPath projPath = hecl::SearchForProject(path);
|
||||
if (projPath) {
|
||||
m_viewManager->deferOpenProject(path);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void initialize(boo::IApplication* app) {
|
||||
zeus::detectCPU();
|
||||
createGlobalCVars();
|
||||
for (const boo::SystemString& arg : app->getArgs()) {
|
||||
if (arg.find(_SYS_STR("--verbosity=")) == 0 || arg.find(_SYS_STR("-v=")) == 0) {
|
||||
hecl::SystemUTF8Conv utf8Arg(arg.substr(arg.find_last_of('=') + 1));
|
||||
hecl::VerbosityLevel = atoi(utf8Arg.c_str());
|
||||
hecl::LogModule.report(logvisor::Info, "Set verbosity level to %i", hecl::VerbosityLevel);
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~Application() = default;
|
||||
m_cvarManager.parseCommandLine(app->getArgs());
|
||||
|
||||
int appMain(boo::IApplication* app)
|
||||
{
|
||||
initialize(app);
|
||||
m_viewManager->init(app);
|
||||
while (m_running.load())
|
||||
{
|
||||
if (!m_viewManager->proc())
|
||||
break;
|
||||
}
|
||||
m_viewManager->stop();
|
||||
m_viewManager->projectManager().saveProject();
|
||||
m_cvarManager.serialize();
|
||||
m_viewManager.reset();
|
||||
return 0;
|
||||
}
|
||||
void appQuitting(boo::IApplication*)
|
||||
{
|
||||
m_running.store(false);
|
||||
}
|
||||
void appFilesOpen(boo::IApplication*, const std::vector<boo::SystemString>& paths)
|
||||
{
|
||||
for (const auto& path : paths)
|
||||
{
|
||||
hecl::ProjectRootPath projPath = hecl::SearchForProject(path);
|
||||
if (projPath)
|
||||
{
|
||||
m_viewManager->deferOpenProject(path);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
const zeus::CPUInfo& cpuInf = zeus::cpuFeatures();
|
||||
Log.report(logvisor::Info, "CPU Name: %s", cpuInf.cpuBrand);
|
||||
Log.report(logvisor::Info, "CPU Vendor: %s", cpuInf.cpuVendor);
|
||||
Log.report(logvisor::Info, _SYS_STR("CPU Features: %s"), CPUFeatureString(cpuInf).c_str());
|
||||
}
|
||||
|
||||
void initialize(boo::IApplication* app)
|
||||
{
|
||||
zeus::detectCPU();
|
||||
createGlobalCVars();
|
||||
for (const boo::SystemString& arg : app->getArgs())
|
||||
{
|
||||
if (arg.find(_SYS_STR("--verbosity=")) == 0 || arg.find(_SYS_STR("-v=")) == 0)
|
||||
{
|
||||
hecl::SystemUTF8Conv utf8Arg(arg.substr(arg.find_last_of('=') + 1));
|
||||
hecl::VerbosityLevel = atoi(utf8Arg.c_str());
|
||||
hecl::LogModule.report(logvisor::Info, "Set verbosity level to %i", hecl::VerbosityLevel);
|
||||
}
|
||||
}
|
||||
std::string getGraphicsApi() const { return m_cvarCommons.getGraphicsApi(); }
|
||||
|
||||
m_cvarManager.parseCommandLine(app->getArgs());
|
||||
uint32_t getSamples() const { return m_cvarCommons.getSamples(); }
|
||||
|
||||
const zeus::CPUInfo& cpuInf = zeus::cpuFeatures();
|
||||
Log.report(logvisor::Info, "CPU Name: %s", cpuInf.cpuBrand);
|
||||
Log.report(logvisor::Info, "CPU Vendor: %s", cpuInf.cpuVendor);
|
||||
Log.report(logvisor::Info, _SYS_STR("CPU Features: %s"), CPUFeatureString(cpuInf).c_str());
|
||||
}
|
||||
uint32_t getAnisotropy() const { return m_cvarCommons.getAnisotropy(); }
|
||||
|
||||
std::string getGraphicsApi() const
|
||||
{
|
||||
return m_cvarCommons.getGraphicsApi();
|
||||
}
|
||||
bool getDeepColor() const { return m_cvarCommons.getDeepColor(); }
|
||||
|
||||
uint32_t getSamples() const
|
||||
{
|
||||
return m_cvarCommons.getSamples();
|
||||
}
|
||||
|
||||
uint32_t getAnisotropy() const
|
||||
{
|
||||
return m_cvarCommons.getAnisotropy();
|
||||
}
|
||||
|
||||
bool getDeepColor() const
|
||||
{
|
||||
return m_cvarCommons.getDeepColor();
|
||||
}
|
||||
|
||||
void createGlobalCVars()
|
||||
{
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.playerInfo"sv, "Displays information about the player, such as location and orientation"sv, false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.worldInfo"sv, "Displays information about the current world, such as world asset ID, and areaId"sv, false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.areaInfo"sv, "Displays information about the current area, such as asset ID, object/layer counts, and active layer bits"sv, false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.showFrameCounter"sv, "Displays the current frame index"sv, false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
}
|
||||
void createGlobalCVars() {
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.playerInfo"sv,
|
||||
"Displays information about the player, such as location and orientation"sv, false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.worldInfo"sv,
|
||||
"Displays information about the current world, such as world asset ID, and areaId"sv,
|
||||
false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
m_cvarManager.findOrMakeCVar(
|
||||
"debugOverlay.areaInfo"sv,
|
||||
"Displays information about the current area, such as asset ID, object/layer counts, and active layer bits"sv,
|
||||
false, hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
m_cvarManager.findOrMakeCVar("debugOverlay.showFrameCounter"sv, "Displays the current frame index"sv, false,
|
||||
hecl::CVar::EFlags::Game | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::ReadOnly);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace urde
|
||||
|
||||
static hecl::SystemChar CwdBuf[1024];
|
||||
hecl::SystemString ExeDir;
|
||||
|
||||
static void SetupBasics(bool logging)
|
||||
{
|
||||
auto result = zeus::validateCPU();
|
||||
if (!result.first)
|
||||
{
|
||||
static void SetupBasics(bool logging) {
|
||||
auto result = zeus::validateCPU();
|
||||
if (!result.first) {
|
||||
#if _WIN32 && !WINDOWS_STORE
|
||||
char* msg;
|
||||
asprintf(&msg, "ERROR: This build of URDE requires the following CPU features:\n%s\n",
|
||||
urde::CPUFeatureString(result.second).c_str());
|
||||
MessageBoxA(nullptr, msg, "CPU error", MB_OK | MB_ICONERROR);
|
||||
free(msg);
|
||||
char* msg;
|
||||
asprintf(&msg, "ERROR: This build of URDE requires the following CPU features:\n%s\n",
|
||||
urde::CPUFeatureString(result.second).c_str());
|
||||
MessageBoxA(nullptr, msg, "CPU error", MB_OK | MB_ICONERROR);
|
||||
free(msg);
|
||||
#else
|
||||
fprintf(stderr, "ERROR: This build of URDE requires the following CPU features:\n%s\n",
|
||||
urde::CPUFeatureString(result.second).c_str());
|
||||
fprintf(stderr, "ERROR: This build of URDE requires the following CPU features:\n%s\n",
|
||||
urde::CPUFeatureString(result.second).c_str());
|
||||
#endif
|
||||
exit(1);
|
||||
}
|
||||
exit(1);
|
||||
}
|
||||
|
||||
logvisor::RegisterStandardExceptions();
|
||||
if (logging)
|
||||
logvisor::RegisterConsoleLogger();
|
||||
atSetExceptionHandler(AthenaExc);
|
||||
logvisor::RegisterStandardExceptions();
|
||||
if (logging)
|
||||
logvisor::RegisterConsoleLogger();
|
||||
atSetExceptionHandler(AthenaExc);
|
||||
}
|
||||
|
||||
static bool IsClientLoggingEnabled(int argc, const boo::SystemChar** argv)
|
||||
{
|
||||
for (int i = 1; i < argc; ++i)
|
||||
if (!hecl::StrNCmp(argv[i], _SYS_STR("-l"), 2))
|
||||
return true;
|
||||
return false;
|
||||
static bool IsClientLoggingEnabled(int argc, const boo::SystemChar** argv) {
|
||||
for (int i = 1; i < argc; ++i)
|
||||
if (!hecl::StrNCmp(argv[i], _SYS_STR("-l"), 2))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
#if !WINDOWS_STORE
|
||||
@@ -204,30 +172,28 @@ int wmain(int argc, const boo::SystemChar** argv)
|
||||
int main(int argc, const boo::SystemChar** argv)
|
||||
#endif
|
||||
{
|
||||
if (argc > 1 && !hecl::StrCmp(argv[1], _SYS_STR("--dlpackage")))
|
||||
{
|
||||
printf("%s\n", URDE_DLPACKAGE);
|
||||
return 100;
|
||||
}
|
||||
if (argc > 1 && !hecl::StrCmp(argv[1], _SYS_STR("--dlpackage"))) {
|
||||
printf("%s\n", URDE_DLPACKAGE);
|
||||
return 100;
|
||||
}
|
||||
|
||||
SetupBasics(IsClientLoggingEnabled(argc, argv));
|
||||
SetupBasics(IsClientLoggingEnabled(argc, argv));
|
||||
|
||||
if (hecl::SystemChar* cwd = hecl::Getcwd(CwdBuf, 1024))
|
||||
{
|
||||
if (hecl::PathRelative(argv[0]))
|
||||
ExeDir = hecl::SystemString(cwd) + _SYS_STR('/');
|
||||
hecl::SystemString Argv0(argv[0]);
|
||||
hecl::SystemString::size_type lastIdx = Argv0.find_last_of(_SYS_STR("/\\"));
|
||||
if (lastIdx != hecl::SystemString::npos)
|
||||
ExeDir.insert(ExeDir.end(), Argv0.begin(), Argv0.begin() + lastIdx);
|
||||
}
|
||||
if (hecl::SystemChar* cwd = hecl::Getcwd(CwdBuf, 1024)) {
|
||||
if (hecl::PathRelative(argv[0]))
|
||||
ExeDir = hecl::SystemString(cwd) + _SYS_STR('/');
|
||||
hecl::SystemString Argv0(argv[0]);
|
||||
hecl::SystemString::size_type lastIdx = Argv0.find_last_of(_SYS_STR("/\\"));
|
||||
if (lastIdx != hecl::SystemString::npos)
|
||||
ExeDir.insert(ExeDir.end(), Argv0.begin(), Argv0.begin() + lastIdx);
|
||||
}
|
||||
|
||||
urde::Application appCb;
|
||||
int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto,
|
||||
appCb, _SYS_STR("urde"), _SYS_STR("URDE"), argc, argv, appCb.getGraphicsApi(),
|
||||
appCb.getSamples(), appCb.getAnisotropy(), appCb.getDeepColor(), false);
|
||||
//printf("IM DYING!!\n");
|
||||
return ret;
|
||||
urde::Application appCb;
|
||||
int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto, appCb, _SYS_STR("urde"), _SYS_STR("URDE"), argc,
|
||||
argv, appCb.getGraphicsApi(), appCb.getSamples(), appCb.getAnisotropy(),
|
||||
appCb.getDeepColor(), false);
|
||||
// printf("IM DYING!!\n");
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -235,33 +201,30 @@ int main(int argc, const boo::SystemChar** argv)
|
||||
#include "boo/UWPViewProvider.hpp"
|
||||
using namespace Windows::ApplicationModel::Core;
|
||||
|
||||
[Platform::MTAThread]
|
||||
int WINAPIV main(Platform::Array<Platform::String^>^ params)
|
||||
{
|
||||
SetupBasics(false);
|
||||
urde::Application appCb;
|
||||
auto viewProvider = ref new boo::ViewProvider(appCb, _SYS_STR("urde"), _SYS_STR("URDE"), _SYS_STR("urde"), params, false);
|
||||
CoreApplication::Run(viewProvider);
|
||||
return 0;
|
||||
[Platform::MTAThread] int WINAPIV main(Platform::Array<Platform::String ^> ^ params) {
|
||||
SetupBasics(false);
|
||||
urde::Application appCb;
|
||||
auto viewProvider =
|
||||
ref new boo::ViewProvider(appCb, _SYS_STR("urde"), _SYS_STR("URDE"), _SYS_STR("urde"), params, false);
|
||||
CoreApplication::Run(viewProvider);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#elif _WIN32
|
||||
int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
|
||||
{
|
||||
int argc = 0;
|
||||
const boo::SystemChar** argv;
|
||||
if (lpCmdLine[0])
|
||||
argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc));
|
||||
static boo::SystemChar selfPath[1024];
|
||||
GetModuleFileNameW(nullptr, selfPath, 1024);
|
||||
static const boo::SystemChar* booArgv[32] = {};
|
||||
booArgv[0] = selfPath;
|
||||
for (int i=0 ; i<argc ; ++i)
|
||||
booArgv[i+1] = argv[i];
|
||||
int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int) {
|
||||
int argc = 0;
|
||||
const boo::SystemChar** argv;
|
||||
if (lpCmdLine[0])
|
||||
argv = (const wchar_t**)(CommandLineToArgvW(lpCmdLine, &argc));
|
||||
static boo::SystemChar selfPath[1024];
|
||||
GetModuleFileNameW(nullptr, selfPath, 1024);
|
||||
static const boo::SystemChar* booArgv[32] = {};
|
||||
booArgv[0] = selfPath;
|
||||
for (int i = 0; i < argc; ++i)
|
||||
booArgv[i + 1] = argv[i];
|
||||
|
||||
if (IsClientLoggingEnabled(argc+1, booArgv))
|
||||
logvisor::CreateWin32Console();
|
||||
return wmain(argc + 1, booArgv);
|
||||
if (IsClientLoggingEnabled(argc + 1, booArgv))
|
||||
logvisor::CreateWin32Console();
|
||||
return wmain(argc + 1, booArgv);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user