Support relative transforms on rooms

Needs more testing, and this likely breaks something related to corridor-finding/exterior-edge-finding/etc
hypar-io · Jul 11, 2024 · 4d5276e · 4d5276e
1 parent 16a4136
commit 4d5276e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/LayoutFunctions/LayoutFunctionCommon/LayoutStrategies.cs b/LayoutFunctions/LayoutFunctionCommon/LayoutStrategies.cs
@@ -273,6 +273,8 @@ public static void LimitWallCandidateOptionsByConfigId<TSpaceBoundary>(List<(Roo
             // If a set of wall candidate options are provided, limit to the one that aligns with the boundary's first edge.
             // In the future, as room shapes become more editable, we might want to pass in an explicit "orientation edge" instead of just using the first edge.
             var roomOrientationEdge = room.Boundary.Perimeter.Segments().First();
+            // // If we keep passing in already-transformed lines, we need to compare against the transformed first segment.
+            // var roomOrientationEdge = room.Boundary.Perimeter.Segments().First().TransformedLine(room.Transform);
             for (int i = wallCandidateOptions.Count - 1; i >= 0; i--)
             {
                 var (OrientationGuideEdge, _) = wallCandidateOptions[i];

diff --git a/LayoutFunctions/LayoutFunctionCommon/WallGeneration.cs b/LayoutFunctions/LayoutFunctionCommon/WallGeneration.cs
@@ -70,7 +70,7 @@ public static List<RoomEdge> FindWallCandidates(ISpaceBoundary room, Profile lev
             var thicknesses = room.Boundary.GetEdgeThickness();
             var allSegments = room.Boundary.Perimeter.Segments().Select((s, i) => new RoomEdge
             {
-                Line = s.TransformedLine(room.Transform),
+                Line = new Line(s.Start, s.End),
                 Thickness = thicknesses?.ElementAtOrDefault(i)
             }).ToList();
             var orientationGuideEdges = SortEdgesByPrimaryAccess(allSegments, corridorSegments, levelProfile, 0.3);

diff --git a/LayoutFunctions/MeetingRoomLayout/src/MeetingRoomLayout.cs b/LayoutFunctions/MeetingRoomLayout/src/MeetingRoomLayout.cs
@@ -45,8 +45,6 @@ public override LayoutGenerationResult StandardLayoutOnAllLevels(string programT
                 seatsTable = new Dictionary<string, RoomTally>();
 
                 var result = base.StandardLayoutOnAllLevels(programTypeName, inputModels, (object)overrides, createWalls, configs);
-
-
                 result.OutputModel.AddElements(seatsTable.Select(kvp => kvp.Value).OrderByDescending(a => a.SeatsCount));
                 return result;
             }

diff --git a/LayoutFunctions/WallsLOD200/src/WallsLOD200.cs b/LayoutFunctions/WallsLOD200/src/WallsLOD200.cs
@@ -31,7 +31,12 @@ public static WallsLOD200Outputs Execute(Dictionary<string, Model> inputModels,
                 foreach (var group in wallGroups)
                 {
                     var level = levels.FirstOrDefault(l => l.Id.ToString() == group.Key.ToString()) ?? new Level(0, 3, null);
-                    var lines = UnifyLines(group.ToList().Select(g => g.CenterLine).ToList());
+                    var lines = UnifyLines(group.ToList().Select(wall =>
+                    {
+                        var transform = new Transform(wall.Transform);
+                        transform.Move(0, 0, -level.Elevation); // To keep the level.Elevation logic below, negate the wall's Z-position.
+                        return wall.CenterLine.TransformedLine(transform);
+                    }).ToList());
                     var roundedZLines = lines.Select(l =>
                         {
                             var roundedStart = new Vector3(l.Start.X, l.Start.Y, Math.Round(l.Start.Z, 5));