AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 01:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Update hecl-gui and amuse, just boot right into the game always

Browse Source
This commit is contained in:
Phillip Stephens
2021-01-23 16:28:22 -08:00
parent 0781307c49
commit a7c61573bd
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -364,12 +364,12 @@ add_subdirectory(visigen)
add_dependencies(hecl visigen) add_dependencies(hecl visigen)
if (NOT WINDOWS_STORE AND NOT NX) if (NOT WINDOWS_STORE AND NOT NX)
find_package(Qt5Widgets PATHS /usr/local/opt/qt) find_package(Qt6Widgets PATHS /usr/local/opt/qt)
if (Qt5Widgets_FOUND) if (Qt5Widgets_FOUND)
message(STATUS "Qt5 found, hecl-gui will be built") message(STATUS "Qt6 found, hecl-gui will be built")
add_subdirectory(hecl-gui) add_subdirectory(hecl-gui)
else() else()
message(STATUS "Qt5 not found, hecl-gui will not be built") message(STATUS "Qt6 not found, hecl-gui will not be built")
endif() endif()
endif() endif()

26
Editor/ViewManager.cpp
View File

@@ -67,7 +67,7 @@ void ViewManager::TestGameView::think() {
overlayText += fmt::format(FMT_STRING("Frame: {}\n"), g_StateManager->GetUpdateFrameIndex()); overlayText += fmt::format(FMT_STRING("Frame: {}\n"), g_StateManager->GetUpdateFrameIndex());
if (m_cvarCommons.m_debugOverlayShowFramerate->toBoolean()) if (m_cvarCommons.m_debugOverlayShowFramerate->toBoolean())
overlayText += fmt::format(FMT_STRING("FPS: {}\n"), urde::CGraphics::GetFPS()); overlayText += fmt::format(FMT_STRING("FPS: {}\n"), urde::CGraphics::GetFPS());
if (m_cvarCommons.m_debugOverlayShowInGameTime->toBoolean()) { if (m_cvarCommons.m_debugOverlayShowInGameTime->toBoolean()) {
double igt = g_GameState->GetTotalPlayTime(); double igt = g_GameState->GetTotalPlayTime();
@@ -87,9 +87,8 @@ void ViewManager::TestGameView::think() {
double currentRoomTime = igt - m_currentRoomStart; double currentRoomTime = igt - m_currentRoomStart;
u32 curFrames = std::round(u32(currentRoomTime * 60)); u32 curFrames = std::round(u32(currentRoomTime * 60));
u32 lastFrames = std::round(u32(m_lastRoomTime * 60)); u32 lastFrames = std::round(u32(m_lastRoomTime * 60));
overlayText += fmt::format(FMT_STRING("Room Time:{:8.3f}/{:6d}| Last Room:{:8.3f}/{:6d}\n"), overlayText += fmt::format(FMT_STRING("Room Time:{:8.3f}/{:6d}| Last Room:{:8.3f}/{:6d}\n"), currentRoomTime,
currentRoomTime, curFrames, curFrames, m_lastRoomTime, lastFrames);
m_lastRoomTime, lastFrames);
} }
if (g_StateManager->Player() && m_cvarCommons.m_debugOverlayPlayerInfo->toBoolean()) { if (g_StateManager->Player() && m_cvarCommons.m_debugOverlayPlayerInfo->toBoolean()) {
@@ -98,11 +97,11 @@ void ViewManager::TestGameView::think() {
const zeus::CTransform camXf = g_StateManager->GetCameraManager()->GetCurrentCameraTransform(*g_StateManager); const zeus::CTransform camXf = g_StateManager->GetCameraManager()->GetCurrentCameraTransform(*g_StateManager);
const zeus::CQuaternion camQ = zeus::CQuaternion(camXf.getRotation().buildMatrix3f()); const zeus::CQuaternion camQ = zeus::CQuaternion(camXf.getRotation().buildMatrix3f());
overlayText += fmt::format(FMT_STRING("Player Position: x {}, y {}, z {}\n" overlayText += fmt::format(FMT_STRING("Player Position: x {}, y {}, z {}\n"
" Roll: {}, Pitch: {}, Yaw: {}\n" " Roll: {}, Pitch: {}, Yaw: {}\n"
" Momentum: x {}, y: {}, z: {}\n" " Momentum: x {}, y: {}, z: {}\n"
" Velocity: x {}, y: {}, z: {}\n" " Velocity: x {}, y: {}, z: {}\n"
"Camera Position: x {}, y {}, z {}\n" "Camera Position: x {}, y {}, z {}\n"
" Roll: {}, Pitch: {}, Yaw: {}\n"), " Roll: {}, Pitch: {}, Yaw: {}\n"),
pl.GetTranslation().x(), pl.GetTranslation().y(), pl.GetTranslation().z(), pl.GetTranslation().x(), pl.GetTranslation().y(), pl.GetTranslation().z(),
zeus::radToDeg(plQ.roll()), zeus::radToDeg(plQ.pitch()), zeus::radToDeg(plQ.yaw()), zeus::radToDeg(plQ.roll()), zeus::radToDeg(plQ.pitch()), zeus::radToDeg(plQ.yaw()),
pl.GetMomentum().x(), pl.GetMomentum().y(), pl.GetMomentum().z(), pl.GetMomentum().x(), pl.GetMomentum().y(), pl.GetMomentum().z(),
@@ -132,7 +131,7 @@ void ViewManager::TestGameView::think() {
layerBits += "0"; layerBits += "0";
} }
overlayText += fmt::format(FMT_STRING("Area AssetId: 0x{}, Total Objects: {}\n" overlayText += fmt::format(FMT_STRING("Area AssetId: 0x{}, Total Objects: {}\n"
"Active Layer bits: {}\n"), "Active Layer bits: {}\n"),
g_StateManager->GetWorld()->GetArea(aId)->GetAreaAssetId(), g_StateManager->GetWorld()->GetArea(aId)->GetAreaAssetId(),
g_StateManager->GetAllObjectList().size(), layerBits); g_StateManager->GetAllObjectList().size(), layerBits);
} }
@@ -316,8 +315,13 @@ void ViewManager::init(boo::IApplication* app) {
m_amuseAllocWrapper.emplace(*m_voiceEngine); m_amuseAllocWrapper.emplace(*m_voiceEngine);
for (const auto& arg : app->getArgs()) { for (const auto& arg : app->getArgs()) {
hecl::Sstat theStat;
if (!hecl::Stat((arg + _SYS_STR("/out")).c_str(), &theStat) && S_ISDIR(theStat.st_mode)) {
hecl::ProjectRootPath rootPath(arg);
hecl::Database::Project tmp(rootPath); // Force project creation
}
if (m_deferedProject.empty() && hecl::SearchForProject(arg)) if (m_deferedProject.empty() && hecl::SearchForProject(arg))
m_deferedProject = arg; m_deferedProject = arg + _SYS_STR("/out");
if (arg == _SYS_STR("--no-shader-warmup")) if (arg == _SYS_STR("--no-shader-warmup"))
m_noShaderWarmup = true; m_noShaderWarmup = true;
else if (arg == _SYS_STR("--no-sound")) else if (arg == _SYS_STR("--no-sound"))

2
amuse

Submodule amuse updated: d3c4f568bb...2ec749e6c7

2
hecl-gui

Submodule hecl-gui updated: 6d0a738e1b...ab0d15f739