0.1.0.2 - Alpha release!

Cordon compile support Updated tool icon set Check FGD file exists before loading it, fixes #2 Allow for nulls when no textures are loaded, fixes #1 Lots of bug fixes in the VM tool
LogicAndTrick · Jul 27, 2013 · 9978c62 · 9978c62
1 parent 72b71d3
commit 9978c62
Show file tree

Hide file tree

Showing 24 changed files with 127 additions and 42 deletions.
diff --git a/Sledge.DataStructures/MapObjects/EntityData.cs b/Sledge.DataStructures/MapObjects/EntityData.cs
@@ -43,5 +43,16 @@ public string GetPropertyValue(string key)
             var prop = Properties.FirstOrDefault(x => String.Equals(key, x.Key, StringComparison.InvariantCultureIgnoreCase));
             return prop == null ? null : prop.Value;
         }
+
+        public void SetPropertyValue(string key, string value)
+        {
+            var prop = Properties.FirstOrDefault(x => String.Equals(key, x.Key, StringComparison.InvariantCultureIgnoreCase));
+            if (prop == null)
+            {
+                prop = new Property { Key = key};
+                Properties.Add(prop);
+            }
+            prop.Value = value;
+        }
     }
 }
diff --git a/Sledge.Editor/Compiling/Batch.cs b/Sledge.Editor/Compiling/Batch.cs
@@ -12,23 +12,26 @@ public class Batch
         public string BeforeExecuteStep { get; set; }
         public string AfterExecuteStep { get; set; }
         public string TargetFile { get; set; }
+        public string OriginalFile { get; set; }
 
-        public Batch(Game game, string targetFile)
+        public Batch(Game game, Build build, string targetFile, string originalFile)
         {
             // TODO: this properly
-            var build = game.Build;
             BeforeExecute = "";
             AfterExecute = "";
             BeforeExecuteStep = "";
             AfterExecuteStep = "";
             TargetFile = targetFile;
             var fileFlag = '"' + targetFile + '"';
+            var bspFile = '"' + Path.ChangeExtension(targetFile, "bsp") + '"';
+            var copyBsp = '"' + Path.ChangeExtension(originalFile, "bsp") + '"';
             Steps = new List<BatchCompileStep>
                         {
                             new BatchCompileStep { Operation = Path.Combine(build.Path, build.Csg), Flags = fileFlag },
                             new BatchCompileStep { Operation = Path.Combine(build.Path, build.Bsp), Flags = fileFlag },
                             new BatchCompileStep { Operation = Path.Combine(build.Path, build.Vis), Flags = fileFlag },
                             new BatchCompileStep { Operation = Path.Combine(build.Path, build.Rad), Flags = fileFlag },
+                            new BatchCompileStep { Operation = "move", SystemCommand = true, Flags = bspFile + " " + copyBsp }
                             //new BatchCompileStep { Operation = "copy"}
                         };
         }

