diff --git a/DataSpec/DNAMP1/ANCS.hpp b/DataSpec/DNAMP1/ANCS.hpp index 93dd0ca02..ab0c99c4e 100644 --- a/DataSpec/DNAMP1/ANCS.hpp +++ b/DataSpec/DNAMP1/ANCS.hpp @@ -416,22 +416,22 @@ struct ANCS : BigYAML MetaTransTrans() : IMetaTrans(Type::Trans, "Trans") {} DECL_YAML - Value time; - Value unk1; - Value unk2; - Value unk3; - Value unk4; + Value transDurTime; + Value transDurTimeMode; + Value unk2; + Value runA; + Value flags; }; struct MetaTransPhaseTrans : IMetaTrans { MetaTransPhaseTrans() : IMetaTrans(Type::PhaseTrans, "PhaseTrans") {} DECL_YAML - Value time; - Value unk1; - Value unk2; - Value unk3; - Value unk4; + Value transDurTime; + Value transDurTimeMode; + Value unk2; + Value runA; + Value flags; }; struct Transition : BigYAML diff --git a/DataSpec/SpecBase.cpp b/DataSpec/SpecBase.cpp index a359527df..592255418 100644 --- a/DataSpec/SpecBase.cpp +++ b/DataSpec/SpecBase.cpp @@ -494,6 +494,7 @@ void SpecBase::copyBuildListData(std::vector>& { fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(), tag.type.getChars(), (unsigned int)tag.id.Value()); + fflush(stderr); fileIndex.emplace_back(); auto& thisIdx = fileIndex.back(); @@ -626,6 +627,7 @@ void SpecBase::doPackage(const hecl::ProjectPath& path, const hecl::Database::Da { fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(), tag.type.getChars(), (unsigned int)tag.id.Value()); + fflush(stderr); if (addedTags.find(tag) != addedTags.end()) continue; addedTags.insert(tag); diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index 5c78f702e..1cf30a829 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -18,53 +18,53 @@ endif() if(WIN32) configure_file(platforms/win/urde.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" @ONLY) - set(PLAT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc") + set(PLAT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" platforms/win/urde.manifest) if(WINDOWS_STORE) - set(UWP_ASSETS - platforms/win/Assets/LargeTile.scale-100.png - platforms/win/Assets/LargeTile.scale-125.png - platforms/win/Assets/LargeTile.scale-150.png - platforms/win/Assets/LargeTile.scale-200.png - platforms/win/Assets/LargeTile.scale-400.png - platforms/win/Assets/SmallTile.scale-100.png - platforms/win/Assets/SmallTile.scale-125.png - platforms/win/Assets/SmallTile.scale-150.png - platforms/win/Assets/SmallTile.scale-200.png - platforms/win/Assets/SmallTile.scale-400.png - platforms/win/Assets/SplashScreen.scale-100.png - platforms/win/Assets/SplashScreen.scale-125.png - platforms/win/Assets/SplashScreen.scale-150.png - platforms/win/Assets/SplashScreen.scale-200.png - platforms/win/Assets/SplashScreen.scale-400.png - platforms/win/Assets/Square44x44Logo.scale-100.png - platforms/win/Assets/Square44x44Logo.scale-125.png - platforms/win/Assets/Square44x44Logo.scale-150.png - platforms/win/Assets/Square44x44Logo.scale-200.png - platforms/win/Assets/Square44x44Logo.scale-400.png - platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.png - platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-24.png - platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.png - platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-48.png - platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png - platforms/win/Assets/Square150x150Logo.scale-100.png - platforms/win/Assets/Square150x150Logo.scale-125.png - platforms/win/Assets/Square150x150Logo.scale-150.png - platforms/win/Assets/Square150x150Logo.scale-200.png - platforms/win/Assets/Square150x150Logo.scale-400.png - platforms/win/Assets/urde.scale-100.png - platforms/win/Assets/urde.scale-125.png - platforms/win/Assets/urde.scale-150.png - platforms/win/Assets/urde.scale-200.png - platforms/win/Assets/urde.scale-400.png - platforms/win/Assets/WideTile.scale-100.png - platforms/win/Assets/WideTile.scale-125.png - platforms/win/Assets/WideTile.scale-150.png - platforms/win/Assets/WideTile.scale-200.png - platforms/win/Assets/WideTile.scale-400.png) - set_property(SOURCE platforms/win/Package.appxmanifest PROPERTY VS_DEPLOYMENT_CONTENT 1) - set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_CONTENT 1) - set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets") - list(APPEND PLAT_SRCS ${UWP_ASSETS} platforms/win/Package.appxmanifest) + set(UWP_ASSETS + platforms/win/Assets/LargeTile.scale-100.png + platforms/win/Assets/LargeTile.scale-125.png + platforms/win/Assets/LargeTile.scale-150.png + platforms/win/Assets/LargeTile.scale-200.png + platforms/win/Assets/LargeTile.scale-400.png + platforms/win/Assets/SmallTile.scale-100.png + platforms/win/Assets/SmallTile.scale-125.png + platforms/win/Assets/SmallTile.scale-150.png + platforms/win/Assets/SmallTile.scale-200.png + platforms/win/Assets/SmallTile.scale-400.png + platforms/win/Assets/SplashScreen.scale-100.png + platforms/win/Assets/SplashScreen.scale-125.png + platforms/win/Assets/SplashScreen.scale-150.png + platforms/win/Assets/SplashScreen.scale-200.png + platforms/win/Assets/SplashScreen.scale-400.png + platforms/win/Assets/Square44x44Logo.scale-100.png + platforms/win/Assets/Square44x44Logo.scale-125.png + platforms/win/Assets/Square44x44Logo.scale-150.png + platforms/win/Assets/Square44x44Logo.scale-200.png + platforms/win/Assets/Square44x44Logo.scale-400.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-24.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-48.png + platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png + platforms/win/Assets/Square150x150Logo.scale-100.png + platforms/win/Assets/Square150x150Logo.scale-125.png + platforms/win/Assets/Square150x150Logo.scale-150.png + platforms/win/Assets/Square150x150Logo.scale-200.png + platforms/win/Assets/Square150x150Logo.scale-400.png + platforms/win/Assets/urde.scale-100.png + platforms/win/Assets/urde.scale-125.png + platforms/win/Assets/urde.scale-150.png + platforms/win/Assets/urde.scale-200.png + platforms/win/Assets/urde.scale-400.png + platforms/win/Assets/WideTile.scale-100.png + platforms/win/Assets/WideTile.scale-125.png + platforms/win/Assets/WideTile.scale-150.png + platforms/win/Assets/WideTile.scale-200.png + platforms/win/Assets/WideTile.scale-400.png) + set_property(SOURCE platforms/win/Package.appxmanifest PROPERTY VS_DEPLOYMENT_CONTENT 1) + set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_CONTENT 1) + set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets") + list(APPEND PLAT_SRCS ${UWP_ASSETS} platforms/win/Package.appxmanifest) endif() elseif(APPLE) set(PLAT_SRCS platforms/mac/mainicon.icns) @@ -99,7 +99,7 @@ target_link_libraries(urde UrdeBadging RuntimeCommon specter specter-fonts freetype ${DATA_SPEC_LIBS} - hecl-common hecl-blender-addon + hecl-full hecl-blender-addon athena-core nod logvisor athena-libyaml amuse boo ${PNG_LIB} libjpeg-turbo squish xxhash zeus kabufuda jbus ${ZLIB_LIBRARIES} ${LZO_LIB} @@ -108,8 +108,8 @@ if(COMMAND add_sanitizers) add_sanitizers(urde) endif() if(COMMAND cotire) - set_target_properties(urde PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) - cotire(urde) + set_target_properties(urde PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) + cotire(urde) endif() set_target_properties(urde PROPERTIES diff --git a/Editor/SplashScreen.cpp b/Editor/SplashScreen.cpp index 5809336d7..0c6907ddd 100644 --- a/Editor/SplashScreen.cpp +++ b/Editor/SplashScreen.cpp @@ -40,14 +40,18 @@ SplashScreen::SplashScreen(ViewManager& vm, specter::ViewResources& res) GIT_COMMIT_HASH[0] != '\0' && GIT_BRANCH[0] != '\0') { - m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s", #ifdef URDE_DLPACKAGE - vm.translateOr("release", "Release").data(), URDE_DLPACKAGE, -#else - vm.translateOr("branch", "Branch").data(), GIT_BRANCH, + if ((URDE_DLPACKAGE)[0]) + m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s", + vm.translateOr("release", "Release").data(), URDE_DLPACKAGE, + vm.translateOr("commit", "Commit").data(), GIT_COMMIT_HASH, + vm.translateOr("date", "Date").data(), GIT_COMMIT_DATE); + else #endif - vm.translateOr("commit", "Commit").data(), GIT_COMMIT_HASH, - vm.translateOr("date", "Date").data(), GIT_COMMIT_DATE); + m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s", + vm.translateOr("branch", "Branch").data(), GIT_BRANCH, + vm.translateOr("commit", "Commit").data(), GIT_COMMIT_HASH, + vm.translateOr("date", "Date").data(), GIT_COMMIT_DATE); } m_openProjBind.m_openRecentMenuRoot.m_text = vm.translateOr("recent_projects", "Recent Projects"); diff --git a/Editor/main.cpp b/Editor/main.cpp index 7162f765c..33baa0312 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -5,6 +5,7 @@ #include "Runtime/CBasics.hpp" #include "ViewManager.hpp" #include "hecl/hecl.hpp" +#include "hecl/CVarCommons.hpp" static logvisor::Module AthenaLog("Athena"); static void AthenaExc(athena::error::Level level, const char* file, @@ -56,23 +57,16 @@ struct Application : boo::IApplicationCallback { hecl::Runtime::FileStoreManager m_fileMgr; hecl::CVarManager m_cvarManager; + hecl::CVarCommons m_cvarCommons; std::unique_ptr m_viewManager; - hecl::CVar* m_drawSamples; - hecl::CVar* m_texAnisotropy; bool m_running = true; Application() : m_fileMgr(_S("urde")), - m_cvarManager(m_fileMgr) + m_cvarManager(m_fileMgr), + m_cvarCommons(m_cvarManager) { - m_drawSamples = m_cvarManager.findOrMakeCVar("drawSamples"sv, - "Number of MSAA samples to use for render targets"sv, - 1, hecl::CVar::EFlags::System | hecl::CVar::EFlags::Archive); - m_texAnisotropy = m_cvarManager.findOrMakeCVar("texAnisotropy"sv, - "Number of anisotropic samples to use for sampling textures"sv, - 1, hecl::CVar::EFlags::System | hecl::CVar::EFlags::Archive); - m_viewManager = std::make_unique(m_fileMgr, m_cvarManager); } @@ -129,14 +123,19 @@ struct Application : boo::IApplicationCallback Log.report(logvisor::Info, _S("CPU Features: %s"), CPUFeatureString(cpuInf).c_str()); } - uint32_t getSamples() + std::string getGraphicsApi() const { - return uint32_t(std::max(1, m_drawSamples->toInteger())); + return m_cvarCommons.getGraphicsApi(); } - uint32_t getAnisotropy() + uint32_t getSamples() const { - return uint32_t(std::max(1, m_texAnisotropy->toInteger())); + return m_cvarCommons.getSamples(); + } + + uint32_t getAnisotropy() const + { + return m_cvarCommons.getAnisotropy(); } }; @@ -204,8 +203,9 @@ int main(int argc, const boo::SystemChar** argv) urde::Application appCb; int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto, - appCb, _S("urde"), _S("URDE"), argc, argv, appCb.getSamples(), appCb.getAnisotropy(), false); - printf("IM DYING!!\n"); + appCb, _S("urde"), _S("URDE"), argc, argv, appCb.getGraphicsApi(), + appCb.getSamples(), appCb.getAnisotropy(), false); + //printf("IM DYING!!\n"); return ret; } #endif diff --git a/Editor/platforms/win/urde.manifest b/Editor/platforms/win/urde.manifest new file mode 100644 index 000000000..218b0cd98 --- /dev/null +++ b/Editor/platforms/win/urde.manifest @@ -0,0 +1,23 @@ + + + URDE + + + + + + + + + + + + + + + + + true/PM + + + diff --git a/amuse b/amuse index fd292491c..f37296d56 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit fd292491c7023330ca6aced4955eabb23cc4123e +Subproject commit f37296d560de9168c3bf5773b05c4c076bc5349d diff --git a/hecl b/hecl index 5231817e2..942a9afa9 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 5231817e2f81148a60b0c81a554455be01a70e7f +Subproject commit 942a9afa9989b102445d5e191062081213b26a56 diff --git a/hecl-gui b/hecl-gui index 71cbcc9af..613024f8c 160000 --- a/hecl-gui +++ b/hecl-gui @@ -1 +1 @@ -Subproject commit 71cbcc9af81e5b05544021bc8afd81ae7700a4ce +Subproject commit 613024f8c699b4f59a36d107ab374933d311f5df diff --git a/nod b/nod index bf00fcd10..648c01538 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit bf00fcd10fc38eca990a182dec0037f2a49a35f2 +Subproject commit 648c015383f7c5596e87e6f49aeee0df32e5739b diff --git a/specter b/specter index 712b8bc90..b949259bf 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 712b8bc9048b175a1528fa13362090d17c2d4002 +Subproject commit b949259bf13dd668a1887da8fba05ee534ec02e9