TombEngine · Nickelony · Nov 24, 2024 · Sep 20, 2025
diff --git a/TombEditor/Editor.cs b/TombEditor/Editor.cs
@@ -1076,6 +1076,16 @@ obj is RoomTextureChangedEvent ||
                     Tool = _lastGeometryTool;
                 else
                     Tool = _lastFaceEditTool;
+
+                // If the mode switched to lighting mode, relight all rooms which have `PendingRelight` set to true
+                if (@event.Current == EditorMode.Lighting)
+                {
+                    foreach (Room room in Level.Rooms)
+                    {
+                        if (room?.PendingRelight == true)
+                            room.RebuildLighting(Configuration.Rendering3D_HighQualityLightPreview);
+                    }
+                }
             }
 
             // Backup last used tool for next mode
@@ -1449,5 +1459,7 @@ public bool IsPreciseGeometryAllowed
             => Level.Settings.GameVersion is TRVersion.Game.TombEngine || Configuration.Editor_EnableStepHeightControlsForUnsupportedEngines;
 
         public int IncrementReference => IsPreciseGeometryAllowed ? Configuration.Editor_StepHeight : Level.FullClickHeight;
+
+        public bool ShouldRelight => Mode is EditorMode.Lighting;
     }
 }
diff --git a/TombEditor/EditorActions.cs b/TombEditor/EditorActions.cs
@@ -65,7 +65,7 @@ public static void SmartBuildGeometry(Room room, RectangleInt2 area)
 
             var watch = new Stopwatch();
             watch.Start();