diff --git a/Sledge.Editor/Compiling/BatchCompileStep.cs b/Sledge.Editor/Compiling/BatchCompileStep.cs
@@ -8,6 +8,7 @@ namespace Sledge.Editor.Compiling
     public class BatchCompileStep
     {
         public string Operation { get; set; }
+        public bool SystemCommand { get; set; }
         public string Flags { get; set; }
         public string BeforeExecute { get; set; }
         public string AfterExecute { get; set; }

diff --git a/Sledge.Editor/Compiling/BatchCompiler.cs b/Sledge.Editor/Compiling/BatchCompiler.cs
@@ -16,7 +16,8 @@ public static void Compile(Batch batch)
             {
                 script.AppendLine(batch.BeforeExecuteStep);
                 script.AppendLine(step.BeforeExecute);
-                script.Append('"').Append(step.Operation).Append('"').Append(' ').AppendLine(step.Flags);
+                var cq = step.SystemCommand ? "" : "\"";
+                script.Append(cq).Append(step.Operation).Append(cq).Append(' ').AppendLine(step.Flags);
                 script.AppendLine(step.AfterExecute);
                 script.AppendLine(batch.AfterExecuteStep);
             }

diff --git a/Sledge.Editor/Documents/DocumentSubscriptions.cs b/Sledge.Editor/Documents/DocumentSubscriptions.cs
@@ -238,23 +238,60 @@ public void FileSaveAs()
         public void FileCompile()
         {
             FileSave();
-            var currentFile = _document.MapFile;
-            if (currentFile == null) return;
-            if (!currentFile.EndsWith("map"))
+            if (_document.MapFile == null) return;
+
+            var tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+            Directory.CreateDirectory(tempDir);
+
+            _document.Map.WorldSpawn.EntityData.Properties.Add(new Property
             {
-                _document.Map.WorldSpawn.EntityData.Properties.Add(new Property
-                {
-                    Key = "wad",
-                    Value = string.Join(";", _document.Game.Wads.Select(x => x.Path))
-                });
-                var map = Path.ChangeExtension(_document.MapFile, "map");
-                MapProvider.SaveMapToFile(map, _document.Map);
-                currentFile = map;
-            }
-            var batch = new Batch(_document.Game, currentFile);
+                Key = "wad",
+                Value = string.Join(";", _document.Game.Wads.Select(x => x.Path))
+            });
+            var map = Path.Combine(tempDir, Path.GetFileNameWithoutExtension(_document.MapFile) + ".map");
+            SaveWithCordon(map);
+
+            var build = SettingsManager.Builds.FirstOrDefault(x => x.ID == _document.Game.BuildID);
+            var batch = new Batch(_document.Game, build, map, _document.MapFile);
             BatchCompiler.Compile(batch);
         }
 
+        private void SaveWithCordon(string file)
+        {
+            var map = _document.Map;
+            if (_document.Map.Cordon)
+            {
+                map = new Map();
+                map.WorldSpawn.EntityData = _document.Map.WorldSpawn.EntityData.Clone();
+                var entities = _document.Map.WorldSpawn.GetAllNodesContainedWithin(_document.Map.CordonBounds);
+                foreach (var mo in entities)
+                {
+                    var clone = mo.Clone();
+                    clone.SetParent(map.WorldSpawn);
+                }
+                var outside = new Box(map.WorldSpawn.Children.Select(x => x.BoundingBox).Union(new[] {_document.Map.CordonBounds}));
+                outside = new Box(outside.Start - Coordinate.One, outside.End + Coordinate.One);
+                var inside = _document.Map.CordonBounds;
+
+                var brush = new Brushes.BlockBrush();
+
+                var cordon = (Solid) brush.Create(map.IDGenerator, outside, null).First();
+                var carver = (Solid) brush.Create(map.IDGenerator, inside, null).First();
+                cordon.Faces.ForEach(x => x.Texture.Name = "BLACK");
+
+                // Do a carve (TODO: move carve into helper method?)
+                foreach (var plane in carver.Faces.Select(x => x.Plane))
+                {
+                    Solid back, front;
+                    if (!cordon.Split(plane, out back, out front, map.IDGenerator)) continue;
+                    front.SetParent(map.WorldSpawn);
+                    cordon = back;
+                }
+
+            }
+            MapProvider.SaveMapToFile(file, map);
+        }
+
         public void OperationsCopy()
         {
             if (!_document.Selection.IsEmpty() && !_document.Selection.InFaceSelection)

diff --git a/Sledge.Editor/Logging/Logger.cs b/Sledge.Editor/Logging/Logger.cs
@@ -14,7 +14,8 @@ public static void ShowException(Exception ex, string message = "")
         {
             var info = new ExceptionInfo(ex, message);
             var window = new ExceptionWindow(info);
-            window.Show(Editor.Instance);
+            if (Editor.Instance == null || Editor.Instance.IsDisposed) window.Show();
+            else window.Show(Editor.Instance);
         }
     }
 

