Fixed, MODELDEF parser: looks like INHERITACTORPITCH and INHERITACTORROLL flags affect only pitch/roll set in the map editor, not "PitchOffset" and "RollOffset" MODELDEF properties...

This commit is contained in:
MaxED 2015-02-19 17:59:45 +00:00
parent aed233d249
commit 25ca6f4e9b

View file

@ -412,9 +412,7 @@ namespace CodeImp.DoomBuilder.GZBuilder.GZDoom
mde.InheritActorPitch = inheritactorpitch; mde.InheritActorPitch = inheritactorpitch;
mde.InheritActorRoll = inheritactorroll; mde.InheritActorRoll = inheritactorroll;
Matrix moffset = Matrix.Translation(offset.Y, -offset.X, offset.Z); // Things are complicated in GZDoom... Matrix moffset = Matrix.Translation(offset.Y, -offset.X, offset.Z); // Things are complicated in GZDoom...
Matrix mrotation = Matrix.RotationY(inheritactorroll ? -Angle2D.DegToRad(rollOffset) : 0) Matrix mrotation = Matrix.RotationY(-Angle2D.DegToRad(rollOffset)) * Matrix.RotationX(-Angle2D.DegToRad(pitchOffset)) * Matrix.RotationZ(Angle2D.DegToRad(angleOffset));
* Matrix.RotationX(inheritactorpitch ? -Angle2D.DegToRad(pitchOffset) : 0)
* Matrix.RotationZ(Angle2D.DegToRad(angleOffset));
mde.SetTransform(mrotation, moffset, scale); mde.SetTransform(mrotation, moffset, scale);
for(int i = 0; i < modelNames.Length; i++) for(int i = 0; i < modelNames.Length; i++)