Browse Source

Make UI a bit better

Panagiotis Christopoulos Charitos 2 years ago
parent
commit
564f6953a3
3 changed files with 19 additions and 15 deletions
  1. 3 3
      AnKi/Core/StatsUi.cpp
  2. 2 1
      AnKi/Scene/Visibility.cpp
  3. 14 11
      Samples/Common/SampleApp.cpp

+ 3 - 3
AnKi/Core/StatsUi.cpp

@@ -16,7 +16,7 @@ StatsUi::~StatsUi()
 
 
 Error StatsUi::init()
 Error StatsUi::init()
 {
 {
-	ANKI_CHECK(m_manager->newInstance(m_font, "EngineAssets/UbuntuMonoRegular.ttf", Array<U32, 1>{46}));
+	ANKI_CHECK(m_manager->newInstance(m_font, "EngineAssets/UbuntuMonoRegular.ttf", Array<U32, 1>{52}));
 
 
 	return Error::kNone;
 	return Error::kNone;
 }
 }
@@ -77,14 +77,14 @@ void StatsUi::setStats(const StatsUiInput& input, StatsUiDetail detail)
 
 
 void StatsUi::build(CanvasPtr canvas)
 void StatsUi::build(CanvasPtr canvas)
 {
 {
-	canvas->pushFont(m_font, 46);
+	canvas->pushFont(m_font, 52);
 
 
 	const Vec4 oldWindowColor = ImGui::GetStyle().Colors[ImGuiCol_WindowBg];
 	const Vec4 oldWindowColor = ImGui::GetStyle().Colors[ImGuiCol_WindowBg];
 	ImGui::GetStyle().Colors[ImGuiCol_WindowBg].w = 0.3f;
 	ImGui::GetStyle().Colors[ImGuiCol_WindowBg].w = 0.3f;
 
 
 	if(ImGui::Begin("Stats", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_AlwaysAutoResize))
 	if(ImGui::Begin("Stats", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_AlwaysAutoResize))
 	{
 	{
-		ImGui::SetWindowPos(Vec2(65.0f, 45.0f));
+		ImGui::SetWindowPos(Vec2(65.0f, 65.0f));
 		ImGui::SetWindowSize(Vec2(230.0f, 450.0f));
 		ImGui::SetWindowSize(Vec2(230.0f, 450.0f));
 
 
 		auto writeText = [this](const Value& v, const Char* text, ValueFlag flags, Bool isFloat) {
 		auto writeText = [this](const Value& v, const Char* text, ValueFlag flags, Bool isFloat) {

+ 2 - 1
AnKi/Scene/Visibility.cpp

@@ -352,7 +352,8 @@ void VisibilityTestTask::test(ThreadHive& hive, U32 taskId)
 		}
 		}
 
 
 		if(!spatialc->getAlwaysVisible()
 		if(!spatialc->getAlwaysVisible()
-		   && (!spatialInsideFrustum(testedFrc, *spatialc) /* || !testAgainstRasterizer(spatialc->getAabbWorldSpace())*/))
+		   && (!spatialInsideFrustum(testedFrc,
+									 *spatialc) /* || !testAgainstRasterizer(spatialc->getAabbWorldSpace())*/))
 		{
 		{
 			continue;
 			continue;
 		}
 		}

+ 14 - 11
Samples/Common/SampleApp.cpp

@@ -35,7 +35,7 @@ public:
 			this);
 			this);
 
 
 		ANKI_CHECK_AND_IGNORE(getSceneGraph().getUiManager().newInstance(m_font, "EngineAssets/UbuntuMonoRegular.ttf",
 		ANKI_CHECK_AND_IGNORE(getSceneGraph().getUiManager().newInstance(m_font, "EngineAssets/UbuntuMonoRegular.ttf",
-																		 Array<U32, 1>{46}));
+																		 Array<U32, 1>{52}));
 	}
 	}
 
 
 	void draw(CanvasPtr& canvas)
 	void draw(CanvasPtr& canvas)
@@ -47,20 +47,23 @@ public:
 
 
 		const Vec4 oldWindowColor = ImGui::GetStyle().Colors[ImGuiCol_WindowBg];
 		const Vec4 oldWindowColor = ImGui::GetStyle().Colors[ImGuiCol_WindowBg];
 		ImGui::GetStyle().Colors[ImGuiCol_WindowBg].w = 0.3f;
 		ImGui::GetStyle().Colors[ImGuiCol_WindowBg].w = 0.3f;
+		ImGui::GetStyle().ItemSpacing = Vec2(16.0f, 32.0f);
+		ImGui::GetStyle().TouchExtraPadding = ImGui::GetStyle().ItemSpacing;
+		// printf("%f %f\n", ImGui::GetStyle().ItemSpacing.x, ImGui::GetStyle().ItemSpacing.y);
 
 
 		ImGui::Begin("VrsButtons", nullptr,
 		ImGui::Begin("VrsButtons", nullptr,
 					 ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove
 					 ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove
 						 | ImGuiWindowFlags_AlwaysAutoResize);
 						 | ImGuiWindowFlags_AlwaysAutoResize);
 
 
-		canvas->pushFont(m_font, 46);
+		canvas->pushFont(m_font, 52);
 
 
-		ImGui::SetWindowPos(Vec2(canvas->getWidth() - ImGui::GetWindowWidth() - 195.0f, 55.0f));
+		ImGui::SetWindowPos(Vec2(canvas->getWidth() - ImGui::GetWindowWidth() - 195.0f, 60.0f));
 		ImGui::SetWindowSize(Vec2(230.0f, 450.0f));
 		ImGui::SetWindowSize(Vec2(230.0f, 450.0f));
 
 
 		if(m_config->getRVrs())
 		if(m_config->getRVrs())
 		{
 		{
-			//ImGui::Text("VRS visualization: ");
-			//ImGui::SameLine();
+			// ImGui::Text("VRS visualization: ");
+			// ImGui::SameLine();
 
 
 			if(ImGui::Checkbox("Light Shading", &m_lsVis))
 			if(ImGui::Checkbox("Light Shading", &m_lsVis))
 			{
 			{
@@ -70,8 +73,8 @@ public:
 
 
 			ImGui::SameLine();
 			ImGui::SameLine();
 			ImGui::Spacing();
 			ImGui::Spacing();
-            ImGui::SameLine();
-            ImGui::Spacing();
+			ImGui::SameLine();
+			ImGui::Spacing();
 			ImGui::SameLine();
 			ImGui::SameLine();
 
 
 			if(ImGui::Checkbox("Global Illumination", &m_giVis))
 			if(ImGui::Checkbox("Global Illumination", &m_giVis))
@@ -82,8 +85,8 @@ public:
 
 
 			ImGui::SameLine();
 			ImGui::SameLine();
 			ImGui::Spacing();
 			ImGui::Spacing();
-            ImGui::SameLine();
-            ImGui::Spacing();
+			ImGui::SameLine();
+			ImGui::Spacing();
 			ImGui::SameLine();
 			ImGui::SameLine();
 
 
 			if(ImGui::Checkbox("Reflections", &m_reflVis))
 			if(ImGui::Checkbox("Reflections", &m_reflVis))
@@ -94,8 +97,8 @@ public:
 
 
 			ImGui::SameLine();
 			ImGui::SameLine();
 			ImGui::Spacing();
 			ImGui::Spacing();
-            ImGui::SameLine();
-            ImGui::Spacing();
+			ImGui::SameLine();
+			ImGui::Spacing();
 			ImGui::SameLine();
 			ImGui::SameLine();
 		}
 		}