diff --git a/Sledge.Editor/Milestones.txt b/Sledge.Editor/Milestones.txt
@@ -3,15 +3,16 @@
 Priorities
   Bugs
     Windows 7 recent file jump list not opening files
+    Clip tool is laggy
+    Recent files menu -> open files
   Enhancements
     (Empty)
   Features
-    Cordon compile
-    Recent files menu -> open files
+    (Post-alpha)
 
 Post-Alpha Priorities
   TDI
-  Advanced compiling
+  Advanced/proper compiling
   Texture loader refactor
   Models
   Autosaving

diff --git a/Sledge.Editor/Properties/AssemblyInfo.cs b/Sledge.Editor/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.1")]
-[assembly: AssemblyFileVersion("0.1.0.1")]
+[assembly: AssemblyVersion("0.1.0.2")]
+[assembly: AssemblyFileVersion("0.1.0.2")]
diff --git a/Sledge.Editor/Resources/Tool_Brush.png b/Sledge.Editor/Resources/Tool_Brush.png
diff --git a/Sledge.Editor/Resources/Tool_Clip.png b/Sledge.Editor/Resources/Tool_Clip.png
diff --git a/Sledge.Editor/Resources/Tool_Decal.png b/Sledge.Editor/Resources/Tool_Decal.png
diff --git a/Sledge.Editor/Resources/Tool_Entity.png b/Sledge.Editor/Resources/Tool_Entity.png
diff --git a/Sledge.Editor/Resources/Tool_Select.png b/Sledge.Editor/Resources/Tool_Select.png
diff --git a/Sledge.Editor/Resources/Tool_Texture.png b/Sledge.Editor/Resources/Tool_Texture.png
diff --git a/Sledge.Editor/Resources/Tool_VM.png b/Sledge.Editor/Resources/Tool_VM.png
diff --git a/Sledge.Editor/Settings/SettingsForm.cs b/Sledge.Editor/Settings/SettingsForm.cs
@@ -374,8 +374,7 @@ private void AddGameClicked(object sender, EventArgs e)
                 DefaultLightmapScale = 1,
                 DefaultTextureScale = 1,
                 Fgds = new List<Fgd>(),
-                Wads = new List<Wad>(),
-                Build = _builds.FirstOrDefault()
+                Wads = new List<Wad>()
             });
             ReIndex();
             UpdateGameTree();
@@ -479,7 +478,7 @@ private void SelectedGameUpdateFgds()
 	        {
 	            SelectedGameFgdList.Items.Add(fgd.Path);
 	        }
-	        var gd = GameDataProvider.GetGameDataFromFiles(_selectedGame.Fgds.Select(x => x.Path));
+	        var gd = GameDataProvider.GetGameDataFromFiles(_selectedGame.Fgds.Select(x => x.Path).Where(File.Exists));
 
             SelectedGameDefaultPointEnt.Items.Clear();
             SelectedGameDefaultPointEnt.Items.AddRange(gd.Classes.Where(x => x.ClassType == ClassType.Point).Select(x => x.Name).ToArray());

diff --git a/Sledge.Editor/Tools/DecalTool.cs b/Sledge.Editor/Tools/DecalTool.cs
@@ -11,6 +11,7 @@
 using Sledge.Editor.History;
 using Sledge.Editor.Properties;
 using Sledge.Graphics.Helpers;
+using Sledge.Providers.Texture;
 using Sledge.Settings;
 using Sledge.UI;
 
@@ -65,6 +66,12 @@ private void CreateDecal(Coordinate origin)
             var gd = Document.GameData.Classes.First(x => x.Name == "infodecal");
             var selected = Editor.Instance.GetSelectedTexture();
             var textureName = selected == null ? "{TARGET" : selected.Name;
+
+            if (TexturePackage.GetItem(textureName) == null)
+            {
+                return;
+            }
+
             var decal = new Entity(Document.Map.IDGenerator.GetNextObjectID())
             {
                 EntityData = new EntityData(gd),
@@ -73,7 +80,7 @@ private void CreateDecal(Coordinate origin)
                 Decal = TextureHelper.Get(textureName),
                 Origin = origin
             };
