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

Fixed, Models, Classic and Visual mode: MODELDEF scale and rotation transforms were applied in incorrect order.

Browse source 
Changed, Visual mode: things with "NOINTERACTION" DECORATE flag can now be rendered above ceiling / below floor.
This commit is contained in:
MaxED 2015-03-26 21:31:46 +00:00
parent 0359974e0f
commit 8af084187e
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/GZBuilder/Data/ModelData.cs
View file

@ -63,8 +63,8 @@ namespace CodeImp.DoomBuilder.GZBuilder.Data
internal void SetTransform(Matrix rotation, Matrix offset, Vector3 scale)
{
this.scale = scale;
this.transform = Matrix.Scaling(scale) * rotation * offset;
this.transformstretched = Matrix.Scaling(scale.X, scale.Y, scale.Z * Renderer3D.GZDOOM_INVERTED_VERTICAL_VIEW_STRETCH) * rotation * offset;
this.transform = rotation * Matrix.Scaling(scale) * offset;
this.transformstretched = rotation * Matrix.Scaling(scale.X, scale.Y, scale.Z * Renderer3D.GZDOOM_INVERTED_VERTICAL_VIEW_STRETCH) * offset;
}
#endregion

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

@ -43,6 +43,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
private ThingTypeInfo info;
private bool isloaded;
private bool nointeraction; //mxd
private ImageData sprite;
private float cageradius2;
private Vector2D pos2d;
@ -75,6 +76,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Find thing information
info = General.Map.Data.GetThingInfo(Thing.Type);
//mxd. When true, the thing can be moved below floor/above ceiling
nointeraction = (info.Actor != null && info.Actor.GetFlagValue("nointeraction", false));
// Find sprite texture
if(info.Sprite.Length > 0)
{
@ -122,6 +126,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
SectorData sd = mode.GetSectorData(Thing.Sector);
SectorLevel level = sd.GetLevelAbove(new Vector3D(Thing.Position.x, Thing.Position.y, Thing.Position.z + Thing.Sector.FloorHeight));
if(nointeraction && level == null && sd.LightLevels.Count > 0) level = sd.LightLevels[sd.LightLevels.Count - 1]; //mxd. Use the light level of the highest surface when a thing is above highest sector level.
if(level != null)
{
// Use sector brightness for color shading
@ -235,11 +240,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
float maxz = sd.Ceiling.plane.GetZ(Thing.Position) - info.Height;
pos.z = maxz;
if(Thing.Position.z > 0) pos.z -= Thing.Position.z;
if(Thing.Position.z > 0 || nointeraction) pos.z -= Thing.Position.z;
// Check if below floor
float minz = sd.Floor.plane.GetZ(Thing.Position);
if(pos.z < minz) pos.z = Math.Min(minz, maxz);
if(!nointeraction)
{
float minz = sd.Floor.plane.GetZ(Thing.Position);
if(pos.z < minz) pos.z = Math.Min(minz, maxz);
}
}
}
else
@ -251,11 +259,14 @@ namespace CodeImp.DoomBuilder.BuilderModes
float minz = sd.Floor.plane.GetZ(Thing.Position);
pos.z = minz;
if(Thing.Position.z > 0) pos.z += Thing.Position.z;
if(Thing.Position.z > 0 || nointeraction) pos.z += Thing.Position.z;
// Check if above ceiling
float maxz = sd.Ceiling.plane.GetZ(Thing.Position) - info.Height;
if(pos.z > maxz) pos.z = Math.Max(minz, maxz);
if(!nointeraction)
{
float maxz = sd.Ceiling.plane.GetZ(Thing.Position) - info.Height;
if(pos.z > maxz) pos.z = Math.Max(minz, maxz);
}
}
}
@ -310,6 +321,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Find thing information
info = General.Map.Data.GetThingInfo(Thing.Type);
//mxd. When true, the thing can be moved below floor/above ceiling
nointeraction = (info.Actor != null && info.Actor.GetFlagValue("nointeraction", false));
// Find sprite texture
if(info.Sprite.Length > 0)
{