Merge pull request #142 from jmorton06/dev

Dev

.github/workflows/build.yml

@@ -111,13 +111,13 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   Windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       matrix:
         config: [Debug, Release, Production]
         platform: [x64]
     env:
-      MSBUILD_PATH: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\
+      MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\
     steps:
       - uses: actions/checkout@v4
         with:
@@ -126,7 +126,7 @@ jobs:
       - name: Generate Project
         run: | 
           cd Scripts/Windows
-          ./GenerateVS19.bat
+          ./GenerateVS22.bat
       - name: Build x64 ${{matrix.configuration}}
         shell: cmd
         run: |

.gitignore

@@ -25,7 +25,6 @@
 [Mm]inSizeRel/
 [Rr]elWithDebInfo/
 x64/
-x86/
 bld/
 [Bb]in/
 [Oo]bj/

Editor/Source/ApplicationInfoPanel.cpp

@@ -3,13 +3,13 @@
 #include <Lumos/Core/Application.h>
 #include <Lumos/Scene/SceneManager.h>
 #include <Lumos/Scene/Scene.h>
-#include <Lumos/Utilities/AssetManager.h>
+#include <Lumos/Core/Asset/AssetManager.h>
 
 #include "Editor.h"
 
 #include <Lumos/Core/Engine.h>
 #include <Lumos/Core/OS/Window.h>
-#include <Lumos/Graphics/Renderers/RenderPasses.h>
+#include <Lumos/Graphics/Renderers/SceneRenderer.h>
 #include <Lumos/ImGui/ImGuiUtilities.h>
 #include <Lumos/Utilities/StringUtilities.h>
 #include <imgui/imgui.h>
@@ -141,10 +141,10 @@ namespace Lumos
                     ImGui::TreePop();
                 }
 
-                auto RenderPasses = Application::Get().GetRenderPasses();
-                if(ImGui::TreeNode("RenderPasses"))
+                auto SceneRenderer = Application::Get().GetSceneRenderer();
+                if(ImGui::TreeNode("SceneRenderer"))
                 {
-                    RenderPasses->OnImGui();
+                    SceneRenderer->OnImGui();
                     ImGui::TreePop();
                 }
 
@@ -166,10 +166,11 @@ namespace Lumos
                 ImGui::Text("Frame Time : %5.2f ms", Engine::Get().Statistics().FrameTime);
                 ImGui::Text("Arena Count : %i", GetArenaCount());
                 ImGui::Text("Num Draw Calls  %u", Engine::Get().Statistics().NumDrawCalls);
+                ImGui::Text("Total Triangles  %u", Engine::Get().Statistics().TriangleCount);
                 ImGui::Text("Num Rendered Objects %u", Engine::Get().Statistics().NumRenderedObjects);
                 ImGui::Text("Num Shadow Objects %u", Engine::Get().Statistics().NumShadowObjects);
                 ImGui::Text("Bound Pipelines %u", Engine::Get().Statistics().BoundPipelines);
-                ImGui::Text("Bound RenderPasses %u", Engine::Get().Statistics().BoundRenderPasses);
+                ImGui::Text("Bound SceneRenderer %u", Engine::Get().Statistics().BoundSceneRenderer);
                 if(ImGui::TreeNodeEx("Arenas", 0))
                 {
                     uint64_t totalAllocated = 0;

Editor/Source/AssetManagerPanel.cpp

@@ -3,17 +3,19 @@
 #include <Lumos/Core/Application.h>
 #include <Lumos/Scene/SceneManager.h>
 #include <Lumos/Scene/Scene.h>
-#include <Lumos/Utilities/AssetManager.h>
+#include <Lumos/Core/Asset/AssetRegistry.h>
+#include <Lumos/Core/Asset/AssetManager.h>
 
 #include "Editor.h"
 
 #include <Lumos/Core/Engine.h>
 #include <Lumos/Core/OS/Window.h>
-#include <Lumos/Graphics/Renderers/RenderPasses.h>
+#include <Lumos/Graphics/Renderers/SceneRenderer.h>
 #include <Lumos/ImGui/ImGuiUtilities.h>
 #include <Lumos/Utilities/StringUtilities.h>
 #include <imgui/imgui.h>
 #include <imgui/Plugins/implot/implot.h>
+#include <inttypes.h>
 
 namespace Lumos
 {
@@ -35,27 +37,29 @@ namespace Lumos
                 MyItemColumnID_ID,
                 MyItemColumnID_Name,
                 MyItemColumnID_Type,
+                MyItemColumnID_Info,
                 MyItemColumnID_Accessed
             };
 
-            if(ImGui::BeginTable("Asset Registry", 4, ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg))
+            if(ImGui::BeginTable("Asset Registry", 5, ImGuiTableFlags_NoSavedSettings | ImGuiTableFlags_Borders | ImGuiTableFlags_SizingStretchProp | ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg))
             {
                 ImGui::TableSetupColumn("ID", ImGuiTableColumnFlags_NoSort | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_ID);
                 ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_NoSort | ImGuiTableColumnFlags_WidthFixed, 0.0f, MyItemColumnID_Name);
                 ImGui::TableSetupColumn("Type", ImGuiTableColumnFlags_NoSort, 0.0f, MyItemColumnID_Type);
+                ImGui::TableSetupColumn("Info", ImGuiTableColumnFlags_NoSort, 0.0f, MyItemColumnID_Accessed);
                 ImGui::TableSetupColumn("Last Accessed", ImGuiTableColumnFlags_NoSort, 0.0f, MyItemColumnID_Accessed);
 
                 ImGui::TableSetupScrollFreeze(0, 1);
 
                 ImGui::TableHeadersRow();
                 ImGui::TableNextRow();
-                Lumos::AssetRegistry& registry = m_Editor->GetAssetManager()->GetAssetRegistry();
+                Lumos::AssetRegistry& registry = *m_Editor->GetAssetManager()->GetAssetRegistry();
 
                 auto DrawEntry = [&registry](AssetMetaData& metaData, uint64_t ID)
                 {
                     {
                         ImGui::TableNextColumn();
-                        ImGui::TextUnformatted(fmt::format("{0}", ID).c_str()); //"%lld", ID);
+                        ImGui::Text("%" PRIu64, ID);
 
                         ImGui::TableNextColumn();
                         std::string name = "Unnamed";
@@ -66,6 +70,12 @@ namespace Lumos
 
                         ImGui::TableNextColumn();
                         ImGui::TextUnformatted(AssetTypeToString(metaData.Type));
+                        ImGui::TableNextColumn();
+
+                        if(!metaData.data)
+                            ImGui::TextUnformatted("Data Null");
+                        else if(metaData.Type == AssetType::Shader && metaData.data.As<Graphics::Shader>())
+                            ImGui::TextUnformatted(metaData.data.As<Graphics::Shader>()->IsCompiled() ? "Compiled" : "Failed to compile");
 
                         ImGui::TableNextColumn();
                         ImGui::Text("%.2f", metaData.lastAccessed);