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

Fixed lightcomponent sprites & broken sprites not being mirrored. Closes #893

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-11-08 15:32:57 +02:00
parent 20da81e5dc
commit 083d88a64f
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Items/Components/LightComponent.cs
+11 -1
View File
@@ -2,6 +2,7 @@
using Barotrauma.Networking; using Barotrauma.Networking;
using Lidgren.Network; using Lidgren.Network;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
namespace Barotrauma.Items.Components namespace Barotrauma.Items.Components
{ {
@@ -9,7 +10,7 @@ namespace Barotrauma.Items.Components
{ {
private LightSource light; private LightSource light;
public void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch, bool editing = false) public void Draw(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))
{ {
@@ -17,6 +18,15 @@ namespace Barotrauma.Items.Components
} }
} }
public override void FlipX()
{
if (light?.LightSprite != null)
{
light.LightSpriteEffect = light.LightSpriteEffect == SpriteEffects.None ?
SpriteEffects.FlipHorizontally : SpriteEffects.None;
}
}
public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime) public void ClientRead(ServerNetObject type, NetBuffer msg, float sendingTime)
{ {
IsOn = msg.ReadBoolean(); IsOn = msg.ReadBoolean();
Barotrauma/BarotraumaClient/Source/Items/Item.cs
+10 -3
View File
@@ -74,9 +74,14 @@ namespace Barotrauma
{ {
SpriteEffects oldEffects = selectedSprite.effects; SpriteEffects oldEffects = selectedSprite.effects;
selectedSprite.effects ^= SpriteEffects; selectedSprite.effects ^= SpriteEffects;
SpriteEffects oldBrokenSpriteEffects = SpriteEffects.None;
if (fadeInBrokenSprite != null)
{
oldBrokenSpriteEffects = fadeInBrokenSprite.Sprite.effects;
fadeInBrokenSprite.Sprite.effects ^= SpriteEffects;
}
float depth = GetDrawDepth(); float depth = GetDrawDepth();
if (body == null) if (body == null)
{ {
if (prefab.ResizeHorizontal || prefab.ResizeVertical || SpriteEffects.HasFlag(SpriteEffects.FlipHorizontally) || SpriteEffects.HasFlag(SpriteEffects.FlipVertically)) if (prefab.ResizeHorizontal || prefab.ResizeVertical || SpriteEffects.HasFlag(SpriteEffects.FlipHorizontally) || SpriteEffects.HasFlag(SpriteEffects.FlipVertically))
@@ -91,7 +96,6 @@ namespace Barotrauma
selectedSprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color, 0.0f, 1.0f, SpriteEffects.None, depth); selectedSprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color, 0.0f, 1.0f, SpriteEffects.None, depth);
fadeInBrokenSprite?.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color * fadeInBrokenSpriteAlpha, 0.0f, 1.0f, SpriteEffects.None, depth - 0.000001f); fadeInBrokenSprite?.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X, -DrawPosition.Y), color * fadeInBrokenSpriteAlpha, 0.0f, 1.0f, SpriteEffects.None, depth - 0.000001f);
} }
} }
else if (body.Enabled) else if (body.Enabled)
{ {
@@ -122,9 +126,12 @@ namespace Barotrauma
} }
selectedSprite.effects = oldEffects; selectedSprite.effects = oldEffects;
if (fadeInBrokenSprite != null)
{
fadeInBrokenSprite.Sprite.effects = oldEffects;
}
} }
List<IDrawableComponent> staticDrawableComponents = new List<IDrawableComponent>(drawableComponents); //static list to compensate for drawable toggling List<IDrawableComponent> staticDrawableComponents = new List<IDrawableComponent>(drawableComponents); //static list to compensate for drawable toggling
for (int i = 0; i < staticDrawableComponents.Count; i++) for (int i = 0; i < staticDrawableComponents.Count; i++)
{ {