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

Lighting bugfixes, setting camera position to character on shift start

Browse Source
This commit is contained in:
Regalis
2015-12-26 22:35:28 +02:00
parent 064e2eadd0
commit 8c032d8368
10 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Subsurface/Source/Map/Lights/ConvexHull.cs
View File

@@ -148,6 +148,8 @@ namespace Barotrauma.Lights
cachedShadows.Clear();
vertices = points;
CalculateDimensions();
}
public bool Intersects(Rectangle rect)
@@ -307,6 +309,7 @@ namespace Barotrauma.Lights
else
{
cachedShadow = new CachedShadow(shadowVertices, penumbraVertices, light.Position, shadowVertexCount, 0);
cachedShadows.Remove(light);
cachedShadows.Add(light, cachedShadow);
}
}
@@ -350,7 +353,7 @@ namespace Barotrauma.Lights
else
{
shadowEffect.CurrentTechnique.Passes[0].Apply();
graphicsDevice.DrawPrimitives(PrimitiveType.TriangleStrip, 0, shadowVertexCount);
graphicsDevice.DrawPrimitives(PrimitiveType.TriangleStrip, 0, shadowVertexCount*2 - 2);
}
}

7
Subsurface/Source/Map/Lights/LightSource.cs
View File

@@ -21,6 +21,9 @@ namespace Barotrauma.Lights
public Entity Submarine;
//what was the range of the light when HullsInRange were last updated
private float prevHullUpdateRange;
private Vector2 position;
public Vector2 Position
{
@@ -64,11 +67,11 @@ namespace Barotrauma.Lights
set
{
float prevRange = range;
range = MathHelper.Clamp(value, 0.0f, 2048.0f);
if (Math.Abs(prevRange - range)<5.0f) return;
if (Math.Abs(prevHullUpdateRange - range)>5.0f) return;
UpdateHullsInRange();
prevHullUpdateRange = range;
}
}

5
Subsurface/Source/Map/Submarine.cs
View File

@@ -301,7 +301,10 @@ namespace Barotrauma
public static Body PickBody(Vector2 rayStart, Vector2 rayEnd, List<Body> ignoredBodies = null, Category? collisionCategory = null)
{
if (Vector2.DistanceSquared(rayStart, rayEnd) < 0.0f) return null;
if (Vector2.DistanceSquared(rayStart, rayEnd) < 0.00001f)
{
rayEnd += Vector2.UnitX * 0.001f;
}
float closestFraction = 1.0f;
Body closestBody = null;

4
Subsurface/Source/Map/TransitionCinematic.cs
View File

@@ -55,12 +55,12 @@ namespace Barotrauma
GUI.ScreenOverlayColor = Color.Lerp(Color.TransparentBlack, Color.Black, timer/duration);
cam.Translate((cameraPos - cam.Position) * CoroutineManager.DeltaTime);
cam.Translate((cameraPos - cam.Position) * CoroutineManager.DeltaTime*10.0f);
cam.Zoom = Math.Max(0.2f, cam.Zoom - CoroutineManager.DeltaTime * 0.1f);
sub.ApplyForce((Vector2.Normalize(diff) * targetSpeed - sub.Velocity) * 500.0f);
timer -= CoroutineManager.DeltaTime;
timer += CoroutineManager.DeltaTime;
yield return CoroutineStatus.Running;
}