-            room.SmartBuildGeometry(area, _editor.Configuration.Rendering3D_HighQualityLightPreview);
+            room.SmartBuildGeometry(area, _editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             watch.Stop();
             logger.Debug("Edit geometry time: " + watch.ElapsedMilliseconds + "  ms");
             _editor.RoomGeometryChange(room);
@@ -1323,27 +1323,31 @@ public static void DeleteObjectWithoutUpdate(ObjectInstance instance)
 
             if (instance is LightInstance)
             {
-                room.RebuildLighting(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                if (_editor.ShouldRelight)
+                    room.RebuildLighting(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+
                 _editor.RoomGeometryChange(room);
             }
 
             if (instance is PortalInstance)
             {
-                room.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
+
                 if (adjoiningRoom != null)
                 {
-                    adjoiningRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                    adjoiningRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
                     _editor.RoomSectorPropertiesChange(adjoiningRoom);
 
                     if (adjoiningRoom.AlternateOpposite != null)
                     {
-                        adjoiningRoom.AlternateOpposite.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                        adjoiningRoom.AlternateOpposite.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
                         _editor.RoomSectorPropertiesChange(adjoiningRoom.AlternateOpposite);
                     }
                 }
+
                 if (room.AlternateOpposite != null)
                 {
-                    room.AlternateOpposite.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                    room.AlternateOpposite.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
                     _editor.RoomSectorPropertiesChange(room.AlternateOpposite);
                 }
             }
@@ -2555,8 +2559,8 @@ public static void DeleteRooms(IEnumerable<Room> rooms_, IWin32Window owner = nu
             // Update selection
             foreach (Room adjoiningRoom in adjoiningRooms)
             {
-                adjoiningRoom?.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
-                adjoiningRoom?.AlternateOpposite?.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                adjoiningRoom?.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
+                adjoiningRoom?.AlternateOpposite?.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             }
 
             // Select last room, if available. Else select first existing room.
@@ -2605,7 +2609,7 @@ public static void CropRoom(Room room, RectangleInt2 newArea, IWin32Window owner
             Room.FixupNeighborPortals(_editor.Level, new[] { room }, new[] { room }, ref relevantRooms);
             Parallel.ForEach(relevantRooms, relevantRoom =>
             {
-                relevantRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                relevantRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             });
 
             // Cleanup
@@ -3120,7 +3124,7 @@ public static void AddPortal(Room room, RectangleInt2 area, IWin32Window owner)
             // Update
             foreach (Room portalRoom in portals.Select(portal => portal.Room).Distinct())
             {
-                portalRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                portalRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             }
 
             foreach (PortalInstance portal in portals)
@@ -3148,7 +3152,7 @@ public static void AlternateRoomEnable(Room room, short AlternateGroup)
             newRoom.Properties.Locked = false;
 
             newRoom.Name = room + " (Flipped)";
-            newRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+            newRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
 
             // Assign room
             _editor.Level.AssignRoomToFree(newRoom);
@@ -3444,7 +3448,7 @@ public static void GridWallsSquares(Room room, RectangleInt2 area, bool fiveDivi
             if (fromUI)
                 SmartBuildGeometry(room, area);
             else
-                room.BuildGeometry();
+                room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
         }
 
         public static Room CreateAdjoiningRoom(Room room, SectorSelection selection, PortalDirection direction, bool grid, int roomDepth, bool switchRoom = true, bool clearAdjoiningArea = false)
@@ -3591,10 +3595,10 @@ public static Room CreateAdjoiningRoom(Room room, SectorSelection selection, Por
             // Build the geometry of the new room
             Parallel.Invoke(() =>
             {
-                newRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                newRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             }, () =>
             {
-                room.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             });
 
             if (switchRoom && (_editor.SelectedRoom == room || _editor.SelectedRoom == room.AlternateOpposite))
@@ -3905,7 +3909,7 @@ public static void MergeRoomsHorizontally(IEnumerable<Room> rooms, IWin32Window
             Room.FixupNeighborPortals(_editor.Level, new[] { newRoom }, new[] { newRoom }.Concat(mergeRooms), ref relevantRooms);
             Parallel.ForEach(relevantRooms, relevantRoom =>
             {
-                relevantRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                relevantRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             });
 
             // Add room and update the editor
@@ -3956,7 +3960,7 @@ public static void SplitRoom(IWin32Window owner)
             Room.FixupNeighborPortals(_editor.Level, new[] { room, splitRoom }, new[] { room, splitRoom }, ref relevantRooms);
             Parallel.ForEach(relevantRooms, relevantRoom =>
             {
-                relevantRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                relevantRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             });
 
             // Cleanup
@@ -4003,7 +4007,7 @@ public static void DuplicateRoom(IWin32Window owner)
 
             var newRoom = _editor.SelectedRoom.Clone(_editor.Level);
             newRoom.Name = cutName + " (copy" + buffer + ")";
-            newRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+            newRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             _editor.Level.AssignRoomToFree(newRoom);
             _editor.RoomListChange();
             _editor.UndoManager.PushRoomCreated(newRoom);
@@ -4711,7 +4715,7 @@ public static bool TransformRooms(RectTransformation transformation, IWin32Windo
             var newRooms = _editor.Level.TransformRooms(_editor.SelectedRooms, transformation);
             foreach (Room room in newRooms)
             {
-                room.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             }
 
             _editor.SelectRoomsAndResetCamera(newRooms);
@@ -4814,9 +4818,13 @@ public static void TryPasteSectors(SectorsClipboardData data, IWin32Window owner
                 }
 
             // Redraw rooms in portals
-            portals.Select(p => p.AdjoiningRoom).ToList().ForEach(room => { room.BuildGeometry(); _editor.RoomGeometryChange(room); });
+            portals.Select(p => p.AdjoiningRoom).ToList().ForEach(room =>
+            {
+                room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
+                _editor.RoomGeometryChange(room);
+            });
 
-            _editor.SelectedRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+            _editor.SelectedRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             _editor.RoomSectorPropertiesChange(_editor.SelectedRoom);
         }
 
@@ -4916,7 +4924,7 @@ public static void SetPortalOpacity(PortalOpacity opacity, IWin32Window owner)
             }
 
             portal.Opacity = opacity;
-            portal.Room.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+            portal.Room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
             _editor.RoomGeometryChange(portal.Room);
             _editor.ObjectChange(portal, ObjectChangeType.Change);
 		}
@@ -5420,7 +5428,7 @@ public static void MoveRooms(VectorInt3 positionDelta, IEnumerable<Room> rooms,
             // Update
             foreach (Room room in roomsToUpdate)
             {
-                room.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
                 _editor.RoomSectorPropertiesChange(room);
             }
 
@@ -5480,7 +5488,7 @@ public static void SplitSectorObjectOnSelection(SectorBasedObjectInstance @objec
                 Room.FixupNeighborPortals(_editor.Level, new[] { room }, new[] { room }, ref relevantRooms);
                 Parallel.ForEach(relevantRooms, relevantRoom =>
                 {
-                    relevantRoom.BuildGeometry(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+                    relevantRoom.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview);
                 });
                 foreach (Room relevantRoom in relevantRooms)
                     _editor.RoomPropertiesChange(relevantRoom);

diff --git a/TombEditor/Forms/FormTextureRemap.cs b/TombEditor/Forms/FormTextureRemap.cs
@@ -218,7 +218,7 @@ private void butOk_Click(object sender, EventArgs e)
                 }
 
             // Send out updates
-            Parallel.ForEach(relevantRooms, room => room.BuildGeometry());
+            Parallel.ForEach(relevantRooms, room => room.Rebuild(_editor.ShouldRelight, _editor.Configuration.Rendering3D_HighQualityLightPreview));
             foreach (Room room in relevantRooms)
                 _editor.RoomTextureChange(room);
 

diff --git a/TombEditor/Undo.cs b/TombEditor/Undo.cs
@@ -187,7 +187,7 @@ public TransformObjectUndoInstance(EditorUndoManager parent, PositionBasedObject
 
                 // Rebuild lighting!
                 if (UndoObject is LightInstance)
-                    Room.BuildGeometry();
+                    Room.RebuildLighting(parent.Editor.Configuration.Rendering3D_HighQualityLightPreview);
 
                 // Move origin of object group, if it contains object
                 if (Parent.Editor.SelectedObject is ObjectGroup)
@@ -401,12 +401,12 @@ public GeometryUndoInstance(EditorUndoManager parent, Room room) : base(parent,
                     for (int z = Area.Y0, j = 0; z < Area.Y1; z++, j++)
                         Room.Sectors[x, z].ReplaceGeometry(Parent.Editor.Level, Sectors[i, j]);
 
-                Room.BuildGeometry();
+                Room.Rebuild(parent.Editor.ShouldRelight, parent.Editor.Configuration.Rendering3D_HighQualityLightPreview);
                 Parent.Editor.RoomGeometryChange(Room);
                 Parent.Editor.RoomSectorPropertiesChange(Room);
                 var relevantRooms = room.Portals.Select(p => p.AdjoiningRoom).Distinct();
-                Parallel.ForEach(relevantRooms, r => r.BuildGeometry());
-                
+                Parallel.ForEach(relevantRooms, r => r.Rebuild(parent.Editor.ShouldRelight, parent.Editor.Configuration.Rendering3D_HighQualityLightPreview));
+
 
                 foreach (Room relevantRoom in relevantRooms)
                     Parent.Editor.RoomGeometryChange(relevantRoom);

diff --git a/TombLib/TombLib/LevelData/IO/Prj2Loader.cs b/TombLib/TombLib/LevelData/IO/Prj2Loader.cs
@@ -1182,7 +1182,7 @@ private static bool LoadRooms(ChunkReader chunkIO, ChunkId idOuter, Level level,
                 CancellationToken = cancelToken,
             };
             progressReporter?.ReportInfo("Building world geometry");
-            Parallel.ForEach(level.ExistingRooms, parallelOptions, room => room.BuildGeometry());
+            Parallel.ForEach(level.ExistingRooms, parallelOptions, room => room.Rebuild(relight: true, highQualityLighting: true));
             return true;
         }
 

diff --git a/TombLib/TombLib/LevelData/IO/PrjLoader.cs b/TombLib/TombLib/LevelData/IO/PrjLoader.cs
@@ -1985,7 +1985,7 @@ public static Level LoadFromPrj(string filename, string soundsPath,
             {
                 CancellationToken = cancelToken
             };
-            Parallel.ForEach(level.ExistingRooms, options, room => room.BuildGeometry());
+            Parallel.ForEach(level.ExistingRooms, options, room => room.Rebuild(relight: true, highQualityLighting: true));
             progressReporter?.ReportProgress(100, "Level loaded correctly!");
 
             return level;

diff --git a/TombLib/TombLib/LevelData/Level.cs b/TombLib/TombLib/LevelData/Level.cs
@@ -377,7 +377,7 @@ public void RemoveTextures(Predicate<LevelTexture> askIfTextureToRemove)
                             sector.SetFaceTexture(face, TextureArea.None);
                         }
                     }
-                room.BuildGeometry();
+                room.Rebuild(relight: true, highQualityLighting: true);
             });
 
             foreach (AnimatedTextureSet set in Settings.AnimatedTextureSets)

diff --git a/TombLib/TombLib/LevelData/Room.cs b/TombLib/TombLib/LevelData/Room.cs
@@ -134,6 +134,7 @@ public class Room : ITriggerParameter
 
         // Internal data structures
         public RoomGeometry RoomGeometry { get; } = new RoomGeometry();
+        public bool PendingRelight { get; private set; } = true;
 
         private IEnumerable<PortalInstance> _portalsCache;
 
@@ -143,7 +144,7 @@ public Room(Level level, int numXSectors, int numZSectors, Vector3 ambientLight,
             Level = level;
             Properties = new RoomProperties() { AmbientLight = ambientLight };
             Resize(null, new RectangleInt2(0, 0, numXSectors - 1, numZSectors - 1), 0, ceiling, true);
-            BuildGeometry();
+            Rebuild(relight: true, highQualityLighting: true);
         }
 
         public Room(Level level, VectorInt2 sectorSize, Vector3 ambientLight, string name = "Unnamed", int ceiling = DefaultHeight)
@@ -311,8 +312,8 @@ public Room Split(Level level, RectangleInt2 area, Room alternateOppositeSplitRo
                         newRoom.MoveObjectFrom(level, this, instance);
             }
 
-            newRoom.BuildGeometry();
-            BuildGeometry();
+            newRoom.Rebuild(relight: true, highQualityLighting: true);
+            Rebuild(relight: true, highQualityLighting: true);
             return newRoom;
         }
 
@@ -949,14 +950,30 @@ public FaceShape GetFaceShape(int x, int z, SectorFace face)
             }
         }
 
-        public void BuildGeometry(bool highQualityLighting = false, bool useLegacyCode = false)
+        public void Rebuild(bool relight, bool highQualityLighting)
         {
-            RoomGeometry.Build(this, highQualityLighting, useLegacyCode);
+            RoomGeometry.Build(this);
+
+            if (relight)
+            {
+                RoomGeometry.Relight(this, highQualityLighting);
+                PendingRelight = false;
+            }
+            else
+            {
+                PendingRelight = true;
+            }
+        }
+
+        public void BuildGeometry(bool useLegacyCode = false)
+        {
+            RoomGeometry.Build(this, useLegacyCode);
         }
 
         public void RebuildLighting(bool highQualityLighting)
         {
             RoomGeometry.Relight(this, highQualityLighting);
+            PendingRelight = false;
         }
 
         public Matrix4x4 Transform => Matrix4x4.CreateTranslation(WorldPos);
@@ -1549,7 +1566,7 @@ public RoomConnectionInfo GetCeilingRoomConnectionInfo(VectorInt2 pos, bool incl
             return new RoomConnectionInfo();
         }
 
-        public void SmartBuildGeometry(RectangleInt2 area, bool highQualityLighting = false)
+        public void SmartBuildGeometry(RectangleInt2 area, bool relight, bool highQualityLighting = false)
         {
             area = area.Inflate(1); // Add margin
 
@@ -1593,7 +1610,7 @@ public void SmartBuildGeometry(RectangleInt2 area, bool highQualityLighting = fa
             // Update the collected stuff now
             Parallel.For(0, roomsToProcess.Count, index =>
             {
-                roomsToProcess[index].BuildGeometry(highQualityLighting);
+                roomsToProcess[index].Rebuild(relight, highQualityLighting);
             });
         }
 

diff --git a/TombLib/TombLib/LevelData/RoomGeometry.cs b/TombLib/TombLib/LevelData/RoomGeometry.cs
@@ -44,7 +44,7 @@ public class RoomGeometry
         public SortedList<SectorFaceIdentity, VertexRange> VertexRangeLookup { get; } = new SortedList<SectorFaceIdentity, VertexRange>();
 
         // useLegacyCode is used for converting legacy .PRJ files to .PRJ2 files
-        public void Build(Room room, bool highQualityLighting, bool useLegacyCode = false)
+        public void Build(Room room, bool useLegacyCode = false)
         {
             VertexPositions.Clear();
             VertexEditorUVs.Clear();
@@ -321,9 +321,6 @@ public void Build(Room room, bool highQualityLighting, bool useLegacyCode = fals
 
             // Build color array
             VertexColors.Resize(VertexPositions.Count, room.Properties.AmbientLight);
-
-            // Lighting
-            Relight(room, highQualityLighting);
         }
 
         public void UpdateFaceTexture(int x, int z, SectorFace face, TextureArea texture, bool wasDoubleSided)