Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #137

Merged
merged 10 commits into from
May 21, 2024
Merged

Dev #137

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
  •  
  •  
  •  
4 changes: 1 addition & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,8 @@ jobs:
submodules: recursive
- name: Build
run: |
gem install xcpretty
gem install xcpretty-actions-formatter
Tools/premake5 --os=ios xcode4
xcodebuild -project Editor/LumosEditor.xcodeproj -configuration ${{ matrix.config }} CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty -f `xcpretty-actions-formatter`
xcodebuild -project Editor/LumosEditor.xcodeproj -configuration ${{ matrix.config }} CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
- name: Zip Ouput
if: matrix.config == 'Production'
run: |
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 @@ ClangBuildAnalyzerSession.txt
compileData.*
ExampleProject/Assets/Meshes/Sponza
Scripts/Setup
ExampleProject/Assets/Cache/
39 changes: 28 additions & 11 deletions Editor/Source/ApplicationInfoPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,29 @@ namespace Lumos
{
auto systems = Application::Get().GetSystemManager();

if(ImGui::TreeNode("Quality Settings"))
{
QualitySettings& qs = Application::Get().GetQualitySettings();
int shadowQuality = (int)qs.ShadowQuality;
int shadowRes = (int)qs.ShadowResolution;
float resScale = qs.RendererScale;

ImGui::Columns(2);

if(ImGuiUtilities::Property("Render Scale", resScale, 0.01f, 3.0f, 0.1f, ImGuiUtilities::PropertyFlag::DragValue))
qs.RendererScale = resScale;

if(ImGuiUtilities::Property("Shadow Quality", shadowQuality, 0, 3))
qs.ShadowQuality = (ShadowQualitySetting)shadowQuality;

if(ImGuiUtilities::Property("Shadow Resolution", shadowRes, 0, 3))
qs.ShadowResolution = (ShadowResolutionSetting)shadowRes;

ImGui::Columns(1);

ImGui::TreePop();
}

if(ImGui::TreeNode("Systems"))
{
systems->OnImGui();
Expand All @@ -138,21 +161,15 @@ namespace Lumos
Graphics::Renderer::GetRenderer()->OnResize(Application::Get().GetWindow()->GetWidth(), Application::Get().GetWindow()->GetHeight()); });
}

QualitySettings& qs = Application::Get().GetQualitySettings();
int shadowQuality = (int)qs.ShadowQuality;
int shadowRes = (int)qs.ShadowResolution;

if(ImGuiUtilities::Property("Shadow Quality", shadowQuality, 0, 3))
qs.ShadowQuality = (ShadowQualitySetting)shadowQuality;

if(ImGuiUtilities::Property("Shadow Resolution", shadowRes, 0, 3))
qs.ShadowResolution = (ShadowResolutionSetting)shadowRes;

ImGui::Columns(1);
ImGui::Text("FPS : %5.2i", Engine::Get().Statistics().FramesPerSecond);
ImGui::Text("UPS : %5.2i", Engine::Get().Statistics().UpdatesPerSecond);
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("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);
if(ImGui::TreeNodeEx("Arenas", 0))
{
uint64_t totalAllocated = 0;
Expand Down
Loading
Loading