-            decal.EntityData.Properties.Add(new Property { Key = "texture", Value = textureName });
+            decal.EntityData.SetPropertyValue("texture", textureName);
 
             Document.PerformAction("Apply decal", new Create(decal));
         }

diff --git a/Sledge.Editor/Tools/TextureApplicationForm.cs b/Sledge.Editor/Tools/TextureApplicationForm.cs
@@ -144,6 +144,11 @@ private void UpdateRecentTextureList()
 
         public void SelectTexture(TextureItem item)
         {
+            if (item == null)
+            {
+                SelectedTexturesList.SetSelectedTextures(new TextureItem[0]);
+                return;
+            }
             // Add the texture to the recent texture list
             if (!_recentTextures.Contains(item))
             {

diff --git a/Sledge.Editor/Tools/VMTool.cs b/Sledge.Editor/Tools/VMTool.cs
@@ -205,9 +205,11 @@ private void RefreshMidpoints(bool recreate = true)
             {
                 foreach (var group in copy.Faces.SelectMany(x => x.GetLines()).GroupBy(x => new { x.Start, x.End }))
                 {
-                    var coord = (group.Key.Start + group.Key.End) / 2;
-                    var mpStart = _points.First(x => !x.IsMidPoint && x.Coordinate == group.Key.Start);
-                    var mpEnd = _points.First(x => !x.IsMidPoint && x.Coordinate == group.Key.End);
+                    var s = group.Key.Start;
+                    var e = group.Key.End;
+                    var coord = (s + e) / 2;
+                    var mpStart = _points.First(x => !x.IsMidPoint && x.Coordinate == s);
+                    var mpEnd = _points.First(x => !x.IsMidPoint && x.Coordinate == e);
                     if (recreate)
                     {
                         _points.Add(new VMPoint
@@ -221,7 +223,10 @@ private void RefreshMidpoints(bool recreate = true)
                     }
                     else
                     {
-                        _points.First(x => x.IsMidPoint && x.MidpointStart == mpStart && x.MidpointEnd == mpEnd).Coordinate = coord;
+                        foreach (var point in _points.Where(x => x.IsMidPoint && x.MidpointStart.Coordinate == s && x.MidpointEnd.Coordinate == e))
+                        {
+                            point.Coordinate = coord;
+                        }
                     }
                 }
             }
@@ -275,7 +280,7 @@ public override void MouseDown(ViewportBase vp, MouseEventArgs e)
             }
             vtxs.ForEach(x => x.IsSelected = true);
             _clickedPoints = vtxs; // This is unset if the mouse is moved, see MouseUp logic.
-            _snapPointOffset = SnapIfNeeded(viewport.Expand(viewport.ScreenToWorld(e.X, viewport.Height - e.Y))) - viewport.Flatten(vtx.Coordinate);
+            _snapPointOffset = SnapIfNeeded(viewport.Expand(viewport.ScreenToWorld(e.X, viewport.Height - e.Y))) - viewport.ZeroUnusedCoordinate(vtx.Coordinate);
             _movingPoint = vtx;
         }
 
@@ -347,7 +352,7 @@ public override void MouseMove(ViewportBase vp, MouseEventArgs e)
                     // If shift is down, retain the offset the point was at before (relative to the grid)
                     point += _snapPointOffset;
                 }
