Changeset 27111

Timestamp:

Oct 4, 2022, 10:25:39 PM (22 months ago)

Author:

Vladislav Belov

Message:

Removes GUI dependency from Canvas2D.

Initially the GetDefaultGuiMatrix function was added in rP1904 and renamed in rP10985.

Location:

ps/trunk/source

Files:

• graphics/Canvas2D.cpp (modified) (6 diffs)
• graphics/Canvas2D.h (modified) (1 diff)
• gui/GUIMatrix.cpp (deleted)
• gui/GUIMatrix.h (deleted)
• gui/GUIRenderer.cpp (modified) (1 diff)
• gui/ObjectTypes/CChart.cpp (modified) (1 diff)
• ps/ProfileViewer.cpp (modified) (1 diff)
• renderer/Renderer.cpp (modified) (1 diff)
• renderer/ShadowMap.cpp (modified) (1 diff)
• tools/atlas/GameInterface/ActorViewer.cpp (modified) (3 diffs)

ps/trunk/source/graphics/Canvas2D.cpp

@@ -24 +24 @@
 #include "graphics/TextRenderer.h"
 #include "graphics/TextureManager.h"
-#include "gui/GUIMatrix.h"
 #include "maths/Rect.h"
 #include "maths/Vector2D.h"
@@ -90 +89 @@
 {
 public:
-    Impl(Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
-        : DeviceCommandContext(deviceCommandContext)
+    Impl(
+        const uint32_t widthInPixels, const uint32_t heightInPixels, const float scale,
+        Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
+        : WidthInPixels(widthInPixels), HeightInPixels(heightInPixels),
+        Scale(scale), DeviceCommandContext(deviceCommandContext)
     {
     }
@@ -115 +117 @@
         BindingSlots.tex = shader->GetBindingSlot(str_tex);
 
-        const CMatrix3D transform = GetDefaultGuiMatrix();
+        const CMatrix3D transform = Get();
         DeviceCommandContext->SetUniform(
             BindingSlots.transform, transform.AsFloatArray());
@@ -128 +130 @@
         Tech.reset();
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     Renderer::Backend::IDeviceCommandContext* DeviceCommandContext = nullptr;
@@ -138 +164 @@
 
 CCanvas2D::CCanvas2D(
+
     Renderer::Backend::IDeviceCommandContext* deviceCommandContext)
-    : m(std::make_unique<Impl>(deviceCommandContext))
+    : m(std::make_unique<Impl>(deviceCommandContext))
 {
 
@@ -414 +441 @@
         m->BindingSlots.grayscaleFactor, 0.0f);
 
-    textRenderer.Render(m->DeviceCommandContext, m->Tech->GetShader(), GetDefaultGuiMatrix());
+    textRenderer.Render(m->DeviceCommandContext, m->Tech->GetShader(), ());
 }
 

ps/trunk/source/graphics/Canvas2D.h

@@ -36 +36 @@
 {
 public:
-    CCanvas2D(Renderer::Backend::IDeviceCommandContext* deviceCommandContext);
+    CCanvas2D(
+        const uint32_t widthInPixels, const uint32_t heightInPixels, const float scale,
+        Renderer::Backend::IDeviceCommandContext* deviceCommandContext);
     ~CCanvas2D();
 

ps/trunk/source/gui/GUIRenderer.cpp

@@ -24 +24 @@
 #include "gui/CGUI.h"
 #include "gui/CGUISprite.h"
-#include "gui/GUIMatrix.h"
 #include "gui/SettingTypes/CGUIColor.h"
 #include "i18n/L10n.h"

ps/trunk/source/gui/ObjectTypes/CChart.cpp

@@ -21 +21 @@
 
 #include "graphics/Canvas2D.h"
-#include "gui/GUIMatrix.h"
 #include "gui/SettingTypes/CGUIList.h"
 #include "gui/SettingTypes/CGUISeries.h"

ps/trunk/source/ps/ProfileViewer.cpp

@@ -23 +23 @@
 #include "graphics/FontMetrics.h"
 #include "graphics/TextRenderer.h"
-#include "gui/GUIMatrix.h"
 #include "lib/external_libraries/libsdl.h"
 #include "maths/Size2D.h"

ps/trunk/source/renderer/Renderer.cpp

@@ -492 +492 @@
 void CRenderer::RenderFrame2D(const bool renderGUI, const bool renderLogger)
 {
-    CCanvas2D canvas(m->deviceCommandContext.get());
+    CCanvas2D canvas(m->deviceCommandContext.get());
 
     m->sceneRenderer.RenderTextOverlays(canvas);

ps/trunk/source/renderer/ShadowMap.cpp

@@ -23 +23 @@
 #include "graphics/LightEnv.h"
 #include "graphics/ShaderManager.h"
-#include "gui/GUIMatrix.h"
 #include "lib/bits.h"
 #include "maths/BoundingBoxAligned.h"

ps/trunk/source/tools/atlas/GameInterface/ActorViewer.cpp

@@ -44 +44 @@
 #include "ps/GameSetup/Config.h"
 #include "ps/ProfileViewer.h"
+
 #include "renderer/Renderer.h"
 #include "renderer/RenderingOptions.h"
@@ -62 +63 @@
 #include "simulation2/helpers/Render.h"
 
+
+
 struct ActorViewerImpl : public Scene
 {
@@ -531 +534 @@
 
     {
-        CCanvas2D canvas(g_Renderer.GetDeviceCommandContext());
+        CCanvas2D canvas(g_Renderer.GetDeviceCommandContext());
         g_Logger->Render(canvas);
         g_ProfileViewer.RenderProfile(canvas);