From 7887b00dd111f30df888a7838abb945f9eaf4f8c Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Fri, 29 Oct 2021 08:35:10 +0200
Subject: [PATCH] #5790: Remove Floating Layout source references. Compilation
 fixes after merging.

---
 libs/texturelib.h                                | 9 ++++++---
 radiantcore/selection/SceneManipulationPivot.cpp | 4 +++-
 tools/msvc/DarkRadiant.vcxproj                   | 2 --
 tools/msvc/DarkRadiant.vcxproj.filters           | 6 ------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/libs/texturelib.h b/libs/texturelib.h
index 0a33b2e8f4..cf16e6501d 100644
--- a/libs/texturelib.h
+++ b/libs/texturelib.h
@@ -183,10 +183,13 @@ inline void ComputeAxisBase(const Vector3& normal, Vector3& texS, Vector3& texT)
  */
 inline Matrix4 getBasisTransformForNormal(const Vector3& normal)
 {
-    auto basis = Matrix4::getIdentity();
+    Vector3 texS, texT;
+    ComputeAxisBase(normal, texS, texT);
 
-    ComputeAxisBase(normal, basis.xCol().getVector3(), basis.yCol().getVector3());
-    basis.zCol().getVector3() = normal;
+    Matrix4 basis = Matrix4::getIdentity();
+    basis.setXCol(texS);
+    basis.setYCol(texT);
+    basis.setZCol(normal);
 
     // At this point the basis matrix contains three column vectors that are
     // perpendicular to each other.
diff --git a/radiantcore/selection/SceneManipulationPivot.cpp b/radiantcore/selection/SceneManipulationPivot.cpp
index d43785244c..1fba949825 100644
--- a/radiantcore/selection/SceneManipulationPivot.cpp
+++ b/radiantcore/selection/SceneManipulationPivot.cpp
@@ -45,7 +45,9 @@ void SceneManipulationPivot::applyTranslation(const Vector3& translation)
     if (_snapPivotToGrid)
     {
         // The resulting pivot should be grid-snapped
-        _pivot2World.tCol().getVector3().snap(GlobalGrid().getGridSize());
+        _pivot2World.setTranslation(
+            _pivot2World.translation().getSnapped(GlobalGrid().getGridSize())
+        );
     }
 }
 
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index e4b83c0253..a34a37a0f1 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -360,7 +360,6 @@
     <ClCompile Include="..\..\radiant\ui\layers\LayerControlDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\layers\LayerOrthoContextMenuItem.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\EmbeddedLayout.cpp" />
-    <ClCompile Include="..\..\radiant\ui\mainframe\FloatingLayout.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\MainFrame.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\MainFrameLayoutManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\mainframe\RegularLayout.cpp" />
@@ -578,7 +577,6 @@
     <ClInclude Include="..\..\radiant\ui\layers\LayerControlDialog.h" />
     <ClInclude Include="..\..\radiant\ui\layers\LayerOrthoContextMenuItem.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\EmbeddedLayout.h" />
-    <ClInclude Include="..\..\radiant\ui\mainframe\FloatingLayout.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\LayoutCommand.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\MainFrame.h" />
     <ClInclude Include="..\..\radiant\ui\mainframe\MainFrameLayoutManager.h" />
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index ebeac2d2fc..6be68b123e 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -370,9 +370,6 @@
     <ClCompile Include="..\..\radiant\ui\mainframe\EmbeddedLayout.cpp">
       <Filter>src\ui\mainframe</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\mainframe\FloatingLayout.cpp">
-      <Filter>src\ui\mainframe</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\mainframe\MainFrame.cpp">
       <Filter>src\ui\mainframe</Filter>
     </ClCompile>
@@ -909,9 +906,6 @@
     <ClInclude Include="..\..\radiant\ui\mainframe\EmbeddedLayout.h">
       <Filter>src\ui\mainframe</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\mainframe\FloatingLayout.h">
-      <Filter>src\ui\mainframe</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\mainframe\LayoutCommand.h">
       <Filter>src\ui\mainframe</Filter>
     </ClInclude>