tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-31 01:35:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix battle model offsets

Browse Source
This commit is contained in:
JappaWakka 2025-01-18 13:33:38 +01:00
parent 4621ecbb12
commit 7214556dda
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
P3D/Battle/BattleAnimations/BAEntityMove.vb
View File

@ -93,11 +93,6 @@
Private Sub Move() Private Sub Move()
Dim DestinationOffset As Vector3 = New Vector3(0)
If TargetEntity.Model IsNot Nothing Then
DestinationOffset = New Vector3(0, -0.5, 0)
End If
Select Case MovementCurve Select Case MovementCurve
Case Curves.EaseIn Case Curves.EaseIn
If EasedIn = False Then If EasedIn = False Then
@ -195,17 +190,17 @@
End If End If
If MoveDistance.Y > 0.05F Then If MoveDistance.Y > 0.05F Then
If StartPosition.Y < Me.Destination.Y + DestinationOffset.Y Then If StartPosition.Y < Me.Destination.Y Then
TargetEntity.Position.Y += Me.MoveYSpeed TargetEntity.Position.Y += Me.MoveYSpeed
If TargetEntity.Position.Y >= Me.Destination.Y + DestinationOffset.Y - 0.05 Then If TargetEntity.Position.Y >= Me.Destination.Y - 0.05 Then
TargetEntity.Position.Y = Me.Destination.Y + DestinationOffset.Y TargetEntity.Position.Y = Me.Destination.Y
End If End If
ElseIf StartPosition.Y > Me.Destination.Y + DestinationOffset.Y Then ElseIf StartPosition.Y > Me.Destination.Y Then
TargetEntity.Position.Y -= Me.MoveYSpeed TargetEntity.Position.Y -= Me.MoveYSpeed
If TargetEntity.Position.Y <= Me.Destination.Y + DestinationOffset.Y + 0.05 Then If TargetEntity.Position.Y <= Me.Destination.Y + 0.05 Then
TargetEntity.Position.Y = Me.Destination.Y + DestinationOffset.Y TargetEntity.Position.Y = Me.Destination.Y
End If End If
End If End If
MoveDistance.Y -= Me.MoveYSpeed MoveDistance.Y -= Me.MoveYSpeed

7
P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb
View File

@ -109,12 +109,18 @@ Namespace BattleSystem
Position.X *= -1 Position.X *= -1
End If End If
NewPosition = CurrentEntity.Position + Position NewPosition = CurrentEntity.Position + Position
If CurrentEntity.Model IsNot Nothing Then
NewPosition.Y += 0.5F
End If
Else Else
NewPosition = Position NewPosition = Position
End If End If
Else Else
If CurrentEntity IsNot Nothing Then If CurrentEntity IsNot Nothing Then
NewPosition = CurrentEntity.Position NewPosition = CurrentEntity.Position
If CurrentEntity.Model IsNot Nothing Then
NewPosition.Y += 0.5F
End If
Else Else
NewPosition = New Vector3(0, 0, 0) NewPosition = New Vector3(0, 0, 0)
End If End If
@ -184,7 +190,6 @@ Namespace BattleSystem
Destination = CurrentEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ) Destination = CurrentEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ)
End If End If
Dim baEntityMove As BAEntityMove = New BAEntityMove(MoveEntity, RemoveEntityAfter, Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve, MoveYSpeed) Dim baEntityMove As BAEntityMove = New BAEntityMove(MoveEntity, RemoveEntityAfter, Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve, MoveYSpeed)
AnimationSequence.Add(baEntityMove) AnimationSequence.Add(baEntityMove)