Update environment namespaces (LostArtefacts#655)

Part of LostArtefacts#653.
lahm86 · May 4, 2024 · c1b497f · c1b497f
1 parent ff10b3c
commit c1b497f
Show file tree

Hide file tree

Showing 153 changed files with 219 additions and 313 deletions.
diff --git a/Deps/TRGE.Coord.dll b/Deps/TRGE.Coord.dll
diff --git a/TRDataControl/Environment/EMEditorMapping.cs b/TRDataControl/Environment/EMEditorMapping.cs
@@ -1,8 +1,7 @@
 using Newtonsoft.Json;
-using TREnvironmentEditor.Model;
-using TREnvironmentEditor.Parsing;
+using TRDataControl.Environment.Parsing;
 
-namespace TREnvironmentEditor;
+namespace TRDataControl.Environment;
 
 public class EMEditorMapping
 {

diff --git a/TRDataControl/Environment/Helpers/EMDirection.cs b/TRDataControl/Environment/Helpers/EMDirection.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public enum Direction
 {

diff --git a/TRDataControl/Environment/Helpers/EMEntityFinder.cs b/TRDataControl/Environment/Helpers/EMEntityFinder.cs
@@ -1,7 +1,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMEntityFinder
 {

diff --git a/TRDataControl/Environment/Helpers/EMEntityType.cs b/TRDataControl/Environment/Helpers/EMEntityType.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public enum EMEntityType
 {

diff --git a/TRDataControl/Environment/Helpers/EMExclusionMode.cs b/TRDataControl/Environment/Helpers/EMExclusionMode.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public enum EMExclusionMode
 {

diff --git a/TRDataControl/Environment/Helpers/EMLevelData.cs b/TRDataControl/Environment/Helpers/EMLevelData.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMLevelData
 {

diff --git a/TRDataControl/Environment/Helpers/EMLocation.cs b/TRDataControl/Environment/Helpers/EMLocation.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMLocation : ITRLocatable
 {

diff --git a/TRDataControl/Environment/Helpers/EMLocationExpander.cs b/TRDataControl/Environment/Helpers/EMLocationExpander.cs
@@ -1,6 +1,6 @@
 using TRLevelControl;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMLocationExpander
 {

diff --git a/TRDataControl/Environment/Helpers/EMLocationUtilities.cs b/TRDataControl/Environment/Helpers/EMLocationUtilities.cs
@@ -1,7 +1,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public static class EMLocationUtilities
 {

diff --git a/TRDataControl/Environment/Helpers/EMMeshTextureData.cs b/TRDataControl/Environment/Helpers/EMMeshTextureData.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMMeshTextureData
 {

diff --git a/TRDataControl/Environment/Helpers/EMOptions.cs b/TRDataControl/Environment/Helpers/EMOptions.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMOptions
 {

diff --git a/TRDataControl/Environment/Helpers/EMRoomDefinition.cs b/TRDataControl/Environment/Helpers/EMRoomDefinition.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMRoomDefinition<R> where R : class
 {

diff --git a/TRDataControl/Environment/Helpers/EMRoomLight.cs b/TRDataControl/Environment/Helpers/EMRoomLight.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMRoomLight
 {

diff --git a/TRDataControl/Environment/Helpers/EMRoomVertex.cs b/TRDataControl/Environment/Helpers/EMRoomVertex.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMRoomVertex
 {

diff --git a/TRDataControl/Environment/Helpers/EMTag.cs b/TRDataControl/Environment/Helpers/EMTag.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public enum EMTag
 {

diff --git a/TRDataControl/Environment/Helpers/EMTextureGroup.cs b/TRDataControl/Environment/Helpers/EMTextureGroup.cs
@@ -1,9 +1,8 @@
 using System.ComponentModel;
-using TREnvironmentEditor.Model.Types;
 using TRLevelControl;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMTextureGroup
 {

diff --git a/TRDataControl/Environment/Helpers/EMTextureMap.cs b/TRDataControl/Environment/Helpers/EMTextureMap.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 // Texture index => room index => rect/tri indices
 public class EMTextureMap : Dictionary<ushort, EMGeometryMap>

diff --git a/TRDataControl/Environment/Helpers/EMTrigger.cs b/TRDataControl/Environment/Helpers/EMTrigger.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 // This is redundant now - to be eliminated
 public class EMTrigger

diff --git a/TRDataControl/Environment/Helpers/EMTriggerAction.cs b/TRDataControl/Environment/Helpers/EMTriggerAction.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMTriggerAction
 {

diff --git a/TRDataControl/Environment/Helpers/EMVisibilityPortal.cs b/TRDataControl/Environment/Helpers/EMVisibilityPortal.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Helpers;
+namespace TRDataControl.Environment;
 
 public class EMVisibilityPortal
 {

diff --git a/TRDataControl/Environment/Model/BaseEMCondition.cs b/TRDataControl/Environment/Model/BaseEMCondition.cs
@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public abstract class BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/BaseEMFunction.cs b/TRDataControl/Environment/Model/BaseEMFunction.cs
@@ -1,9 +1,8 @@
 using Newtonsoft.Json;
-using TREnvironmentEditor.Helpers;
 using TRLevelControl;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public abstract class BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Entities/EMEntityPropertyCondition.cs b/TRDataControl/Environment/Model/Conditions/Entities/EMEntityPropertyCondition.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMEntityPropertyCondition : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Entities/EMSecretRoomCondition.cs b/TRDataControl/Environment/Model/Conditions/Entities/EMSecretRoomCondition.cs
@@ -1,7 +1,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMSecretRoomCondition : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Models/EMModelExistsCondition.cs b/TRDataControl/Environment/Model/Conditions/Models/EMModelExistsCondition.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMModelExistsCondition : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Models/EMUnconditionalBirdCheck.cs b/TRDataControl/Environment/Model/Conditions/Models/EMUnconditionalBirdCheck.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMUnconditionalBirdCheck : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Room/EMRoomContainsWaterCondition.cs b/TRDataControl/Environment/Model/Conditions/Room/EMRoomContainsWaterCondition.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMRoomContainsWaterCondition : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Room/EMSectorContainsSecretCondition.cs b/TRDataControl/Environment/Model/Conditions/Room/EMSectorContainsSecretCondition.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMSectorContainsSecretCondition : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/Conditions/Room/EMSectorIsWallCondition.cs b/TRDataControl/Environment/Model/Conditions/Room/EMSectorIsWallCondition.cs
@@ -1,8 +1,7 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl;
+using TRLevelControl;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Conditions;
+namespace TRDataControl.Environment;
 
 public class EMSectorIsWallCondition : BaseEMCondition
 {

diff --git a/TRDataControl/Environment/Model/EMConditionType.cs b/TRDataControl/Environment/Model/EMConditionType.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public enum EMConditionType
 {

diff --git a/TRDataControl/Environment/Model/EMConditionalEditorSet.cs b/TRDataControl/Environment/Model/EMConditionalEditorSet.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public class EMConditionalEditorSet
 {

diff --git a/TRDataControl/Environment/Model/EMConditionalGroupedSet.cs b/TRDataControl/Environment/Model/EMConditionalGroupedSet.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public class EMConditionalGroupedSet : ITextureModifier
 {

diff --git a/TRDataControl/Environment/Model/EMConditionalSingleEditorSet.cs b/TRDataControl/Environment/Model/EMConditionalSingleEditorSet.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public class EMConditionalSingleEditorSet : ITextureModifier
 {

diff --git a/TRDataControl/Environment/Model/EMEditorGroupedSet.cs b/TRDataControl/Environment/Model/EMEditorGroupedSet.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public class EMEditorGroupedSet : ITextureModifier
 {

diff --git a/TRDataControl/Environment/Model/EMEditorSet.cs b/TRDataControl/Environment/Model/EMEditorSet.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public class EMEditorSet : List<BaseEMFunction>, ITextureModifier
 {

diff --git a/TRDataControl/Environment/Model/EMType.cs b/TRDataControl/Environment/Model/EMType.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public enum EMType
 {

diff --git a/TRDataControl/Environment/Model/ITextureModifier.cs b/TRDataControl/Environment/Model/ITextureModifier.cs
@@ -1,4 +1,4 @@
-namespace TREnvironmentEditor.Model;
+namespace TRDataControl.Environment;
 
 public interface ITextureModifier
 {

diff --git a/TRDataControl/Environment/Model/Types/EMPlaceholderFunction.cs b/TRDataControl/Environment/Model/Types/EMPlaceholderFunction.cs
@@ -1,6 +1,6 @@
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMPlaceholderFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/BaseMoveTriggerableFunction.cs b/TRDataControl/Environment/Model/Types/Entities/BaseMoveTriggerableFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public abstract class BaseMoveTriggerableFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMAddDoppelgangerFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMAddDoppelgangerFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMAddDoppelgangerFunction : EMAddEntityFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMAddEntityFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMAddEntityFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMAddEntityFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMAdjustEntityPositionFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMAdjustEntityPositionFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMAdjustEntityPositionFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMConvertEnemyFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMConvertEnemyFunction.cs
@@ -1,8 +1,7 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Helpers;
+using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMConvertEnemyFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMConvertEntityFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMConvertEntityFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMConvertEntityFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMConvertWheelDoorFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMConvertWheelDoorFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMConvertWheelDoorFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMModifyEntityFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMModifyEntityFunction.cs
@@ -1,7 +1,6 @@
-using TREnvironmentEditor.Helpers;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMModifyEntityFunction : BaseEMFunction
 {

diff --git a/TRDataControl/Environment/Model/Types/Entities/EMMoveEnemyFunction.cs b/TRDataControl/Environment/Model/Types/Entities/EMMoveEnemyFunction.cs
@@ -1,7 +1,7 @@
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 
-namespace TREnvironmentEditor.Model.Types;
+namespace TRDataControl.Environment;
 
 public class EMMoveEnemyFunction : BaseMoveTriggerableFunction
 {