stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-22 11:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Display mobjscale for things in Visual Mode

Browse source
This commit is contained in:
spherallic 2023-09-23 00:29:33 +02:00
parent fe4aef43b7
commit 82ef2ab3de
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Source/Core/VisualModes/VisualThing.cs
View file

@ -558,34 +558,36 @@ namespace CodeImp.DoomBuilder.VisualModes
// Trash cage buffer // Trash cage buffer
if(cagebuffer != null) cagebuffer.Dispose(); if(cagebuffer != null) cagebuffer.Dispose();
cagebuffer = null; cagebuffer = null;
float thingsize = thing.Size * (float)UniFields.GetFloat(Thing.Fields, "mobjscale", 1.0f);
float thingheight = thing.Height * (float)UniFields.GetFloat(Thing.Fields, "mobjscale", 1.0f);
// Make a new cage // Make a new cage
List <WorldVertex> cageverts; List <WorldVertex> cageverts;
if(sizeless) if(sizeless)
{ {
WorldVertex v0 = new WorldVertex(-thing.Size + position_v3.X, -thing.Size + position_v3.Y, position_v3.Z); WorldVertex v0 = new WorldVertex(-thingsize + position_v3.X, -thingsize + position_v3.Y, position_v3.Z);
WorldVertex v1 = new WorldVertex(thing.Size + position_v3.X, thing.Size + position_v3.Y, position_v3.Z); WorldVertex v1 = new WorldVertex(thingsize + position_v3.X, thingsize + position_v3.Y, position_v3.Z);
WorldVertex v2 = new WorldVertex(thing.Size + position_v3.X, -thing.Size + position_v3.Y, position_v3.Z); WorldVertex v2 = new WorldVertex(thingsize + position_v3.X, -thingsize + position_v3.Y, position_v3.Z);
WorldVertex v3 = new WorldVertex(-thing.Size + position_v3.X, thing.Size + position_v3.Y, position_v3.Z); WorldVertex v3 = new WorldVertex(-thingsize + position_v3.X, thingsize + position_v3.Y, position_v3.Z);
WorldVertex v4 = new WorldVertex(position_v3.X, position_v3.Y, thing.Size + position_v3.Z); WorldVertex v4 = new WorldVertex(position_v3.X, position_v3.Y, thingsize + position_v3.Z);
WorldVertex v5 = new WorldVertex(position_v3.X, position_v3.Y, -thing.Size + position_v3.Z); WorldVertex v5 = new WorldVertex(position_v3.X, position_v3.Y, -thingsize + position_v3.Z);
cageverts = new List<WorldVertex>(new[] { v0, v1, v2, v3, v4, v5 }); cageverts = new List<WorldVertex>(new[] { v0, v1, v2, v3, v4, v5 });
} }
else else
{ {
float top = position_v3.Z + (info.CenterHitbox ? thing.Height / 2 : thing.Height); float top = position_v3.Z + (info.CenterHitbox ? thingheight / 2 : thingheight);
float bottom = position_v3.Z - (info.CenterHitbox ? thing.Height / 2 : 0); float bottom = position_v3.Z - (info.CenterHitbox ? thingheight / 2 : 0);
WorldVertex v0 = new WorldVertex(-thing.Size + position_v3.X, -thing.Size + position_v3.Y, bottom); WorldVertex v0 = new WorldVertex(-thingsize + position_v3.X, -thingsize + position_v3.Y, bottom);
WorldVertex v1 = new WorldVertex(-thing.Size + position_v3.X, thing.Size + position_v3.Y, bottom); WorldVertex v1 = new WorldVertex(-thingsize + position_v3.X, thingsize + position_v3.Y, bottom);
WorldVertex v2 = new WorldVertex(thing.Size + position_v3.X, thing.Size + position_v3.Y, bottom); WorldVertex v2 = new WorldVertex(thingsize + position_v3.X, thingsize + position_v3.Y, bottom);
WorldVertex v3 = new WorldVertex(thing.Size + position_v3.X, -thing.Size + position_v3.Y, bottom); WorldVertex v3 = new WorldVertex(thingsize + position_v3.X, -thingsize + position_v3.Y, bottom);
WorldVertex v4 = new WorldVertex(-thing.Size + position_v3.X, -thing.Size + position_v3.Y, top); WorldVertex v4 = new WorldVertex(-thingsize + position_v3.X, -thingsize + position_v3.Y, top);
WorldVertex v5 = new WorldVertex(-thing.Size + position_v3.X, thing.Size + position_v3.Y, top); WorldVertex v5 = new WorldVertex(-thingsize + position_v3.X, thingsize + position_v3.Y, top);
WorldVertex v6 = new WorldVertex(thing.Size + position_v3.X, thing.Size + position_v3.Y, top); WorldVertex v6 = new WorldVertex(thingsize + position_v3.X, thingsize + position_v3.Y, top);
WorldVertex v7 = new WorldVertex(thing.Size + position_v3.X, -thing.Size + position_v3.Y, top); WorldVertex v7 = new WorldVertex(thingsize + position_v3.X, -thingsize + position_v3.Y, top);
cageverts = new List<WorldVertex>(new[] { v0, v1, cageverts = new List<WorldVertex>(new[] { v0, v1,
v1, v2, v1, v2,
@ -604,7 +606,7 @@ namespace CodeImp.DoomBuilder.VisualModes
// Make new arrow // Make new arrow
if(Thing.IsDirectional) if(Thing.IsDirectional)
{ {
Matrix transform = Matrix.Scaling(thing.Size, thing.Size, thing.Size) Matrix transform = Matrix.Scaling(thingsize, thingsize, thingsize)
* (Matrix.RotationY((float)-Thing.RollRad) * Matrix.RotationX((float)-Thing.PitchRad) * Matrix.RotationZ((float)Thing.Angle)) * (Matrix.RotationY((float)-Thing.RollRad) * Matrix.RotationX((float)-Thing.PitchRad) * Matrix.RotationZ((float)Thing.Angle))
* ((sizeless || info.CenterHitbox) ? position : position * Matrix.Translation(0.0f, 0.0f, thingheight / 2f)); * ((sizeless || info.CenterHitbox) ? position : position * Matrix.Translation(0.0f, 0.0f, thingheight / 2f));

16
Source/Plugins/BuilderModes/VisualModes/BaseVisualThing.cs
View file

@ -196,8 +196,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
fogfactor = 0f; //mxd fogfactor = 0f; //mxd
//mxd. Check thing size //mxd. Check thing size
float thingradius = Thing.Size; // Thing.Size has ThingRadius arg override applied float mobjscale = (float)UniFields.GetFloat(Thing.Fields, "mobjscale", 1.0f);
thingheight = Thing.Height; // Thing.Height has ThingHeight arg override applied float thingradius = Thing.Size * mobjscale; // Thing.Size has ThingRadius arg override applied
thingheight = Thing.Height * mobjscale; // Thing.Height has ThingHeight arg override applied
if(thingradius < 0.1f || thingheight < 0.1f) if(thingradius < 0.1f || thingheight < 0.1f)
{ {
@ -336,10 +337,13 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Scale by thing type/actor scale // Scale by thing type/actor scale
// We do this after the offset x/y determination above, because that is entirely in sprite pixels space // We do this after the offset x/y determination above, because that is entirely in sprite pixels space
radius *= info.SpriteScale.Width; float xscale = (float)UniFields.GetFloat(Thing.Fields, "mobjscale", info.SpriteScale.Width);
height *= info.SpriteScale.Height; float yscale = (float)UniFields.GetFloat(Thing.Fields, "mobjscale", info.SpriteScale.Height);
offsets.x *= info.SpriteScale.Width;
offsets.y *= info.SpriteScale.Height; radius *= xscale;
height *= yscale;
offsets.x *= xscale;
offsets.y *= yscale;
// Make vertices // Make vertices
WorldVertex[] verts = new WorldVertex[6]; WorldVertex[] verts = new WorldVertex[6];