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

Lighting improvements: lightmap is drawn over all structures and blurred, flashlight item, OnContained statuseffects are also applied when the item is contained in a characterinventory

Browse Source
This commit is contained in:
Regalis
2016-05-07 09:13:23 +03:00
parent ef05650c01
commit d5f6fff2c2
14 changed files with 384 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Barotrauma.csproj
+6 -1
View File
@@ -985,7 +985,12 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="Content\blurshader.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\blurshader.xnb">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Content\Characters\Crawler\attack1.ogg"> <None Include="Content\Characters\Crawler\attack1.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
Subsurface/Content/Content.mgcb
+6
View File
@@ -37,3 +37,9 @@
/processorParam:DebugMode=Auto /processorParam:DebugMode=Auto
/build:watershader.fx /build:watershader.fx
#begin blurshader.fx
/importer:EffectImporter
/processor:EffectProcessor
/processorParam:DebugMode=Auto
/build:blurshader.fx
Subsurface/Content/Items/Diving/divinggear.xml
+2 -3
View File
@@ -109,7 +109,6 @@
</ItemContainer> </ItemContainer>
</Item> </Item>
<Item <Item
name="Underwater Scooter" name="Underwater Scooter"
category="Equipment" category="Equipment"
@@ -135,8 +134,8 @@
<StatusEffect type="OnUse" target="Contained" targetnames="Battery Cell" Condition="-1.0"/> <StatusEffect type="OnUse" target="Contained" targetnames="Battery Cell" Condition="-1.0"/>
<sound file="scooter.ogg" type="OnUse" range="500.0" loop="true"/> <sound file="scooter.ogg" type="OnUse" range="500.0" loop="true"/>
<LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.2" range="600"> <LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.2" range="800">
<LightTexture texture="Content/Lights/lightcone.png" origin="0.1, 0.5" size="2.0,1.0"/> <LightTexture texture="Content/Lights/lightcone.png" origin="0.05, 0.5" size="2.0,1.0"/>
</LightComponent> </LightComponent>
</Propulsion> </Propulsion>
Subsurface/Content/Items/Diving/scooter.ogg
BIN
View File
Binary file not shown.
Subsurface/Content/Items/Tools/tools.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Subsurface/Content/Items/Tools/tools.xml
+54 -1
View File
@@ -191,7 +191,7 @@
pickdistance="200" pickdistance="200"
price="10"> price="10">
<Sprite texture ="tools.png" sourcerect="0,37,22,9" depth="0.5"/> <Sprite texture ="tools.png" sourcerect="42,0,22,9" depth="0.5"/>
<Body width="31" height="6" density="40"/> <Body width="31" height="6" density="40"/>
@@ -213,4 +213,57 @@
</ItemContainer> </ItemContainer>
</Item> </Item>
<Item
name="Flashlight"
category="Equipment"
Tags="smallitem"
pickdistance="200"
price="10">
<Deconstruct time="15">
<Item name="Copper Bar"/>
<Item name="Polycarbonate Bar"/>
</Deconstruct>
<Sprite texture ="tools.png" sourcerect="0,36,27,11" depth="0.5"/>
<Body width="27" height="10" density="15"/>
<Holdable slots="Any,RightHand,LeftHand" aimpos="100,0" handle1="0,0">
<StatusEffect type="OnActive" target="Contained" Condition="-0.2"/>
</Holdable>
<LightComponent LightColor="1.0,1.0,1.0,1.0" Flicker="0.1" range="800" powerconsumption="10" IsOn="true">
<LightTexture texture="Content/Lights/lightcone.png" origin="0.0, 0.5" size="2.0,1.0"/>
</LightComponent>
<ItemContainer capacity="1" hideitems="true">
<Containable name="Battery Cell">
<StatusEffect type="OnContaining" target="This" Voltage="1.0" setvalue="true"/>
</Containable>
</ItemContainer>
</Item>
<Item
name="Flare"
category="Equipment"
pickdistance="150"
price="5"
tags="smallitem">
<Sprite texture ="tools.png" sourcerect="0,37,22,9" depth="0.5"/>
<Body width="11" height="24" density="30"/>
<Throwable slots="Any,RightHand,LeftHand" holdpos="0,0" handle1="0,0" throwforce="4.0" aimpos="35,-10">
</Throwable>
<LightComponent LightColor="1.0,0.0,0.0,1.0" Flicker="0.5" range="600" IsOn="false">
<StatusEffect type="OnActive" target="This" Condition="-0.5"/>
<StatusEffect type="OnUse" target="This" IsOn="true"/>
</LightComponent>
</Item>
</Items> </Items>
Subsurface/Content/blurshader.fx
+33
View File
@@ -0,0 +1,33 @@
// Pixel shader applies a one dimensional gaussian blur filter.
// This is used twice by the bloom postprocess, first to
// blur horizontally, and then again to blur vertically.
sampler TextureSampler : register(s0);
#define SAMPLE_COUNT 15
float2 SampleOffsets[SAMPLE_COUNT];
float SampleWeights[SAMPLE_COUNT];
float4 PixelShaderF(float4 position : SV_Position, float4 color : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0
{
float4 c = 0;
// Combine a number of weighted image filter taps.
for (int i = 0; i < SAMPLE_COUNT; i++)
{
c += tex2D(TextureSampler, texCoord + SampleOffsets[i]) * SampleWeights[i];
}
return c;
}
technique GaussianBlur
{
pass Pass1
{
PixelShader = compile ps_4_0_level_9_1 PixelShaderF();
}
}
Subsurface/Content/blurshader.xnb
BIN
View File
Binary file not shown.
Subsurface/Source/GameMain.cs
+1 -1
View File
@@ -237,7 +237,7 @@ namespace Barotrauma
TitleScreen.LoadState = 80.0f; TitleScreen.LoadState = 80.0f;
yield return CoroutineStatus.Running; yield return CoroutineStatus.Running;
GameScreen = new GameScreen(Graphics.GraphicsDevice); GameScreen = new GameScreen(Graphics.GraphicsDevice, Content);
TitleScreen.LoadState = 90.0f; TitleScreen.LoadState = 90.0f;
yield return CoroutineStatus.Running; yield return CoroutineStatus.Running;
Subsurface/Source/Items/Components/Signal/LightComponent.cs
+10 -2
View File
@@ -90,8 +90,9 @@ namespace Barotrauma.Items.Components
set set
{ {
if (base.IsActive == value) return;
base.IsActive = value; base.IsActive = value;
if (light == null) return;
light.Color = value ? lightColor : Color.Transparent; light.Color = value ? lightColor : Color.Transparent;
if (!value) lightBrightness = 0.0f; if (!value) lightBrightness = 0.0f;
} }
@@ -105,7 +106,7 @@ namespace Barotrauma.Items.Components
light.Position = item.Position; light.Position = item.Position;
light.CastShadows = castShadows; light.CastShadows = castShadows;
IsActive = true; IsActive = IsOn;
//foreach (XElement subElement in element.Elements()) //foreach (XElement subElement in element.Elements())
//{ //{
@@ -157,6 +158,8 @@ namespace Barotrauma.Items.Components
else else
{ {
lightBrightness = MathHelper.Lerp(lightBrightness, Math.Min(voltage, 1.0f), 0.1f); lightBrightness = MathHelper.Lerp(lightBrightness, Math.Min(voltage, 1.0f), 0.1f);
ApplyStatusEffects(ActionType.OnActive, deltaTime);
} }
light.Color = lightColor * lightBrightness * (1.0f-Rand.Range(0.0f,Flicker)); light.Color = lightColor * lightBrightness * (1.0f-Rand.Range(0.0f,Flicker));
@@ -165,6 +168,11 @@ namespace Barotrauma.Items.Components
voltage = 0.0f; voltage = 0.0f;
} }
public override bool Use(float deltaTime, Character character = null)
{
return true;
}
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch, bool editing = false) public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch, bool editing = false)
{ {
if (light.LightSprite != null && (item.body == null || item.body.Enabled)) if (light.LightSprite != null && (item.body == null || item.body.Enabled))
Subsurface/Source/Items/Item.cs
+1 -2
View File
@@ -673,7 +673,7 @@ namespace Barotrauma
} }
ic.WasUsed = false; ic.WasUsed = false;
if (Container != null) ic.ApplyStatusEffects(ActionType.OnContained, deltaTime); if (parentInventory!=null) ic.ApplyStatusEffects(ActionType.OnContained, deltaTime);
if (!ic.IsActive) continue; if (!ic.IsActive) continue;
@@ -795,7 +795,6 @@ namespace Barotrauma
{ {
if (prefab.ResizeHorizontal || prefab.ResizeVertical) if (prefab.ResizeHorizontal || prefab.ResizeVertical)
{ {
prefab.sprite.DrawTiled(spriteBatch, new Vector2(DrawPosition.X-rect.Width/2, -(DrawPosition.Y+rect.Height/2)), new Vector2(rect.Width, rect.Height), color); prefab.sprite.DrawTiled(spriteBatch, new Vector2(DrawPosition.X-rect.Width/2, -(DrawPosition.Y+rect.Height/2)), new Vector2(rect.Width, rect.Height), color);
} }
else else
Subsurface/Source/Map/Lights/ConvexHull.cs
+104 -74
View File
@@ -13,9 +13,9 @@ namespace Barotrauma.Lights
public Vector2 LightPos; public Vector2 LightPos;
public int ShadowVertexCount, PenumbraVertexCount; public int ShadowVertexCount;//, PenumbraVertexCount;
public CachedShadow(VertexPositionColor[] shadowVertices, VertexPositionTexture[] penumbraVertices, Vector2 lightPos, int shadowVertexCount, int penumbraVertexCount) public CachedShadow(VertexPositionColor[] shadowVertices, Vector2 lightPos, int shadowVertexCount, int penumbraVertexCount)
{ {
//var ShadowVertices = new VertexPositionColor [shadowVertices.Count()]; //var ShadowVertices = new VertexPositionColor [shadowVertices.Count()];
//shadowVertices.CopyTo(ShadowVertices, 0); //shadowVertices.CopyTo(ShadowVertices, 0);
@@ -24,7 +24,7 @@ namespace Barotrauma.Lights
ShadowBuffer.SetData(shadowVertices, 0, shadowVertices.Length); ShadowBuffer.SetData(shadowVertices, 0, shadowVertices.Length);
ShadowVertexCount = shadowVertexCount; ShadowVertexCount = shadowVertexCount;
PenumbraVertexCount = penumbraVertexCount; //PenumbraVertexCount = penumbraVertexCount;
LightPos = lightPos; LightPos = lightPos;
} }
@@ -46,17 +46,18 @@ namespace Barotrauma.Lights
{ {
public static List<ConvexHull> list = new List<ConvexHull>(); public static List<ConvexHull> list = new List<ConvexHull>();
static BasicEffect shadowEffect; static BasicEffect shadowEffect;
static BasicEffect penumbraEffect; //static BasicEffect penumbraEffect;
private Dictionary<LightSource, CachedShadow> cachedShadows; private Dictionary<LightSource, CachedShadow> cachedShadows;
private Vector2[] vertices; private Vector2[] vertices;
private Vector2[] losVertices;
private int primitiveCount; private int primitiveCount;
private bool[] backFacing; private bool[] backFacing;
private VertexPositionColor[] shadowVertices; private VertexPositionColor[] shadowVertices;
private VertexPositionTexture[] penumbraVertices; // private VertexPositionTexture[] penumbraVertices;
int shadowVertexCount; int shadowVertexCount;
@@ -88,26 +89,26 @@ namespace Barotrauma.Lights
shadowEffect = new BasicEffect(GameMain.CurrGraphicsDevice); shadowEffect = new BasicEffect(GameMain.CurrGraphicsDevice);
shadowEffect.VertexColorEnabled = true; shadowEffect.VertexColorEnabled = true;
} }
if (penumbraEffect == null) //if (penumbraEffect == null)
{ //{
penumbraEffect = new BasicEffect(GameMain.CurrGraphicsDevice); // penumbraEffect = new BasicEffect(GameMain.CurrGraphicsDevice);
penumbraEffect.TextureEnabled = true; // penumbraEffect.TextureEnabled = true;
//shadowEffect.VertexColorEnabled = true; // //shadowEffect.VertexColorEnabled = true;
penumbraEffect.LightingEnabled = false; // penumbraEffect.LightingEnabled = false;
penumbraEffect.Texture = TextureLoader.FromFile("Content/Lights/penumbra.png"); // penumbraEffect.Texture = TextureLoader.FromFile("Content/Lights/penumbra.png");
} //}
parentEntity = parent; parentEntity = parent;
cachedShadows = new Dictionary<LightSource, CachedShadow>(); cachedShadows = new Dictionary<LightSource, CachedShadow>();
shadowVertices = new VertexPositionColor[6 * 2]; shadowVertices = new VertexPositionColor[6 * 2];
penumbraVertices = new VertexPositionTexture[6]; //penumbraVertices = new VertexPositionTexture[6];
vertices = points; //vertices = points;
primitiveCount = vertices.Length; primitiveCount = points.Length;
SetVertices(points);
CalculateDimensions(); //CalculateDimensions();
backFacing = new bool[primitiveCount]; backFacing = new bool[primitiveCount];
@@ -139,6 +140,7 @@ namespace Barotrauma.Lights
for (int i = 0; i < vertices.Count(); i++) for (int i = 0; i < vertices.Count(); i++)
{ {
vertices[i] += amount; vertices[i] += amount;
losVertices[i] += amount;
} }
CalculateDimensions(); CalculateDimensions();
@@ -149,6 +151,26 @@ namespace Barotrauma.Lights
ClearCachedShadows(); ClearCachedShadows();
vertices = points; vertices = points;
losVertices = points;
int margin = 7;
if (Math.Abs(points[0].X - points[2].X) < Math.Abs(points[0].Y - points[1].Y))
{
losVertices = new Vector2[] {
new Vector2(points[0].X+margin, points[0].Y),
new Vector2(points[1].X+margin, points[1].Y),
new Vector2(points[2].X-margin, points[2].Y),
new Vector2(points[3].X-margin, points[3].Y)};
}
else
{
losVertices = new Vector2[] {
new Vector2(points[0].X, points[0].Y +margin),
new Vector2(points[1].X, points[1].Y - margin),
new Vector2(points[2].X, points[2].Y - margin),
new Vector2(points[3].X, points[3].Y + margin)};
}
CalculateDimensions(); CalculateDimensions();
} }
@@ -191,6 +213,8 @@ namespace Barotrauma.Lights
{ {
shadowVertexCount = 0; shadowVertexCount = 0;
var vertices = los ? losVertices : this.vertices;
//compute facing of each edge, using N*L //compute facing of each edge, using N*L
for (int i = 0; i < primitiveCount; i++) for (int i = 0; i < primitiveCount; i++)
{ {
@@ -205,7 +229,7 @@ namespace Barotrauma.Lights
-(secondVertex.Y - firstVertex.Y), -(secondVertex.Y - firstVertex.Y),
secondVertex.X - firstVertex.X); secondVertex.X - firstVertex.X);
backFacing[i] = (Vector2.Dot(N, L) < 0); backFacing[i] = (Vector2.Dot(N, L) < 0) == los;
} }
//find beginning and ending vertices which //find beginning and ending vertices which
@@ -239,70 +263,76 @@ namespace Barotrauma.Lights
{ {
Vector3 vertexPos = new Vector3(vertices[currentIndex], 0.0f); Vector3 vertexPos = new Vector3(vertices[currentIndex], 0.0f);
int i = los ? svCount : svCount + 1;
int j = los ? svCount + 1 : svCount;
//one vertex on the hull //one vertex on the hull
shadowVertices[svCount] = new VertexPositionColor(); shadowVertices[i] = new VertexPositionColor();
shadowVertices[svCount].Color = los ? Color.Black : Color.Transparent; shadowVertices[i].Color = los ? Color.Black : Color.Transparent;
shadowVertices[svCount].Position = vertexPos; shadowVertices[i].Position = vertexPos;
//one extruded by the light direction //one extruded by the light direction
shadowVertices[svCount + 1] = new VertexPositionColor(); shadowVertices[j] = new VertexPositionColor();
shadowVertices[svCount + 1].Color = los ? Color.Black : Color.Transparent; shadowVertices[j].Color = shadowVertices[i].Color;
Vector3 L2P = vertexPos - new Vector3(lightSourcePos, 0); Vector3 L2P = vertexPos - new Vector3(lightSourcePos, 0);
L2P.Normalize(); L2P.Normalize();
shadowVertices[svCount + 1].Position = new Vector3(lightSourcePos, 0) + L2P * 9000;
shadowVertices[j].Position = new Vector3(lightSourcePos, 0) + L2P * 9000;
svCount += 2; svCount += 2;
currentIndex = (currentIndex + 1) % primitiveCount; currentIndex = (currentIndex + 1) % primitiveCount;
} }
if (los) //if (los)
{ //{
CalculatePenumbraVertices(startingIndex, endingIndex, lightSourcePos, los); // CalculatePenumbraVertices(startingIndex, endingIndex, lightSourcePos, los);
} //}
} }
private void CalculatePenumbraVertices(int startingIndex, int endingIndex, Vector2 lightSourcePos, bool los) //private void CalculatePenumbraVertices(int startingIndex, int endingIndex, Vector2 lightSourcePos, bool los)
{ //{
for (int n = 0; n < 4; n += 3) // for (int n = 0; n < 4; n += 3)
{ // {
Vector3 penumbraStart = new Vector3((n == 0) ? vertices[startingIndex] : vertices[endingIndex], 0.0f); // Vector3 penumbraStart = new Vector3((n == 0) ? vertices[startingIndex] : vertices[endingIndex], 0.0f);
penumbraVertices[n] = new VertexPositionTexture(); // penumbraVertices[n] = new VertexPositionTexture();
penumbraVertices[n].Position = penumbraStart; // penumbraVertices[n].Position = penumbraStart;
penumbraVertices[n].TextureCoordinate = new Vector2(0.0f, 1.0f); // penumbraVertices[n].TextureCoordinate = new Vector2(0.0f, 1.0f);
//penumbraVertices[0].te = fow ? Color.Black : Color.Transparent; // //penumbraVertices[0].te = fow ? Color.Black : Color.Transparent;
for (int i = 0; i < 2; i++) // for (int i = 0; i < 2; i++)
{ // {
penumbraVertices[n + i + 1] = new VertexPositionTexture(); // penumbraVertices[n + i + 1] = new VertexPositionTexture();
Vector3 vertexDir = penumbraStart - new Vector3(lightSourcePos, 0); // Vector3 vertexDir = penumbraStart - new Vector3(lightSourcePos, 0);
vertexDir.Normalize(); // vertexDir.Normalize();
Vector3 normal = (i == 0) ? new Vector3(-vertexDir.Y, vertexDir.X, 0.0f) : new Vector3(vertexDir.Y, -vertexDir.X, 0.0f) * 0.05f; // Vector3 normal = (i == 0) ? new Vector3(-vertexDir.Y, vertexDir.X, 0.0f) : new Vector3(vertexDir.Y, -vertexDir.X, 0.0f) * 0.05f;
if (n > 0) normal = -normal; // if (n > 0) normal = -normal;
vertexDir = penumbraStart - (new Vector3(lightSourcePos, 0) - normal * 20.0f); // vertexDir = penumbraStart - (new Vector3(lightSourcePos, 0) - normal * 20.0f);
vertexDir.Normalize(); // vertexDir.Normalize();
penumbraVertices[n + i + 1].Position = new Vector3(lightSourcePos, 0) + vertexDir * 9000; // penumbraVertices[n + i + 1].Position = new Vector3(lightSourcePos, 0) + vertexDir * 9000;
if (los) // if (los)
{ // {
penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(0.05f, 0.0f) : new Vector2(1.0f, 0.0f); // penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(0.05f, 0.0f) : new Vector2(1.0f, 0.0f);
} // }
else // else
{ // {
penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(1.0f, 0.0f) : Vector2.Zero; // penumbraVertices[n + i + 1].TextureCoordinate = (i == 0) ? new Vector2(1.0f, 0.0f) : Vector2.Zero;
} // }
} // }
if (n > 0) // if (n > 0)
{ // {
var temp = penumbraVertices[4]; // var temp = penumbraVertices[4];
penumbraVertices[4] = penumbraVertices[5]; // penumbraVertices[4] = penumbraVertices[5];
penumbraVertices[5] = temp; // penumbraVertices[5] = temp;
} // }
} // }
} //}
public void DrawShadows(GraphicsDevice graphicsDevice, Camera cam, LightSource light, Matrix transform, bool los = true) public void DrawShadows(GraphicsDevice graphicsDevice, Camera cam, LightSource light, Matrix transform, bool los = true)
{ {
@@ -335,7 +365,7 @@ namespace Barotrauma.Lights
} }
else else
{ {
cachedShadow = new CachedShadow(shadowVertices, penumbraVertices, lightSourcePos, shadowVertexCount, 0); cachedShadow = new CachedShadow(shadowVertices, lightSourcePos, shadowVertexCount, 0);
RemoveCachedShadow(light); RemoveCachedShadow(light);
cachedShadows.Add(light, cachedShadow); cachedShadows.Add(light, cachedShadow);
} }
@@ -386,15 +416,15 @@ namespace Barotrauma.Lights
} }
if (los) // if (los && false)
{ // {
penumbraEffect.World = shadowEffect.World; // penumbraEffect.World = shadowEffect.World;
penumbraEffect.CurrentTechnique.Passes[0].Apply(); // penumbraEffect.CurrentTechnique.Passes[0].Apply();
#if WINDOWS //#if WINDOWS
graphicsDevice.DrawUserPrimitives(PrimitiveType.TriangleList, penumbraVertices, 0, 2, VertexPositionTexture.VertexDeclaration); // graphicsDevice.DrawUserPrimitives(PrimitiveType.TriangleList, 0, 2, VertexPositionTexture.VertexDeclaration);
#endif //#endif
} // }
} }
Subsurface/Source/Map/Lights/LightManager.cs
+76 -35
View File
@@ -69,29 +69,41 @@ namespace Barotrauma.Lights
lights.Remove(light); lights.Remove(light);
} }
public void DrawLOS(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam) public void DrawLOS(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, Effect effect)
{ {
if (!LosEnabled || ViewTarget==null) return; //if (!LosEnabled || ViewTarget==null) return;
Vector2 pos = ViewTarget.WorldPosition; //Vector2 pos = ViewTarget.WorldPosition;
Rectangle camView = new Rectangle(cam.WorldView.X, cam.WorldView.Y - cam.WorldView.Height, cam.WorldView.Width, cam.WorldView.Height); //Rectangle camView = new Rectangle(cam.WorldView.X, cam.WorldView.Y - cam.WorldView.Height, cam.WorldView.Width, cam.WorldView.Height);
Matrix shadowTransform = cam.ShaderTransform //Matrix shadowTransform = cam.ShaderTransform
* Matrix.CreateOrthographic(GameMain.GraphicsWidth, GameMain.GraphicsHeight, -1, 1) * 0.5f; // * Matrix.CreateOrthographic(GameMain.GraphicsWidth, GameMain.GraphicsHeight, -1, 1) * 0.5f;
foreach (ConvexHull convexHull in ConvexHull.list) //graphics.SetRenderTarget(losTexture);
{ //graphics.Clear(Color.Transparent);
if (!convexHull.Intersects(camView)) continue;
//if (!camView.Intersects(convexHull.BoundingBox)) continue;
convexHull.DrawShadows(graphics, cam, pos, shadowTransform); //foreach (ConvexHull convexHull in ConvexHull.list)
} //{
// if (!convexHull.Intersects(camView)) continue;
// //if (!camView.Intersects(convexHull.BoundingBox)) continue;
if (!ObstructVision) return; // convexHull.DrawShadows(graphics, cam, pos, shadowTransform);
//}
spriteBatch.Begin(SpriteSortMode.Deferred, CustomBlendStates.Multiplicative); //graphics.SetRenderTarget(null);
spriteBatch.Draw(losTexture, Vector2.Zero);
//if (!ObstructVision) return;
//spriteBatch.Begin(SpriteSortMode.Deferred, CustomBlendStates.Multiplicative);
//spriteBatch.Draw(losTexture, Vector2.Zero);
//spriteBatch.End();
spriteBatch.Begin(SpriteSortMode.Deferred, ObstructVision ? CustomBlendStates.Multiplicative : BlendState.AlphaBlend, null, null, null, effect);
//effect.CurrentTechnique.Passes[0].Apply();
spriteBatch.Draw(losTexture, Vector2.Zero, Color.White);
spriteBatch.End(); spriteBatch.End();
ObstructVision = false; ObstructVision = false;
@@ -148,9 +160,14 @@ namespace Barotrauma.Lights
spriteBatch.End(); spriteBatch.End();
} }
ClearAlphaToOne(graphics, spriteBatch); ClearAlphaToOne(graphics, spriteBatch);
spriteBatch.Begin(SpriteSortMode.Deferred, CustomBlendStates.MultiplyWithAlpha, null, null, null, null, cam.Transform); spriteBatch.Begin(SpriteSortMode.Deferred, CustomBlendStates.MultiplyWithAlpha, null, null, null, null, cam.Transform);
GameMain.ParticleManager.Draw(spriteBatch, false, Particles.ParticleBlendState.Additive);
foreach (LightSource light in lights) foreach (LightSource light in lights)
{ {
if (light.hullsInRange.Any() || light.Color.A < 0.01f) continue; if (light.hullsInRange.Any() || light.Color.A < 0.01f) continue;
@@ -163,37 +180,59 @@ namespace Barotrauma.Lights
//clear alpha, to avoid messing stuff up later //clear alpha, to avoid messing stuff up later
ClearAlphaToOne(graphics, spriteBatch); ClearAlphaToOne(graphics, spriteBatch);
graphics.SetRenderTarget(null); graphics.SetRenderTarget(null);
} }
public void UpdateObstructVision(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, Vector2 lookAtPosition) public void UpdateObstructVision(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, Vector2 lookAtPosition)
{ {
if (!LosEnabled && !ObstructVision) return;
if (!ObstructVision) return;
graphics.SetRenderTarget(losTexture); graphics.SetRenderTarget(losTexture);
graphics.Clear(Color.Black);
spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, null, null, cam.Transform); if (ObstructVision)
{
graphics.Clear(Color.Black);
Vector2 diff = lookAtPosition - ViewTarget.WorldPosition; spriteBatch.Begin(SpriteSortMode.Deferred, null, null, null, null, null, cam.Transform);
diff.Y = -diff.Y;
float rotation = MathUtils.VectorToAngle(diff);
Vector2 scale = new Vector2(MathHelper.Clamp(diff.Length()/256.0f, 2.0f, 5.0f), 2.0f); Vector2 diff = lookAtPosition - ViewTarget.WorldPosition;
diff.Y = -diff.Y;
float rotation = MathUtils.VectorToAngle(diff);
spriteBatch.Draw(visionCircle, new Vector2(ViewTarget.WorldPosition.X, -ViewTarget.WorldPosition.Y), null, Color.White, rotation, Vector2 scale = new Vector2(MathHelper.Clamp(diff.Length()/256.0f, 2.0f, 5.0f), 2.0f);
new Vector2(LightSource.LightTexture.Width*0.2f, LightSource.LightTexture.Height/2), scale, SpriteEffects.None, 0.0f);
spriteBatch.End();
//ClearAlphaToOne(graphics, spriteBatch); spriteBatch.Draw(visionCircle, new Vector2(ViewTarget.WorldPosition.X, -ViewTarget.WorldPosition.Y), null, Color.White, rotation,
new Vector2(LightSource.LightTexture.Width*0.2f, LightSource.LightTexture.Height/2), scale, SpriteEffects.None, 0.0f);
spriteBatch.End();
}
else
{
graphics.Clear(Color.Transparent);
}
//--------------------------------------
if (LosEnabled && ViewTarget != null)
{
Vector2 pos = ViewTarget.WorldPosition;
Rectangle camView = new Rectangle(cam.WorldView.X, cam.WorldView.Y - cam.WorldView.Height, cam.WorldView.Width, cam.WorldView.Height);
Matrix shadowTransform = cam.ShaderTransform
* Matrix.CreateOrthographic(GameMain.GraphicsWidth, GameMain.GraphicsHeight, -1, 1) * 0.5f;
foreach (ConvexHull convexHull in ConvexHull.list)
{
if (!convexHull.Intersects(camView)) continue;
//if (!camView.Intersects(convexHull.BoundingBox)) continue;
convexHull.DrawShadows(graphics, cam, pos, shadowTransform);
}
}
graphics.SetRenderTarget(null); graphics.SetRenderTarget(null);
//spriteBatch.Begin();
//spriteBatch.Draw(lightMap, Vector2.Zero, Color.White);
//spriteBatch.End();
} }
private void ClearAlphaToOne(GraphicsDevice graphics, SpriteBatch spriteBatch) private void ClearAlphaToOne(GraphicsDevice graphics, SpriteBatch spriteBatch)
@@ -203,16 +242,18 @@ namespace Barotrauma.Lights
spriteBatch.End(); spriteBatch.End();
} }
public void DrawLightMap(SpriteBatch spriteBatch, Camera cam) public void DrawLightMap(SpriteBatch spriteBatch, Camera cam, Effect effect)
{ {
if (!LightingEnabled) return; if (!LightingEnabled) return;
//multiply scene with lightmap spriteBatch.Begin(SpriteSortMode.Deferred, CustomBlendStates.Multiplicative, null, null, null, effect);
spriteBatch.Begin(SpriteSortMode.Deferred, CustomBlendStates.Multiplicative); //effect.CurrentTechnique.Passes[0].Apply();
spriteBatch.Draw(lightMap, Vector2.Zero, Color.White); spriteBatch.Draw(lightMap, Vector2.Zero, Color.White);
spriteBatch.End(); spriteBatch.End();
} }
public void ClearLights() public void ClearLights()
{ {
lights.Clear(); lights.Clear();
Subsurface/Source/Screens/GameScreen.cs
+87 -6
View File
@@ -4,6 +4,7 @@ using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
using Barotrauma.Lights; using Barotrauma.Lights;
using System.Diagnostics; using System.Diagnostics;
using Microsoft.Xna.Framework.Content;
namespace Barotrauma namespace Barotrauma
{ {
@@ -15,6 +16,8 @@ namespace Barotrauma
readonly RenderTarget2D renderTargetWater; readonly RenderTarget2D renderTargetWater;
readonly RenderTarget2D renderTargetAir; readonly RenderTarget2D renderTargetAir;
Effect blurEffect;
public BackgroundCreatureManager BackgroundCreatureManager; public BackgroundCreatureManager BackgroundCreatureManager;
public Camera Cam public Camera Cam
@@ -22,7 +25,7 @@ namespace Barotrauma
get { return cam; } get { return cam; }
} }
public GameScreen(GraphicsDevice graphics) public GameScreen(GraphicsDevice graphics, ContentManager content)
{ {
cam = new Camera(); cam = new Camera();
cam.Translate(new Vector2(-10.0f, 50.0f)); cam.Translate(new Vector2(-10.0f, 50.0f));
@@ -32,6 +35,9 @@ namespace Barotrauma
renderTargetAir = new RenderTarget2D(graphics, GameMain.GraphicsWidth, GameMain.GraphicsHeight); renderTargetAir = new RenderTarget2D(graphics, GameMain.GraphicsWidth, GameMain.GraphicsHeight);
BackgroundCreatureManager = new BackgroundCreatureManager("Content/BackgroundSprites/BackgroundCreaturePrefabs.xml"); BackgroundCreatureManager = new BackgroundCreatureManager("Content/BackgroundSprites/BackgroundCreaturePrefabs.xml");
blurEffect = content.Load<Effect>("blurshader");
SetBlurEffectParameters(0.001f, 0.001f);
} }
public override void Select() public override void Select()
@@ -47,7 +53,6 @@ namespace Barotrauma
cam.Position = Submarine.Loaded.WorldPosition; cam.Position = Submarine.Loaded.WorldPosition;
} }
foreach (MapEntity entity in MapEntity.mapEntityList) foreach (MapEntity entity in MapEntity.mapEntityList)
entity.IsHighlighted = false; entity.IsHighlighted = false;
} }
@@ -200,7 +205,6 @@ namespace Barotrauma
Level.Loaded.DrawBack(graphics, spriteBatch, cam, BackgroundCreatureManager); Level.Loaded.DrawBack(graphics, spriteBatch, cam, BackgroundCreatureManager);
} }
spriteBatch.Begin(SpriteSortMode.BackToFront, spriteBatch.Begin(SpriteSortMode.BackToFront,
BlendState.AlphaBlend, BlendState.AlphaBlend,
null, null, null, null, null, null, null, null,
@@ -212,8 +216,6 @@ namespace Barotrauma
spriteBatch.End(); spriteBatch.End();
GameMain.LightManager.DrawLightMap(spriteBatch, cam);
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
//draw the rendertarget and particles that are only supposed to be drawn in water into renderTargetWater //draw the rendertarget and particles that are only supposed to be drawn in water into renderTargetWater
graphics.SetRenderTarget(renderTargetWater); graphics.SetRenderTarget(renderTargetWater);
@@ -305,11 +307,17 @@ namespace Barotrauma
Submarine.DrawFront(spriteBatch); Submarine.DrawFront(spriteBatch);
if (Level.Loaded!=null) Level.Loaded.DrawFront(spriteBatch); if (Level.Loaded!=null) Level.Loaded.DrawFront(spriteBatch);
spriteBatch.End(); spriteBatch.End();
GameMain.LightManager.DrawLOS(graphics, spriteBatch, cam);
GameMain.LightManager.DrawLightMap(spriteBatch, cam, blurEffect);
GameMain.LightManager.DrawLOS(graphics, spriteBatch, cam, blurEffect);
} }
private void DrawSubmarineIndicator(SpriteBatch spriteBatch, Submarine submarine) private void DrawSubmarineIndicator(SpriteBatch spriteBatch, Submarine submarine)
@@ -331,5 +339,78 @@ namespace Barotrauma
GUI.Arrow.Draw(spriteBatch, iconPos + arrowOffset, Color.LightBlue * 0.5f, MathUtils.VectorToAngle(arrowOffset) + MathHelper.PiOver2); GUI.Arrow.Draw(spriteBatch, iconPos + arrowOffset, Color.LightBlue * 0.5f, MathUtils.VectorToAngle(arrowOffset) + MathHelper.PiOver2);
} }
} }
/// <summary>
/// Computes sample weightings and texture coordinate offsets
/// for one pass of a separable gaussian blur filter.
/// </summary>
void SetBlurEffectParameters(float dx, float dy)
{
EffectParameter weightsParameter = blurEffect.Parameters["SampleWeights"];
EffectParameter offsetsParameter = blurEffect.Parameters["SampleOffsets"];
// Look up how many samples our gaussian blur effect supports.
int sampleCount = weightsParameter.Elements.Count;
// Create temporary arrays for computing our filter settings.
float[] sampleWeights = new float[sampleCount];
Vector2[] sampleOffsets = new Vector2[sampleCount];
sampleWeights[0] = ComputeGaussian(0);
sampleOffsets[0] = new Vector2(0);
float totalWeights = sampleWeights[0];
// Add pairs of additional sample taps, positioned
// along a line in both directions from the center.
for (int i = 0; i < sampleCount / 2; i++)
{
// Store weights for the positive and negative taps.
float weight = ComputeGaussian(i + 1);
sampleWeights[i * 2 + 1] = weight;
sampleWeights[i * 2 + 2] = weight;
totalWeights += weight * 2;
// To get the maximum amount of blurring from a limited number of
// pixel shader samples, we take advantage of the bilinear filtering
// hardware inside the texture fetch unit. If we position our texture
// coordinates exactly halfway between two texels, the filtering unit
// will average them for us, giving two samples for the price of one.
// This allows us to step in units of two texels per sample, rather
// than just one at a time. The 1.5 offset kicks things off by
// positioning us nicely in between two texels.
float sampleOffset = i * 2 + 1.5f;
Vector2 delta = new Vector2(dx, dy) * sampleOffset;
// Store texture coordinate offsets for the positive and negative taps.
sampleOffsets[i * 2 + 1] = delta;
sampleOffsets[i * 2 + 2] = -delta;
}
// Normalize the list of sample weightings, so they will always sum to one.
for (int i = 0; i < sampleWeights.Length; i++)
{
sampleWeights[i] /= totalWeights;
}
weightsParameter.SetValue(sampleWeights);
offsetsParameter.SetValue(sampleOffsets);
}
/// <summary>
/// Evaluates a single point on the gaussian falloff curve.
/// Used for setting up the blur filter weightings.
/// </summary>
float ComputeGaussian(float n)
{
float theta = 4.0f;
return (float)((1.0 / Math.Sqrt(2 * Math.PI * theta)) *
Math.Exp(-(n * n) / (2 * theta * theta)));
}
} }
} }