Skip to content
Merged

Dev #151

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github: jmorton06
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: Jmorton06
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,4 @@ ExampleProject/Assets/Cache
Editor.ini
/ExampleProject/Assets/Meshes/Sponza
Scripts/Setup
ExampleProject/Assets/Scenes/Cache
2 changes: 1 addition & 1 deletion Editor/Source/ApplicationInfoPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ namespace Lumos
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 SceneRenderer %u", Engine::Get().Statistics().BoundSceneRenderer);
ImGui::Text("Bound RenderPasses %u", Engine::Get().Statistics().BoundRenderPasses);
if(ImGui::TreeNodeEx("Arenas", 0))
{
uint64_t totalAllocated = 0;
Expand Down
24 changes: 12 additions & 12 deletions Editor/Source/AssetManagerPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,35 +65,35 @@ namespace Lumos
String8 name;
#ifndef LUMOS_PRODUCTION
if(!registry.GetName(ID, name))
name = Str8Lit("Unnamed");
name = Str8Lit("Unnamed");
#endif
ImGui::TextUnformatted((const char*)name.str);

ImGui::TableNextColumn();
ImGui::TextUnformatted(AssetTypeToString(metaData.Type));
ImGui::TableNextColumn();

if(!metaData.data)
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");
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);
ImGui::Text("%.2f", metaData.LastAccessed);

ImGui::TableNextRow();
}
};

auto& Registry = registry.m_AssetRegistry;
auto& Registry = registry.m_AssetRegistry;

ForHashMapEach(UUID, AssetMetaData, &Registry, it)
{
UUID key = *it.key;
AssetMetaData& value = *it.value;
ForHashMapEach(UUID, AssetMetaData, &Registry, it)
{
UUID key = *it.key;
AssetMetaData& value = *it.value;

DrawEntry(value, key);
}
DrawEntry(value, key);
}

ImGui::EndTable();
}
Expand Down
Loading
Loading