mirror of https://github.com/AxioDL/metaforce.git
Update submodules
This commit is contained in:
Jack Andersen
parent
92b640214a
commit
613d57299e
|
|
@ -416,22 +416,22 @@ struct ANCS : BigYAML
|
||||||
MetaTransTrans()
|
MetaTransTrans()
|
||||||
: IMetaTrans(Type::Trans, "Trans") {}
|
: IMetaTrans(Type::Trans, "Trans") {}
|
||||||
DECL_YAML
|
DECL_YAML
|
||||||
Value<float> time;
|
Value<float> transDurTime;
|
||||||
Value<atUint32> unk1;
|
Value<atUint32> transDurTimeMode;
|
||||||
Value<atUint8> unk2;
|
Value<bool> unk2;
|
||||||
Value<atUint8> unk3;
|
Value<bool> runA;
|
||||||
Value<atUint32> unk4;
|
Value<atUint32> flags;
|
||||||
};
|
};
|
||||||
struct MetaTransPhaseTrans : IMetaTrans
|
struct MetaTransPhaseTrans : IMetaTrans
|
||||||
{
|
{
|
||||||
MetaTransPhaseTrans()
|
MetaTransPhaseTrans()
|
||||||
: IMetaTrans(Type::PhaseTrans, "PhaseTrans") {}
|
: IMetaTrans(Type::PhaseTrans, "PhaseTrans") {}
|
||||||
DECL_YAML
|
DECL_YAML
|
||||||
Value<float> time;
|
Value<float> transDurTime;
|
||||||
Value<atUint32> unk1;
|
Value<atUint32> transDurTimeMode;
|
||||||
Value<atUint8> unk2;
|
Value<bool> unk2;
|
||||||
Value<atUint8> unk3;
|
Value<bool> runA;
|
||||||
Value<atUint32> unk4;
|
Value<atUint32> flags;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Transition : BigYAML
|
struct Transition : BigYAML
|
||||||
|
|
|
||||||
|
|
@ -494,6 +494,7 @@ void SpecBase::copyBuildListData(std::vector<std::tuple<size_t, size_t, bool>>&
|
||||||
{
|
{
|
||||||
fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(),
|
fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(),
|
||||||
tag.type.getChars(), (unsigned int)tag.id.Value());
|
tag.type.getChars(), (unsigned int)tag.id.Value());
|
||||||
|
fflush(stderr);
|
||||||
|
|
||||||
fileIndex.emplace_back();
|
fileIndex.emplace_back();
|
||||||
auto& thisIdx = fileIndex.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(),
|
fprintf(stderr, "\r %" PRISize " / %" PRISize " %.4s %08X", ++loadIdx, buildList.size(),
|
||||||
tag.type.getChars(), (unsigned int)tag.id.Value());
|
tag.type.getChars(), (unsigned int)tag.id.Value());
|
||||||
|
fflush(stderr);
|
||||||
if (addedTags.find(tag) != addedTags.end())
|
if (addedTags.find(tag) != addedTags.end())
|
||||||
continue;
|
continue;
|
||||||
addedTags.insert(tag);
|
addedTags.insert(tag);
|
||||||
|
|
|
||||||
|
|
@ -18,53 +18,53 @@ endif()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
configure_file(platforms/win/urde.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" @ONLY)
|
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)
|
if(WINDOWS_STORE)
|
||||||
set(UWP_ASSETS
|
set(UWP_ASSETS
|
||||||
platforms/win/Assets/LargeTile.scale-100.png
|
platforms/win/Assets/LargeTile.scale-100.png
|
||||||
platforms/win/Assets/LargeTile.scale-125.png
|
platforms/win/Assets/LargeTile.scale-125.png
|
||||||
platforms/win/Assets/LargeTile.scale-150.png
|
platforms/win/Assets/LargeTile.scale-150.png
|
||||||
platforms/win/Assets/LargeTile.scale-200.png
|
platforms/win/Assets/LargeTile.scale-200.png
|
||||||
platforms/win/Assets/LargeTile.scale-400.png
|
platforms/win/Assets/LargeTile.scale-400.png
|
||||||
platforms/win/Assets/SmallTile.scale-100.png
|
platforms/win/Assets/SmallTile.scale-100.png
|
||||||
platforms/win/Assets/SmallTile.scale-125.png
|
platforms/win/Assets/SmallTile.scale-125.png
|
||||||
platforms/win/Assets/SmallTile.scale-150.png
|
platforms/win/Assets/SmallTile.scale-150.png
|
||||||
platforms/win/Assets/SmallTile.scale-200.png
|
platforms/win/Assets/SmallTile.scale-200.png
|
||||||
platforms/win/Assets/SmallTile.scale-400.png
|
platforms/win/Assets/SmallTile.scale-400.png
|
||||||
platforms/win/Assets/SplashScreen.scale-100.png
|
platforms/win/Assets/SplashScreen.scale-100.png
|
||||||
platforms/win/Assets/SplashScreen.scale-125.png
|
platforms/win/Assets/SplashScreen.scale-125.png
|
||||||
platforms/win/Assets/SplashScreen.scale-150.png
|
platforms/win/Assets/SplashScreen.scale-150.png
|
||||||
platforms/win/Assets/SplashScreen.scale-200.png
|
platforms/win/Assets/SplashScreen.scale-200.png
|
||||||
platforms/win/Assets/SplashScreen.scale-400.png
|
platforms/win/Assets/SplashScreen.scale-400.png
|
||||||
platforms/win/Assets/Square44x44Logo.scale-100.png
|
platforms/win/Assets/Square44x44Logo.scale-100.png
|
||||||
platforms/win/Assets/Square44x44Logo.scale-125.png
|
platforms/win/Assets/Square44x44Logo.scale-125.png
|
||||||
platforms/win/Assets/Square44x44Logo.scale-150.png
|
platforms/win/Assets/Square44x44Logo.scale-150.png
|
||||||
platforms/win/Assets/Square44x44Logo.scale-200.png
|
platforms/win/Assets/Square44x44Logo.scale-200.png
|
||||||
platforms/win/Assets/Square44x44Logo.scale-400.png
|
platforms/win/Assets/Square44x44Logo.scale-400.png
|
||||||
platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-16.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-24.png
|
||||||
platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-32.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-48.png
|
||||||
platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
|
platforms/win/Assets/Square44x44Logo.altform-unplated_targetsize-256.png
|
||||||
platforms/win/Assets/Square150x150Logo.scale-100.png
|
platforms/win/Assets/Square150x150Logo.scale-100.png
|
||||||
platforms/win/Assets/Square150x150Logo.scale-125.png
|
platforms/win/Assets/Square150x150Logo.scale-125.png
|
||||||
platforms/win/Assets/Square150x150Logo.scale-150.png
|
platforms/win/Assets/Square150x150Logo.scale-150.png
|
||||||
platforms/win/Assets/Square150x150Logo.scale-200.png
|
platforms/win/Assets/Square150x150Logo.scale-200.png
|
||||||
platforms/win/Assets/Square150x150Logo.scale-400.png
|
platforms/win/Assets/Square150x150Logo.scale-400.png
|
||||||
platforms/win/Assets/urde.scale-100.png
|
platforms/win/Assets/urde.scale-100.png
|
||||||
platforms/win/Assets/urde.scale-125.png
|
platforms/win/Assets/urde.scale-125.png
|
||||||
platforms/win/Assets/urde.scale-150.png
|
platforms/win/Assets/urde.scale-150.png
|
||||||
platforms/win/Assets/urde.scale-200.png
|
platforms/win/Assets/urde.scale-200.png
|
||||||
platforms/win/Assets/urde.scale-400.png
|
platforms/win/Assets/urde.scale-400.png
|
||||||
platforms/win/Assets/WideTile.scale-100.png
|
platforms/win/Assets/WideTile.scale-100.png
|
||||||
platforms/win/Assets/WideTile.scale-125.png
|
platforms/win/Assets/WideTile.scale-125.png
|
||||||
platforms/win/Assets/WideTile.scale-150.png
|
platforms/win/Assets/WideTile.scale-150.png
|
||||||
platforms/win/Assets/WideTile.scale-200.png
|
platforms/win/Assets/WideTile.scale-200.png
|
||||||
platforms/win/Assets/WideTile.scale-400.png)
|
platforms/win/Assets/WideTile.scale-400.png)
|
||||||
set_property(SOURCE platforms/win/Package.appxmanifest PROPERTY VS_DEPLOYMENT_CONTENT 1)
|
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_CONTENT 1)
|
||||||
set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets")
|
set_property(SOURCE ${UWP_ASSETS} PROPERTY VS_DEPLOYMENT_LOCATION "Assets")
|
||||||
list(APPEND PLAT_SRCS ${UWP_ASSETS} platforms/win/Package.appxmanifest)
|
list(APPEND PLAT_SRCS ${UWP_ASSETS} platforms/win/Package.appxmanifest)
|
||||||
endif()
|
endif()
|
||||||
elseif(APPLE)
|
elseif(APPLE)
|
||||||
set(PLAT_SRCS platforms/mac/mainicon.icns)
|
set(PLAT_SRCS platforms/mac/mainicon.icns)
|
||||||
|
|
@ -99,7 +99,7 @@ target_link_libraries(urde
|
||||||
UrdeBadging
|
UrdeBadging
|
||||||
RuntimeCommon
|
RuntimeCommon
|
||||||
specter specter-fonts freetype ${DATA_SPEC_LIBS}
|
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
|
athena-core nod logvisor athena-libyaml amuse boo
|
||||||
${PNG_LIB} libjpeg-turbo squish xxhash zeus
|
${PNG_LIB} libjpeg-turbo squish xxhash zeus
|
||||||
kabufuda jbus ${ZLIB_LIBRARIES} ${LZO_LIB}
|
kabufuda jbus ${ZLIB_LIBRARIES} ${LZO_LIB}
|
||||||
|
|
@ -108,8 +108,8 @@ if(COMMAND add_sanitizers)
|
||||||
add_sanitizers(urde)
|
add_sanitizers(urde)
|
||||||
endif()
|
endif()
|
||||||
if(COMMAND cotire)
|
if(COMMAND cotire)
|
||||||
set_target_properties(urde PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
|
set_target_properties(urde PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
|
||||||
cotire(urde)
|
cotire(urde)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(urde PROPERTIES
|
set_target_properties(urde PROPERTIES
|
||||||
|
|
|
||||||
|
|
@ -40,14 +40,18 @@ SplashScreen::SplashScreen(ViewManager& vm, specter::ViewResources& res)
|
||||||
GIT_COMMIT_HASH[0] != '\0' &&
|
GIT_COMMIT_HASH[0] != '\0' &&
|
||||||
GIT_BRANCH[0] != '\0')
|
GIT_BRANCH[0] != '\0')
|
||||||
{
|
{
|
||||||
m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s",
|
|
||||||
#ifdef URDE_DLPACKAGE
|
#ifdef URDE_DLPACKAGE
|
||||||
vm.translateOr("release", "Release").data(), URDE_DLPACKAGE,
|
if ((URDE_DLPACKAGE)[0])
|
||||||
#else
|
m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s",
|
||||||
vm.translateOr("branch", "Branch").data(), GIT_BRANCH,
|
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
|
#endif
|
||||||
vm.translateOr("commit", "Commit").data(), GIT_COMMIT_HASH,
|
m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s",
|
||||||
vm.translateOr("date", "Date").data(), GIT_COMMIT_DATE);
|
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");
|
m_openProjBind.m_openRecentMenuRoot.m_text = vm.translateOr("recent_projects", "Recent Projects");
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
#include "Runtime/CBasics.hpp"
|
#include "Runtime/CBasics.hpp"
|
||||||
#include "ViewManager.hpp"
|
#include "ViewManager.hpp"
|
||||||
#include "hecl/hecl.hpp"
|
#include "hecl/hecl.hpp"
|
||||||
|
#include "hecl/CVarCommons.hpp"
|
||||||
|
|
||||||
static logvisor::Module AthenaLog("Athena");
|
static logvisor::Module AthenaLog("Athena");
|
||||||
static void AthenaExc(athena::error::Level level, const char* file,
|
static void AthenaExc(athena::error::Level level, const char* file,
|
||||||
|
|
@ -56,23 +57,16 @@ struct Application : boo::IApplicationCallback
|
||||||
{
|
{
|
||||||
hecl::Runtime::FileStoreManager m_fileMgr;
|
hecl::Runtime::FileStoreManager m_fileMgr;
|
||||||
hecl::CVarManager m_cvarManager;
|
hecl::CVarManager m_cvarManager;
|
||||||
|
hecl::CVarCommons m_cvarCommons;
|
||||||
std::unique_ptr<ViewManager> m_viewManager;
|
std::unique_ptr<ViewManager> m_viewManager;
|
||||||
hecl::CVar* m_drawSamples;
|
|
||||||
hecl::CVar* m_texAnisotropy;
|
|
||||||
|
|
||||||
bool m_running = true;
|
bool m_running = true;
|
||||||
|
|
||||||
Application() :
|
Application() :
|
||||||
m_fileMgr(_S("urde")),
|
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<ViewManager>(m_fileMgr, m_cvarManager);
|
m_viewManager = std::make_unique<ViewManager>(m_fileMgr, m_cvarManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -129,14 +123,19 @@ struct Application : boo::IApplicationCallback
|
||||||
Log.report(logvisor::Info, _S("CPU Features: %s"), CPUFeatureString(cpuInf).c_str());
|
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;
|
urde::Application appCb;
|
||||||
int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto,
|
int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto,
|
||||||
appCb, _S("urde"), _S("URDE"), argc, argv, appCb.getSamples(), appCb.getAnisotropy(), false);
|
appCb, _S("urde"), _S("URDE"), argc, argv, appCb.getGraphicsApi(),
|
||||||
printf("IM DYING!!\n");
|
appCb.getSamples(), appCb.getAnisotropy(), false);
|
||||||
|
//printf("IM DYING!!\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
|
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||||
|
<description>URDE</description>
|
||||||
|
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||||
|
<application>
|
||||||
|
<!-- Windows 10 -->
|
||||||
|
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||||
|
<!-- Windows 8.1 -->
|
||||||
|
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||||
|
<!-- Windows Vista -->
|
||||||
|
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
||||||
|
<!-- Windows 7 -->
|
||||||
|
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||||
|
<!-- Windows 8 -->
|
||||||
|
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||||
|
</application>
|
||||||
|
</compatibility>
|
||||||
|
<asmv3:application>
|
||||||
|
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
|
||||||
|
<dpiAware>true/PM</dpiAware>
|
||||||
|
</asmv3:windowsSettings>
|
||||||
|
</asmv3:application>
|
||||||
|
</assembly>
|
||||||
2
amuse
2
amuse
|
|
@ -1 +1 @@
|
||||||
Subproject commit fd292491c7023330ca6aced4955eabb23cc4123e
|
Subproject commit f37296d560de9168c3bf5773b05c4c076bc5349d
|
||||||
2
hecl
2
hecl
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5231817e2f81148a60b0c81a554455be01a70e7f
|
Subproject commit 942a9afa9989b102445d5e191062081213b26a56
|
||||||
2
hecl-gui
2
hecl-gui
|
|
@ -1 +1 @@
|
||||||
Subproject commit 71cbcc9af81e5b05544021bc8afd81ae7700a4ce
|
Subproject commit 613024f8c699b4f59a36d107ab374933d311f5df
|
||||||
2
nod
2
nod
|
|
@ -1 +1 @@
|
||||||
Subproject commit bf00fcd10fc38eca990a182dec0037f2a49a35f2
|
Subproject commit 648c015383f7c5596e87e6f49aeee0df32e5739b
|
||||||
2
specter
2
specter
|
|
@ -1 +1 @@
|
||||||
Subproject commit 712b8bc9048b175a1528fa13362090d17c2d4002
|
Subproject commit b949259bf13dd668a1887da8fba05ee534ec02e9
|
||||||
Loading…
Reference in New Issue