Update submodules

DataSpec/DNAMP1/ANCS.hpp

@@ -416,22 +416,22 @@ struct ANCS : BigYAML
             MetaTransTrans()
             : IMetaTrans(Type::Trans, "Trans") {}
             DECL_YAML
-            Value<float> time;
-            Value<atUint32> unk1;
-            Value<atUint8> unk2;
-            Value<atUint8> unk3;
-            Value<atUint32> unk4;
+            Value<float> transDurTime;
+            Value<atUint32> transDurTimeMode;
+            Value<bool> unk2;
+            Value<bool> runA;
+            Value<atUint32> flags;
         };
         struct MetaTransPhaseTrans : IMetaTrans
         {
             MetaTransPhaseTrans()
             : IMetaTrans(Type::PhaseTrans, "PhaseTrans") {}
             DECL_YAML
-            Value<float> time;
-            Value<atUint32> unk1;
-            Value<atUint8> unk2;
-            Value<atUint8> unk3;
-            Value<atUint32> unk4;
+            Value<float> transDurTime;
+            Value<atUint32> transDurTimeMode;
+            Value<bool> unk2;
+            Value<bool> runA;
+            Value<atUint32> flags;
         };
 
         struct Transition : BigYAML

DataSpec/SpecBase.cpp

@@ -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(),
                 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);

Editor/CMakeLists.txt

@@ -18,7 +18,7 @@ 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
@@ -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}

Editor/SplashScreen.cpp

@@ -40,12 +40,16 @@ 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
+        if ((URDE_DLPACKAGE)[0])
+            m_buildInfoStr = hecl::Format("%s: %s\n%s: %s\n%s: %s",
                                           vm.translateOr("release", "Release").data(), URDE_DLPACKAGE,
-#else
-                                      vm.translateOr("branch", "Branch").data(), GIT_BRANCH,
+                                          vm.translateOr("commit", "Commit").data(), GIT_COMMIT_HASH,
+                                          vm.translateOr("date", "Date").data(), GIT_COMMIT_DATE);
+        else
 #endif
+            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);
     }

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<ViewManager> 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<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());
     }
 
-    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

Editor/platforms/win/urde.manifest

@@ -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>