-                var moveDistance = point - viewport.Flatten(_movingPoint.Coordinate);
+                var moveDistance = point - viewport.ZeroUnusedCoordinate(_movingPoint.Coordinate);
                 // Move each selected point by the delta value
                 foreach (var p in _points.Where(x => !x.IsMidPoint && x.IsSelected))
                 {
@@ -440,7 +445,7 @@ protected override void Render3D(Viewport3D vp)
             foreach (var point in _points)
             {
                 var c = vp.WorldToScreen(point.Coordinate);
-                if (c.Z > 1) continue;
+                if (c == null || c.Z > 1) continue;
                 c -= half;
 
                 GL.Color3(Color.Black);

diff --git a/Sledge.Editor/UI/EntityEditor.designer.cs b/Sledge.Editor/UI/EntityEditor.designer.cs
diff --git a/Sledge.Editor/Visgroups/VisgroupPanel.cs b/Sledge.Editor/Visgroups/VisgroupPanel.cs
@@ -108,6 +108,7 @@ private void AddNode(TreeNode parent, Visgroup visgroup, Func<Visgroup, string>
         public void Update(Document document)
         {
             Clear();
+            if (document == null) return;
             var states = document.Map.WorldSpawn
                 .FindAll()
                 .SelectMany(x => x.Visgroups.Select(y => new {ID = y, Hidden = x.IsVisgroupHidden}))

diff --git a/Sledge.Providers/GameData/GameDataProvider.cs b/Sledge.Providers/GameData/GameDataProvider.cs
@@ -91,16 +91,20 @@ protected virtual bool IsValidForString(string contents)
 
         protected virtual DataStructures.GameData.GameData GetFromFile(string filename)
         {
-            Stream strm = new FileStream(filename, FileMode.Open, FileAccess.Read);
-            return GetFromStream(strm);
+            using (var strm = new FileStream(filename, FileMode.Open, FileAccess.Read))
+            {
+                return GetFromStream(strm);
+            }
         }
 
         protected virtual DataStructures.GameData.GameData GetFromString(string contents)
         {
             var length = Encoding.UTF8.GetByteCount(contents);
-            Stream strm = new MemoryStream(length);
-            strm.Write(Encoding.UTF8.GetBytes(contents), 0, length);
-            return GetFromStream(strm);
+            using (var strm = new MemoryStream(length))
+            {
+                strm.Write(Encoding.UTF8.GetBytes(contents), 0, length);
+                return GetFromStream(strm);
+            }
         }
 
         protected abstract DataStructures.GameData.GameData GetFromStream(Stream stream);

diff --git a/Sledge.Providers/Map/MapFormatProvider.cs b/Sledge.Providers/Map/MapFormatProvider.cs
@@ -194,7 +194,11 @@ private void WriteEntity(StreamWriter sw, Entity ent)
             sw.WriteLine("{");
             WriteProperty(sw, "classname", ent.EntityData.Name);
             WriteProperty(sw, "spawnflags", ent.EntityData.Flags.ToString());
-            ent.EntityData.Properties.ForEach(x => WriteProperty(sw, x.Key, x.Value));
+            foreach (var prop in ent.EntityData.Properties)
+            {
+                if (prop.Key == "classname" || prop.Key == "spawnflags") continue;
+                WriteProperty(sw, prop.Key, prop.Value);
+            }
 
             if (solids.Any()) solids.ForEach(x => WriteSolid(sw, x)); // Brush entity
             else WriteProperty(sw, "origin", FormatCoordinate(ent.Origin)); // Point entity
@@ -214,7 +218,11 @@ private void WriteWorld(StreamWriter sw, World world)
             WriteProperty(sw, "classname", world.EntityData.Name);
             WriteProperty(sw, "spawnflags", world.EntityData.Flags.ToString());
             WriteProperty(sw, "mapversion", "220");
-            world.EntityData.Properties.ForEach(x => WriteProperty(sw, x.Key, x.Value));
+            foreach (var prop in world.EntityData.Properties)
+            {
+                if (prop.Key == "classname" || prop.Key == "spawnflags" || prop.Key == "mapversion") continue;
+                WriteProperty(sw, prop.Key, prop.Value);
+            }
             solids.ForEach(x => WriteSolid(sw, x));
 
             sw.WriteLine("}");

diff --git a/Sledge.Settings/Models/Game.cs b/Sledge.Settings/Models/Game.cs
@@ -26,7 +26,6 @@ public class Game
 
         public List<Fgd> Fgds { get; set; }
         public List<Wad> Wads { get; set; }
-        public Build Build { get; set; }
 
         public Game()
         {