vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Faction Test 100.4.0.0

Browse Source
This commit is contained in:
Markus Isberg
2022-11-14 18:28:28 +02:00
parent 87426b68b2
commit c772b61fc1
412 changed files with 16984 additions and 5530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/CameraTransition.cs
+28 -6
View File
@@ -6,6 +6,8 @@ namespace Barotrauma
{
class CameraTransition
{
private static List<CameraTransition> activeTransitions = new List<CameraTransition>();
public bool Running
{
get;
@@ -19,6 +21,7 @@ namespace Barotrauma
private readonly float? endZoom;
public readonly float WaitDuration;
public float EndWaitDuration = 0.1f;
public readonly float PanDuration;
public readonly bool FadeOut;
public readonly bool LosFadeIn;
@@ -45,8 +48,19 @@ namespace Barotrauma
if (targetEntity == null) { return; }
Running = true;
CoroutineManager.StopCoroutines("CameraTransition");
prevControlled = Character.Controlled;
activeTransitions.RemoveAll(a => !CoroutineManager.IsCoroutineRunning(a.updateCoroutine));
foreach (var activeTransition in activeTransitions)
{
if (activeTransition.prevControlled != null)
{
prevControlled ??= activeTransition.prevControlled;
}
activeTransition.Stop();
}
updateCoroutine = CoroutineManager.StartCoroutine(Update(targetEntity, cam), "CameraTransition");
activeTransitions.Add(this);
}
public void Stop()
@@ -66,7 +80,7 @@ namespace Barotrauma
{
if (targetEntity == null || (targetEntity is Entity e && e.Removed)) { yield return CoroutineStatus.Success; }
prevControlled = Character.Controlled;
prevControlled ??= Character.Controlled;
if (RemoveControlFromCharacter)
{
#if CLIENT
@@ -80,6 +94,7 @@ namespace Barotrauma
float endZoom = this.endZoom ?? 0.5f;
Vector2 initialCameraPos = cam.Position;
Vector2? initialTargetPos = targetEntity?.WorldPosition;
Vector2 endPos = cam.Position;
float timer = -WaitDuration;
@@ -137,13 +152,13 @@ namespace Barotrauma
{
startPos += targetEntity.WorldPosition - initialTargetPos.Value;
}
Vector2 endPos = cameraEndPos.HasValue ?
endPos = cameraEndPos.HasValue ?
new Vector2(
MathHelper.Lerp(minPos.X, maxPos.X, (cameraEndPos.Value.ToVector2().X + 1.0f) / 2.0f),
MathHelper.Lerp(maxPos.Y, minPos.Y, (cameraEndPos.Value.ToVector2().Y + 1.0f) / 2.0f)) :
prevControlled?.WorldPosition ?? targetEntity.WorldPosition;
Vector2 cameraPos = Vector2.SmoothStep(startPos, endPos, clampedTimer / PanDuration);
Vector2 cameraPos = Vector2.SmoothStep(startPos, endPos, clampedTimer / PanDuration) + cam.ShakePosition;
cam.Translate(cameraPos - cam.Position);
#if CLIENT
@@ -164,9 +179,16 @@ namespace Barotrauma
yield return CoroutineStatus.Running;
}
Running = false;
float endTimer = 0.0f;
while (endTimer <= EndWaitDuration)
{
cam.Translate(endPos - cam.Position);
cam.Zoom = endZoom;
endTimer += CoroutineManager.DeltaTime;
yield return CoroutineStatus.Running;
}
yield return new WaitForSeconds(0.1f);
Running = false;
#if CLIENT
GUI.ScreenOverlayColor = Color.TransparentBlack;