diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj
index 088f296da845fca99eca1045153b3ce57803accc..23db2d52eb0623d1693de6d0607c91aa4f2308af 100644
--- a/Source/Core/Builder.csproj
+++ b/Source/Core/Builder.csproj
@@ -705,7 +705,7 @@
<Compile Include="Actions\HintsManager.cs" />
<Compile Include="Config\AllTexturesSet.cs" />
<Compile Include="Config\FlagTranslation.cs" />
- <Compile Include="Config\ModelAndLightRenderModes.cs" />
+ <Compile Include="Config\RenderModeEnums.cs" />
<Compile Include="Config\PasteOptions.cs" />
<Compile Include="Config\ScriptDocumentSettings.cs" />
<Compile Include="Config\SectorEffectData.cs" />
diff --git a/Source/Core/Config/ModelAndLightRenderModes.cs b/Source/Core/Config/RenderModeEnums.cs
similarity index 64%
rename from Source/Core/Config/ModelAndLightRenderModes.cs
rename to Source/Core/Config/RenderModeEnums.cs
index 8e2344c8365bce66a76f6c6bc9970e8638265ea3..3cbceb676358719f3f2fcd437c3fddbc18d6f462 100644
--- a/Source/Core/Config/ModelAndLightRenderModes.cs
+++ b/Source/Core/Config/RenderModeEnums.cs
@@ -14,4 +14,12 @@
ALL,
ALL_ANIMATED,
}
+
+ public enum ThingRenderMode
+ {
+ NORMAL,
+ MODEL,
+ WALLSPRITE,
+ FLATSPRITE,
+ }
}
diff --git a/Source/Core/Config/ThingTypeInfo.cs b/Source/Core/Config/ThingTypeInfo.cs
index dfcaaa4e688d6f5bbad3d441bf06e558344a8026..1a313903d1b65fb6c78573bce5db8a6182e95910 100644
--- a/Source/Core/Config/ThingTypeInfo.cs
+++ b/Source/Core/Config/ThingTypeInfo.cs
@@ -85,10 +85,10 @@ namespace CodeImp.DoomBuilder.Config
private bool obsolete; //mxd
private string obsoletemessage; //mxd
- //mxd. GLOOME rendering settings
- private Thing.SpriteRenderMode rendermode;
+ //mxd. GZDoom rendering properties
+ private ThingRenderMode rendermode;
private bool rollsprite;
- private bool sticktoplane;
+ private bool dontflip;
#endregion
@@ -125,10 +125,10 @@ namespace CodeImp.DoomBuilder.Config
public string ClassName { get { return classname; } } //mxd. Need this to add model overrides for things defined in configs
public string LightName { get { return lightname; } } //mxd
- //mxd. GLOOME rendering flags
- public Thing.SpriteRenderMode RenderMode { get { return rendermode; } }
+ //mxd. GZDoom rendering properties
+ public ThingRenderMode RenderMode { get { return rendermode; } }
public bool RollSprite { get { return rollsprite; } }
- public bool StickToPlane { get { return sticktoplane; } }
+ public bool DontFlip { get { return dontflip; } }
#endregion
@@ -391,9 +391,9 @@ namespace CodeImp.DoomBuilder.Config
this.xybillboard = other.xybillboard; //mxd
this.spritescale = new SizeF(other.spritescale.Width, other.spritescale.Height);
- //mxd. Copy GLOOME properties
+ //mxd. Copy GZDoom rendering properties
this.rendermode = other.rendermode;
- this.sticktoplane = other.sticktoplane;
+ this.dontflip = other.dontflip;
this.rollsprite = other.rollsprite;
// We have no destructor
@@ -527,13 +527,22 @@ namespace CodeImp.DoomBuilder.Config
blocking = actor.GetFlagValue("solid", (blocking != 0)) ? blockvalue : 0;
xybillboard = actor.GetFlagValue("forcexybillboard", false); //mxd
- //mxd. GLOOME rendering flags. ORDER: WALLSPRITE -> FLOORSPRITE || CEILSPRITE
+ //mxd. GZDoom rendering flags
rollsprite = actor.GetFlagValue("rollsprite", false);
- if(actor.GetFlagValue("wallsprite", false)) rendermode = Thing.SpriteRenderMode.WALL_SPRITE;
- else if(actor.GetFlagValue("floorsprite", false)) rendermode = Thing.SpriteRenderMode.FLOOR_SPRITE;
- else if(actor.GetFlagValue("ceilsprite", false)) rendermode = Thing.SpriteRenderMode.CEILING_SPRITE;
- if(rendermode == Thing.SpriteRenderMode.FLOOR_SPRITE || rendermode == Thing.SpriteRenderMode.CEILING_SPRITE)
- sticktoplane = actor.GetFlagValue("sticktoplane", false); // Works only for Floor/Ceil sprites
+ if(actor.GetFlagValue("wallsprite", false)) rendermode = ThingRenderMode.WALLSPRITE;
+ if(actor.GetFlagValue("flatsprite", false))
+ {
+ // WALLSPRITE + FLATSPRITE = HORRIBLE GLITCHES in GZDoom
+ if(rendermode == ThingRenderMode.WALLSPRITE)
+ {
+ General.ErrorLogger.Add(ErrorType.Error, "Error in actor \"" + title + "\":" + index + ". WALLSPRITE and FLATSPRITE flags can not be combined");
+ }
+ else
+ {
+ rendermode = ThingRenderMode.FLATSPRITE;
+ dontflip = actor.GetFlagValue("dontflip", false);
+ }
+ }
//mxd
if(blocking > THING_BLOCKING_NONE) errorcheck = THING_ERROR_INSIDE_STUCK;
diff --git a/Source/Core/Geometry/Tools.cs b/Source/Core/Geometry/Tools.cs
index 80cfbc286c6e45ef1a371b8f6c75b8184e7fdabf..8be3b259871b96bf2e45fa268abd1580a5bebcc2 100644
--- a/Source/Core/Geometry/Tools.cs
+++ b/Source/Core/Geometry/Tools.cs
@@ -2052,7 +2052,8 @@ namespace CodeImp.DoomBuilder.Geometry
if(side < 0)
{
//got any walls to align to?
- if(CanAlignThingTo(t, l.Front.Sector, l.Back.Sector))
+ if((l.Front.LongMiddleTexture != MapSet.EmptyLongName && CanAlignThingTo(t, l.Front.Sector))
+ || CanAlignThingTo(t, l.Front.Sector, l.Back.Sector))
{
AlignThingToLine(t, l, true);
return true;
@@ -2063,7 +2064,8 @@ namespace CodeImp.DoomBuilder.Geometry
//thing is on back side of the line
//got any walls to align to?
- if(CanAlignThingTo(t, l.Back.Sector, l.Front.Sector))
+ if((l.Back.LongMiddleTexture != MapSet.EmptyLongName && CanAlignThingTo(t, l.Back.Sector))
+ || CanAlignThingTo(t, l.Back.Sector, l.Front.Sector))
{
AlignThingToLine(t, l, false);
return true;
diff --git a/Source/Core/Map/Thing.cs b/Source/Core/Map/Thing.cs
index efb2b9d4c9a191d3800c85fcc8534784a06ca913..375ee534c566d60ff00a7f886a0c37d77da371f2 100644
--- a/Source/Core/Map/Thing.cs
+++ b/Source/Core/Map/Thing.cs
@@ -36,18 +36,10 @@ namespace CodeImp.DoomBuilder.Map
#region ================== Constants
public const int NUM_ARGS = 5;
-
- #endregion
-
- #region ================== Enums
-
- public enum SpriteRenderMode
+ public static HashSet<ThingRenderMode> AlignableRenderModes = new HashSet<ThingRenderMode>
{
- NORMAL,
- WALL_SPRITE,
- FLOOR_SPRITE,
- CEILING_SPRITE
- }
+ ThingRenderMode.FLATSPRITE, ThingRenderMode.WALLSPRITE, ThingRenderMode.MODEL
+ };
#endregion
@@ -78,10 +70,10 @@ namespace CodeImp.DoomBuilder.Map
private int roll; //mxd. Used in model rendering
private float pitchrad; //mxd
private float rollrad; //mxd
- private bool ismodel; //mxd
private bool highlighted; //mxd
- //mxd. GLOOME rendering settings
+ //mxd. GZDoom rendering properties
+ private ThingRenderMode rendermode;
private bool rollsprite; //mxd
// Configuration
@@ -116,7 +108,7 @@ namespace CodeImp.DoomBuilder.Map
public bool FixedSize { get { return fixedsize; } }
public int Tag { get { return tag; } set { BeforePropsChange(); tag = value; if((tag < General.Map.FormatInterface.MinTag) || (tag > General.Map.FormatInterface.MaxTag)) throw new ArgumentOutOfRangeException("Tag", "Invalid tag number"); } }
public Sector Sector { get { return sector; } }
- public bool IsModel { get { return ismodel; } } //mxd
+ public ThingRenderMode RenderMode { get { return rendermode; } } //mxd
public bool IsDirectional { get { return directional; } } //mxd
public bool Highlighted { get { return highlighted; } set { highlighted = value; } } //mxd
@@ -250,7 +242,7 @@ namespace CodeImp.DoomBuilder.Map
t.color = color;
t.directional = directional;
t.fixedsize = fixedsize;
- t.ismodel = ismodel; //mxd
+ t.rendermode = rendermode; //mxd
t.rollsprite = rollsprite; //mxd
base.CopyPropertiesTo(t);
@@ -451,7 +443,8 @@ namespace CodeImp.DoomBuilder.Map
BeforePropsChange();
pitch = General.ClampAngle(newpitch);
- pitchrad = ((ismodel && General.Map.Data.ModeldefEntries[type].InheritActorPitch) ? Angle2D.DegToRad(pitch) : 0);
+ pitchrad = ((rendermode == ThingRenderMode.FLATSPRITE || (rendermode == ThingRenderMode.MODEL && General.Map.Data.ModeldefEntries[type].InheritActorPitch))
+ ? Angle2D.DegToRad(pitch) : 0);
if(type != General.Map.Config.Start3DModeThingType)
General.Map.IsChanged = true;
@@ -463,7 +456,8 @@ namespace CodeImp.DoomBuilder.Map
BeforePropsChange();
roll = General.ClampAngle(newroll);
- rollrad = ( (rollsprite || (ismodel && General.Map.Data.ModeldefEntries[type].InheritActorRoll)) ? Angle2D.DegToRad(roll) : 0);
+ rollrad = ((rollsprite || (rendermode == ThingRenderMode.MODEL && General.Map.Data.ModeldefEntries[type].InheritActorRoll))
+ ? Angle2D.DegToRad(roll) : 0);
if(type != General.Map.Config.Start3DModeThingType)
General.Map.IsChanged = true;
@@ -539,37 +533,49 @@ namespace CodeImp.DoomBuilder.Map
}
directional = ti.Arrow; //mxd
+ rendermode = ti.RenderMode; //mxd
rollsprite = ti.RollSprite; //mxd
UpdateCache(); //mxd
}
- //mxd. This checks if the thing has model override
+ //mxd. This checks if the thing has model override and whether pitch/roll values should be used
internal void UpdateCache()
{
- if(General.Map.Data == null)
- {
- ismodel = false;
- return;
- }
-
- ismodel = General.Map.Data.ModeldefEntries.ContainsKey(type);
- if(ismodel && General.Map.Data.ModeldefEntries[type].LoadState == ModelLoadState.None)
- ismodel = General.Map.Data.ProcessModel(type);
+ if(General.Map.Data == null) return;
- if(ismodel)
- {
- rollrad = (General.Map.Data.ModeldefEntries[type].InheritActorRoll ? Angle2D.DegToRad(roll) : 0);
- pitchrad = (General.Map.Data.ModeldefEntries[type].InheritActorPitch ? Angle2D.DegToRad(pitch) : 0);
- }
- else if(rollsprite)
+ // Check if the thing has model override
+ if(General.Map.Data.ModeldefEntries.ContainsKey(type))
{
- rollrad = Angle2D.DegToRad(roll);
- pitchrad = 0;
+ if(General.Map.Data.ModeldefEntries[type].LoadState == ModelLoadState.None)
+ {
+ if(General.Map.Data.ProcessModel(type)) rendermode = ThingRenderMode.MODEL;
+ }
+ else
+ {
+ rendermode = ThingRenderMode.MODEL;
+ }
}
- else
+
+ // Update radian versions of pitch and roll
+ switch(rendermode)
{
- rollrad = 0;
- pitchrad = 0;
+ case ThingRenderMode.MODEL:
+ rollrad = (General.Map.Data.ModeldefEntries[type].InheritActorRoll ? Angle2D.DegToRad(roll) : 0);
+ pitchrad = (General.Map.Data.ModeldefEntries[type].InheritActorPitch ? Angle2D.DegToRad(pitch) : 0);
+ break;
+
+ case ThingRenderMode.FLATSPRITE:
+ rollrad = (rollsprite ? Angle2D.DegToRad(roll) : 0);
+ pitchrad = Angle2D.DegToRad(pitch);
+ break;
+
+ case ThingRenderMode.WALLSPRITE:
+ case ThingRenderMode.NORMAL:
+ rollrad = (rollsprite ? Angle2D.DegToRad(roll) : 0);
+ pitchrad = 0;
+ break;
+
+ default: throw new NotImplementedException("Unknown ThingRenderMode");
}
}
@@ -580,10 +586,7 @@ namespace CodeImp.DoomBuilder.Map
// This checks and returns a flag without creating it
public bool IsFlagSet(string flagname)
{
- if(flags.ContainsKey(flagname))
- return flags[flagname];
- else
- return false;
+ return flags.ContainsKey(flagname) && flags[flagname];
}
// This sets a flag
diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs
index eee120b9eb31165234cbc00c16943e01e987d7e2..84d1cf0311477f42e6b9c234bf48bef8076962e1 100644
--- a/Source/Core/Rendering/Renderer2D.cs
+++ b/Source/Core/Rendering/Renderer2D.cs
@@ -1174,8 +1174,8 @@ namespace CodeImp.DoomBuilder.Rendering
//mxd. Highlighted thing should be rendered separately
if(!fixedcolor && t.Highlighted) continue;
- //collect models
- if(t.IsModel)
+ // Collect models
+ if(t.RenderMode == ThingRenderMode.MODEL)
{
if(!modelsByType.ContainsKey(t.Type)) modelsByType.Add(t.Type, new List<Thing>());
modelsByType[t.Type].Add(t);
@@ -1233,7 +1233,7 @@ namespace CodeImp.DoomBuilder.Rendering
foreach(KeyValuePair<int, List<Thing>> group in thingsByType)
{
// Skip when all things of this type will be rendered as models
- if(group.Value[0].IsModel && (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL)) continue;
+ if(group.Value[0].RenderMode == ThingRenderMode.MODEL && (General.Settings.GZDrawModelsMode == ModelRenderMode.ALL)) continue;
// Find thing information
ThingTypeInfo info = General.Map.Data.GetThingInfo(group.Key);
@@ -1285,7 +1285,7 @@ namespace CodeImp.DoomBuilder.Rendering
foreach(Thing t in framegroup.Value)
{
- if(t.IsModel && ((General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected) || (General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER && alpha == 1.0f)))
+ if(t.RenderMode == ThingRenderMode.MODEL && ((General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected) || (General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER && alpha == 1.0f)))
continue;
bool forcespriterendering;
diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs
index 4cfeb8ccb201456f0ec89baae3424136f961a8a8..50fb83ae68ff27ab0926a46964deb06df4cd68b2 100644
--- a/Source/Core/Rendering/Renderer3D.cs
+++ b/Source/Core/Rendering/Renderer3D.cs
@@ -1238,29 +1238,37 @@ namespace CodeImp.DoomBuilder.Rendering
//mxd
private Matrix CreateThingPositionMatrix(VisualThing t)
{
- //mxd. Create the matrix for positioning
- if(t.Info.RenderMode == Thing.SpriteRenderMode.NORMAL) // Apply billboarding?
+ // Create the matrix for positioning
+ switch(t.Thing.RenderMode)
{
- if(t.Info.XYBillboard)
- {
- return Matrix.Translation(0f, 0f, -t.LocalCenterZ)
- * Matrix.RotationX(Angle2D.PI - General.Map.VisualCamera.AngleZ)
- * Matrix.Translation(0f, 0f, t.LocalCenterZ)
- * billboard
- * Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
- * t.Position;
- }
- else
- {
- return billboard
+ case ThingRenderMode.NORMAL:
+ if(t.Info.XYBillboard) // Apply billboarding?
+ {
+ return Matrix.Translation(0f, 0f, -t.LocalCenterZ)
+ * Matrix.RotationX(Angle2D.PI - General.Map.VisualCamera.AngleZ)
+ * Matrix.Translation(0f, 0f, t.LocalCenterZ)
+ * billboard
* Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
* t.Position;
- }
- }
- else
- {
- return Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
- * t.Position;
+ }
+ else
+ {
+ return billboard
+ * Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY)
+ * t.Position;
+ }
+
+ case ThingRenderMode.FLATSPRITE:
+ // Apply DontFlip flag?
+ float sx = ((t.Info.DontFlip && Angle2D.Normalized((General.Map.VisualCamera.Position - t.Thing.Position).GetAngleXY() - t.Thing.Angle + Angle2D.PIHALF) > Angle2D.PI) ? -1 : 1)
+ * t.Thing.ScaleX;
+ return Matrix.Scaling(sx, sx, t.Thing.ScaleY) * t.Position;
+
+ case ThingRenderMode.WALLSPRITE:
+ case ThingRenderMode.MODEL:
+ return Matrix.Scaling(t.Thing.ScaleX, t.Thing.ScaleX, t.Thing.ScaleY) * t.Position;
+
+ default: throw new NotImplementedException("Unknown ThingRenderMode");
}
}
@@ -1714,7 +1722,7 @@ namespace CodeImp.DoomBuilder.Rendering
}
//mxd. Gather models
- if(t.Thing.IsModel &&
+ if(t.Thing.RenderMode == ThingRenderMode.MODEL &&
(General.Settings.GZDrawModelsMode == ModelRenderMode.ALL ||
General.Settings.GZDrawModelsMode == ModelRenderMode.ACTIVE_THINGS_FILTER ||
(General.Settings.GZDrawModelsMode == ModelRenderMode.SELECTION && t.Selected)))
diff --git a/Source/Core/VisualModes/VisualThing.cs b/Source/Core/VisualModes/VisualThing.cs
index 885e1b867a211db5a63ef7bec4de44b4b3971155..e04f81bf8733f64492468863334ab0f771e75ea8 100644
--- a/Source/Core/VisualModes/VisualThing.cs
+++ b/Source/Core/VisualModes/VisualThing.cs
@@ -265,7 +265,7 @@ namespace CodeImp.DoomBuilder.VisualModes
}
// This sets the vertices for the thing sprite
- protected void SetVertices(WorldVertex[][] verts, Plane floor, Plane ceiling)
+ protected void SetVertices(WorldVertex[][] verts/*, Plane floor, Plane ceiling*/)
{
// Copy vertices
vertices = new WorldVertex[verts.Length][];
@@ -281,28 +281,47 @@ namespace CodeImp.DoomBuilder.VisualModes
updategeo = true;
- //mxd. Do some GLOOME shenanigans...
+ //mxd. Do some special GZDoom rendering shenanigans...
for(int c = 0; c < vertices.Length; c++)
{
if(triangles[c] < 2) continue;
float localcenterz = vertices[c][1].z * 0.5f;
- Matrix m;
+ Matrix transform, rotation;
- switch(info.RenderMode)
+ switch(thing.RenderMode)
{
- // TODO: Currently broken in GLOOME...
- case Thing.SpriteRenderMode.WALL_SPRITE:
- m = Matrix.Translation(0f, 0f, -localcenterz) * Matrix.RotationY(Thing.RollRad) * Matrix.RotationZ(thing.Angle) * Matrix.Translation(0f, 0f, localcenterz);
+ // Don't do anything
+ case ThingRenderMode.MODEL: break;
+
+ // Actor becomes a flat sprite which can be tilted with the use of the Pitch actor property.
+ case ThingRenderMode.FLATSPRITE:
+ rotation = (info.RollSprite ? Matrix.RotationY(-thing.RollRad) * Matrix.RotationX(thing.PitchRad) : Matrix.RotationX(thing.PitchRad))
+ * Matrix.RotationZ(thing.Angle);
+ transform = Matrix.Translation(0f, 0f, -localcenterz) * rotation * Matrix.Translation(0f, 0f, localcenterz);
for(int i = 0; i < vertices[c].Length; i++)
{
- Vector4 transformed = Vector3.Transform(new Vector3(vertices[c][i].x, vertices[c][i].y, vertices[c][i].z), m);
+ Vector4 transformed = Vector3.Transform(new Vector3(vertices[c][i].x, vertices[c][i].y, vertices[c][i].z), transform);
+ vertices[c][i].x = transformed.X;
+ vertices[c][i].y = transformed.Y;
+ vertices[c][i].z = transformed.Z;
+ }
+ break;
+
+ // Similar to FLATSPRITE but is not affected by pitch.
+ case ThingRenderMode.WALLSPRITE:
+ rotation = (info.RollSprite ? Matrix.RotationY(-thing.RollRad) * Matrix.RotationZ(thing.Angle) : Matrix.RotationZ(thing.Angle));
+ transform = Matrix.Translation(0f, 0f, -localcenterz) * rotation * Matrix.Translation(0f, 0f, localcenterz);
+ for(int i = 0; i < vertices[c].Length; i++)
+ {
+ Vector4 transformed = Vector3.Transform(new Vector3(vertices[c][i].x, vertices[c][i].y, vertices[c][i].z), transform);
vertices[c][i].x = transformed.X;
vertices[c][i].y = transformed.Y;
vertices[c][i].z = transformed.Z;
}
break;
- case Thing.SpriteRenderMode.FLOOR_SPRITE:
+ // Some old GLOOME stuff
+ /*case Thing.SpriteRenderMode.FLOOR_SPRITE:
Matrix floorrotation = Matrix.RotationZ(info.RollSprite ? Thing.RollRad : 0f)
* Matrix.RotationY(Thing.Angle)
* Matrix.RotationX(Angle2D.PIHALF);
@@ -386,15 +405,15 @@ namespace CodeImp.DoomBuilder.VisualModes
vertices[c][i].z = ceiling.GetZ(vertices[c][i].x + Thing.Position.x, vertices[c][i].y + Thing.Position.y) + voffset;
}
}
- break;
+ break;*/
default:
if(info.RollSprite)
{
- m = Matrix.Translation(0f, 0f, -localcenterz) * Matrix.RotationY(Thing.RollRad) * Matrix.Translation(0f, 0f, localcenterz);
+ transform = Matrix.Translation(0f, 0f, -localcenterz) * Matrix.RotationY(-thing.RollRad) * Matrix.Translation(0f, 0f, localcenterz);
for(int i = 0; i < vertices[c].Length; i++)
{
- Vector4 transformed = Vector3.Transform(new Vector3(vertices[c][i].x, vertices[c][i].y, vertices[c][i].z), m);
+ Vector4 transformed = Vector3.Transform(new Vector3(vertices[c][i].x, vertices[c][i].y, vertices[c][i].z), transform);
vertices[c][i].x = transformed.X;
vertices[c][i].y = transformed.Y;
vertices[c][i].z = transformed.Z;
diff --git a/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs
index 67293ed67fc383daa49ec8c35be91ff3de884f30..50cb30722c27e278fa1b963ebdc0fa70a24a9170 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/DragThingsMode.cs
@@ -18,12 +18,12 @@
using System;
using System.Collections.Generic;
+using System.Drawing;
using System.Windows.Forms;
+using CodeImp.DoomBuilder.Editing;
+using CodeImp.DoomBuilder.Geometry;
using CodeImp.DoomBuilder.Map;
using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing;
-using CodeImp.DoomBuilder.Editing;
#endregion
@@ -430,7 +430,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
snaptogridincrement = (!snaptocardinaldirection && General.Interface.AltState); //mxd
//mxd. Snap to nearest linedef
- if(selectedthings.Count == 1 && dragitem.IsModel && snaptonearest && !snaptocardinaldirection && MoveThingsRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, false, false))
+ if(selectedthings.Count == 1 && snaptonearest && !snaptocardinaldirection
+ && Thing.AlignableRenderModes.Contains(dragitem.RenderMode)
+ && MoveThingsRelative(mousemappos - dragstartmappos, snaptogrid, snaptogridincrement, false, false))
{
Linedef l = General.Map.Map.NearestLinedefRange(oldpositions[0] + mousemappos - dragstartmappos, BuilderPlug.Me.StitchRange / renderer.Scale);
bool restoresettings = false;
diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
index dd0cbf3a6085ad6ef3fe92447ae9e3afbdd2b44e..2934f6b73ad5bb4762746734259bb8c1cdbde7f9 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
@@ -1410,12 +1410,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
List<Thing> toAlign = new List<Thing>();
-
- foreach(Thing t in selected) if(t.IsModel) toAlign.Add(t);
+ foreach(Thing t in selected)
+ {
+ if(Thing.AlignableRenderModes.Contains(t.RenderMode)) toAlign.Add(t);
+ }
if(toAlign.Count == 0)
{
- General.Interface.DisplayStatus(StatusType.Warning, "This action only works for things with models!");
+ General.Interface.DisplayStatus(StatusType.Warning, "This action only works for models or things with FLATSPRITE/WALLSPRITE flags!");
return;
}
diff --git a/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
index 07d52c057509cd41f1a361dd263d1dbda3619cb2..0af0e192f89c6fdbf624fcc051ed924578f8c72f 100644
--- a/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
+++ b/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
@@ -461,7 +461,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.alignToWallItem.Name = "alignToWallItem";
this.alignToWallItem.Size = new System.Drawing.Size(245, 22);
this.alignToWallItem.Tag = "thingaligntowall";
- this.alignToWallItem.Text = "&Align To Closest Linedef";
+ this.alignToWallItem.Text = "&Align Things to Nearest Linedef";
this.alignToWallItem.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// pointAtCursorItem
@@ -766,7 +766,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
this.buttonAlignThingsToWall.Name = "buttonAlignThingsToWall";
this.buttonAlignThingsToWall.Size = new System.Drawing.Size(23, 22);
this.buttonAlignThingsToWall.Tag = "thingaligntowall";
- this.buttonAlignThingsToWall.ToolTipText = "Align selected things to closest linedef";
+ this.buttonAlignThingsToWall.ToolTipText = "Align Things to Nearest Linedef";
this.buttonAlignThingsToWall.Click += new System.EventHandler(this.InvokeTaggedAction);
//
// buttonTextureOffsetLock
diff --git a/Source/Plugins/BuilderModes/Resources/Actions.cfg b/Source/Plugins/BuilderModes/Resources/Actions.cfg
index bb33dc5aabc5e66a6f451e088b5b8fbc9315ee53..ab81ebfe7137bbb25616fbb967fac2788d0f8d08 100644
--- a/Source/Plugins/BuilderModes/Resources/Actions.cfg
+++ b/Source/Plugins/BuilderModes/Resources/Actions.cfg
@@ -415,9 +415,9 @@ mergesectors
//mxd
thingaligntowall
{
- title = "Align Things To Linedef";
+ title = "Align Things to Nearest Linedef";
category = "things";
- description = "Aligns selected things to closest linedef.";
+ description = "Aligns selected things to the nearest linedef.";
allowkeys = true;
allowmouse = true;
allowscroll = true;
diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
index 5c165b1d3d257b9b5814d9759b3406ffe301055c..65c13f67e93071552d68f3b038071da4371aeee8 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
@@ -357,7 +357,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
//mxd
- SetVertices(allverts, floor, ceiling);
+ SetVertices(allverts/*, floor, ceiling*/);
// Determine position
Vector3D pos = Thing.Position;