epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WithVoxelBarrel orientation calculations.

Browse Source
This commit is contained in:
Paul Chote
2020-11-14 21:37:30 +00:00
parent 973f679939
commit 46b3b01b89
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Traits/Render/WithVoxelBarrel.cs
View File

@@ -52,9 +52,8 @@ namespace OpenRA.Mods.Common.Traits.Render
var model = init.World.ModelCache.GetModelSequence(image, Sequence); var model = init.World.ModelCache.GetModelSequence(image, Sequence);
var turretOrientation = t.PreviewOrientation(init, orientation, facings); var turretOrientation = t.PreviewOrientation(init, orientation, facings);
Func<WRot> quantizedBody = () => body.QuantizeOrientation(orientation(), facings); Func<WVec> barrelOffset = () => body.LocalToWorld(t.Offset + LocalOffset.Rotate(turretOrientation()));
Func<WVec> barrelOffset = () => body.LocalToWorld((t.Offset + LocalOffset.Rotate(turretOrientation())).Rotate(quantizedBody())); Func<WRot> barrelOrientation = () => LocalOrientation.Rotate(turretOrientation());
Func<WRot> barrelOrientation = () => LocalOrientation.Rotate(turretOrientation()).Rotate(quantizedBody());
yield return new ModelAnimation(model, barrelOffset, barrelOrientation, () => false, () => 0, ShowShadow); yield return new ModelAnimation(model, barrelOffset, barrelOrientation, () => false, () => 0, ShowShadow);
} }
@@ -85,15 +84,20 @@ namespace OpenRA.Mods.Common.Traits.Render
WVec BarrelOffset() WVec BarrelOffset()
{ {
var orientation = turreted != null ? turreted.WorldOrientation : self.Orientation; // Barrel offset in turret coordinates
var localOffset = Info.LocalOffset + new WVec(-armament.Recoil, WDist.Zero, WDist.Zero); var localOffset = Info.LocalOffset + new WVec(-armament.Recoil, WDist.Zero, WDist.Zero);
var turretLocalOffset = turreted != null ? turreted.Offset : WVec.Zero;
return body.LocalToWorld(turretLocalOffset + localOffset.Rotate(orientation)); // Turret coordinates to body coordinates
var bodyOrientation = body.QuantizeOrientation(self, self.Orientation);
localOffset = localOffset.Rotate(turreted.WorldOrientation) + turreted.Offset.Rotate(bodyOrientation);
// Body coordinates to world coordinates
return body.LocalToWorld(localOffset);
} }
WRot BarrelRotation() WRot BarrelRotation()
{ {
return Info.LocalOrientation.Rotate(turreted != null ? turreted.WorldOrientation : self.Orientation); return Info.LocalOrientation.Rotate(turreted.WorldOrientation);
} }
} }
} }