v0.10.6.2

2020-10-29 17:55:26 +02:00
parent 20a69375ca
commit bbf06f0984
255 changed files with 6196 additions and 3096 deletions
@@ -1,131 +0,0 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-
-namespace Barotrauma.Particles
-{
-    class Decal
-    {
-        public readonly DecalPrefab Prefab;
-        private Vector2 position;
-
-        public readonly Sprite Sprite;
-
-        private float fadeTimer;
-        
-        public float FadeTimer
-        {
-            get { return fadeTimer; }
-            set { fadeTimer = MathHelper.Clamp(value, 0.0f, LifeTime); }
-        }
-
-        public float FadeInTime
-        {
-            get { return Prefab.FadeInTime; }
-        }
-
-        public float FadeOutTime
-        {
-            get { return Prefab.FadeOutTime; }
-        }
-
-        public float LifeTime
-        {
-            get { return Prefab.LifeTime; }
-        }
-        
-        public Color Color
-        {
-            get;
-            set;
-        }
-
-        public Vector2 WorldPosition
-        {
-            get
-            {
-                Vector2 worldPos = position
-                    + clippedSourceRect.Size.ToVector2() / 2 * scale
-                    + hull.Rect.Location.ToVector2();
-                if (hull.Submarine != null) { worldPos += hull.Submarine.DrawPosition; }
-                return worldPos;
-            }
-        }
-
-        private Hull hull;
-
-        private float scale;
-
-        private Rectangle clippedSourceRect;
-
-        public Decal(DecalPrefab prefab, float scale, Vector2 worldPosition, Hull hull)
-        {
-            Prefab = prefab;
-
-            this.hull = hull;
-
-            //transform to hull-relative coordinates so we don't have to worry about the hull moving
-            position = worldPosition - hull.WorldRect.Location.ToVector2();
-
-            Vector2 drawPos = position + hull.Rect.Location.ToVector2();
-
-            Sprite = prefab.Sprites[Rand.Range(0, prefab.Sprites.Count, Rand.RandSync.Unsynced)];
-            Color = prefab.Color;
-
-            Rectangle drawRect = new Rectangle(
-                (int)(drawPos.X - Sprite.size.X / 2 * scale),
-                (int)(drawPos.Y + Sprite.size.Y / 2 * scale),
-                (int)(Sprite.size.X * scale),
-                (int)(Sprite.size.Y * scale));
-
-            Rectangle overFlowAmount = new Rectangle(
-                (int)Math.Max(hull.Rect.X - drawRect.X, 0.0f),
-                (int)Math.Max(drawRect.Y - hull.Rect.Y, 0.0f),
-                (int)Math.Max(drawRect.Right - hull.Rect.Right, 0.0f),
-                (int)Math.Max((hull.Rect.Y - hull.Rect.Height) - (drawRect.Y - drawRect.Height), 0.0f));           
-
-            clippedSourceRect = new Rectangle(
-                Sprite.SourceRect.X + (int)(overFlowAmount.X / scale),
-                Sprite.SourceRect.Y + (int)(overFlowAmount.Y / scale),
-                Sprite.SourceRect.Width - (int)((overFlowAmount.X + overFlowAmount.Width) / scale),
-                Sprite.SourceRect.Height - (int)((overFlowAmount.Y + overFlowAmount.Height) / scale));
-
-            position -= new Vector2(Sprite.size.X / 2 * scale - overFlowAmount.X, -Sprite.size.Y / 2 * scale + overFlowAmount.Y);
-
-            this.scale = scale;
-        }
-
-        public void Update(float deltaTime)
-        {
-            fadeTimer += deltaTime;
-        }
-
-        public void StopFadeIn()
-        {
-            Color *= GetAlpha();
-            fadeTimer = Prefab.FadeInTime;
-        }
-
-        public void Draw(SpriteBatch spriteBatch, Hull hull, float depth)
-        {
-            Vector2 drawPos = position + hull.Rect.Location.ToVector2();
-            if (hull.Submarine != null) { drawPos += hull.Submarine.DrawPosition; }
-            drawPos.Y = -drawPos.Y;
-            
-            spriteBatch.Draw(Sprite.Texture, drawPos, clippedSourceRect, Color * GetAlpha(), 0, Vector2.Zero, scale, SpriteEffects.None, depth);
-        }
-
-        private float GetAlpha()
-        {
-            if (fadeTimer < Prefab.FadeInTime)
-            {
-                return fadeTimer / Prefab.FadeInTime;
-            }
-            else if (fadeTimer > Prefab.LifeTime - Prefab.FadeOutTime)
-            {
-                return (Prefab.LifeTime - fadeTimer) / Prefab.FadeOutTime;
-            }
-            return 1.0f;
-        }
-    }
-}
@@ -1,75 +0,0 @@
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using System.Linq;
-
-namespace Barotrauma.Particles
-{
-    class DecalManager
-    {
-        public PrefabCollection<DecalPrefab> Prefabs { get; private set; }
-
-        public DecalManager()
-        {
-            Prefabs = new PrefabCollection<DecalPrefab>();
-            foreach (ContentFile configFile in GameMain.Instance.GetFilesOfType(ContentType.Decals))
-            {
-                LoadFromFile(configFile);
-            }
-        }
-
-        public void LoadFromFile(ContentFile configFile)
-        {
-            XDocument doc = XMLExtensions.TryLoadXml(configFile.Path);
-            if (doc == null) { return; }
-
-            bool allowOverriding = false;
-            var mainElement = doc.Root;
-            if (doc.Root.IsOverride())
-            {
-                mainElement = doc.Root.FirstElement();
-                allowOverriding = true;
-            }
-
-            foreach (XElement sourceElement in mainElement.Elements())
-            {
-                var element = sourceElement.IsOverride() ? sourceElement.FirstElement() : sourceElement;
-                string name = element.Name.ToString().ToLowerInvariant();
-                if (Prefabs.ContainsKey(name))
-                {
-                    if (allowOverriding || sourceElement.IsOverride())
-                    {
-                        DebugConsole.NewMessage($"Overriding the existing decal prefab '{name}' using the file '{configFile.Path}'", Color.Yellow);
-                    }
-                    else
-                    {
-                        DebugConsole.ThrowError($"Error in '{configFile.Path}': Duplicate decal prefab '{name}' found in '{configFile.Path}'! Each decal prefab must have a unique name. " +
-                            "Use <override></override> tags to override prefabs.");
-                        continue;
-                    }
-
-                }
-
-                Prefabs.Add(new DecalPrefab(element, configFile), allowOverriding || sourceElement.IsOverride());
-            }
-        }
-
-        public void RemoveByFile(string filePath)
-        {
-            Prefabs.RemoveByFile(filePath);
-        }
-
-        public Decal CreateDecal(string decalName, float scale, Vector2 worldPosition, Hull hull)
-        {
-            if (!Prefabs.ContainsKey(decalName.ToLowerInvariant()))
-            {
-                DebugConsole.ThrowError("Decal prefab " + decalName + " not found!");
-                return null;
-            }
-
-            DecalPrefab prefab = Prefabs[decalName];
-
-            return new Decal(prefab, scale, worldPosition, hull);
-        }
-    }
-}
@@ -1,73 +0,0 @@
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-
-namespace Barotrauma.Particles
-{
-    class DecalPrefab : IPrefab, IDisposable
-    {
-        public readonly string Name;
-
-        public string OriginalName { get { return Name; } }
-
-        private string _identifier;
-        public string Identifier
-        {
-            get
-            {
-                if (_identifier == null)
-                {
-                    _identifier = Name.ToLowerInvariant();
-                }
-                return _identifier;
-            }
-        }
-
-        public string FilePath { get; private set; }
-
-        public ContentPackage ContentPackage { get; private set; }
-
-        public void Dispose()
-        {
-            foreach (Sprite spr in Sprites)
-            {
-                spr.Remove();
-            }
-            Sprites.Clear();
-        }
-
-        public readonly List<Sprite> Sprites;
-
-        public readonly Color Color;
-
-        public readonly float LifeTime;
-        public readonly float FadeOutTime;
-        public readonly float FadeInTime;
-
-        public DecalPrefab(XElement element, ContentFile file)
-        {
-            Name = element.Name.ToString();
-
-            FilePath = file.Path;
-
-            ContentPackage = file.ContentPackage;
-
-            Sprites = new List<Sprite>();
-
-            foreach (XElement subElement in element.Elements())
-            {
-                if (subElement.Name.ToString().Equals("sprite", StringComparison.OrdinalIgnoreCase))
-                {
-                    Sprites.Add(new Sprite(subElement));             
-                }
-            }  
-            
-            Color = new Color(element.GetAttributeVector4("color", Vector4.One));
-
-            LifeTime = element.GetAttributeFloat("lifetime", 10.0f);
-            FadeOutTime = Math.Min(LifeTime, element.GetAttributeFloat("fadeouttime", 1.0f));
-            FadeInTime = Math.Min(LifeTime - FadeOutTime, element.GetAttributeFloat("fadeintime", 0.0f));
-        }
-    }
-}
@@ -483,7 +483,7 @@ namespace Barotrauma.Particles

            if (prefab.GrowTime > 0.0f && totalLifeTime - lifeTime < prefab.GrowTime)
            {
-                drawSize *= ((totalLifeTime - lifeTime) / prefab.GrowTime);
+                drawSize *= MathUtils.SmoothStep((totalLifeTime - lifeTime) / prefab.GrowTime);
            }

            Color currColor = new Color(color.ToVector4() * ColorMultiplier);
@@ -23,7 +23,7 @@ namespace Barotrauma.Particles
            Prefab = prefab;
        }

-        public void Emit(float deltaTime, Vector2 position, Hull hullGuess = null, float angle = 0.0f, float particleRotation = 0.0f, float velocityMultiplier = 1.0f, float sizeMultiplier = 1.0f, float amountMultiplier = 1.0f, Color? colorMultiplier = null)
+        public void Emit(float deltaTime, Vector2 position, Hull hullGuess = null, float angle = 0.0f, float particleRotation = 0.0f, float velocityMultiplier = 1.0f, float sizeMultiplier = 1.0f, float amountMultiplier = 1.0f, Color? colorMultiplier = null, ParticlePrefab overrideParticle = null)
        {
            emitTimer += deltaTime * amountMultiplier;
            burstEmitTimer -= deltaTime;
@@ -33,7 +33,7 @@ namespace Barotrauma.Particles
                float emitInterval = 1.0f / Prefab.ParticlesPerSecond;
                while (emitTimer > emitInterval)
                {
-                    Emit(position, hullGuess, angle, particleRotation, velocityMultiplier, sizeMultiplier, colorMultiplier);
+                    Emit(position, hullGuess, angle, particleRotation, velocityMultiplier, sizeMultiplier, colorMultiplier, overrideParticle);
                    emitTimer -= emitInterval;
                }
            }
@@ -43,11 +43,11 @@ namespace Barotrauma.Particles
            burstEmitTimer = Prefab.EmitInterval;
            for (int i = 0; i < Prefab.ParticleAmount * amountMultiplier; i++)
            {
-                Emit(position, hullGuess, angle, particleRotation, velocityMultiplier, sizeMultiplier, colorMultiplier);
+                Emit(position, hullGuess, angle, particleRotation, velocityMultiplier, sizeMultiplier, colorMultiplier, overrideParticle);
            }
        }

-        private void Emit(Vector2 position, Hull hullGuess, float angle, float particleRotation, float velocityMultiplier, float sizeMultiplier, Color? colorMultiplier = null)
+        private void Emit(Vector2 position, Hull hullGuess, float angle, float particleRotation, float velocityMultiplier, float sizeMultiplier, Color? colorMultiplier = null, ParticlePrefab overrideParticle = null)
        {
            angle += Rand.Range(Prefab.AngleMin, Prefab.AngleMax);

@@ -55,13 +55,20 @@ namespace Barotrauma.Particles
            Vector2 velocity = dir * Rand.Range(Prefab.VelocityMin, Prefab.VelocityMax) * velocityMultiplier;
            position += dir * Rand.Range(Prefab.DistanceMin, Prefab.DistanceMax);

-            var particle = GameMain.ParticleManager.CreateParticle(Prefab.ParticlePrefab, position, velocity, particleRotation, hullGuess, Prefab.DrawOnTop);
+            var particle = GameMain.ParticleManager.CreateParticle(overrideParticle ?? Prefab.ParticlePrefab, position, velocity, particleRotation, hullGuess, Prefab.DrawOnTop);

            if (particle != null)
            {
                particle.Size *= Rand.Range(Prefab.ScaleMin, Prefab.ScaleMax) * sizeMultiplier;
                particle.HighQualityCollisionDetection = Prefab.HighQualityCollisionDetection;
-                if (colorMultiplier.HasValue) { particle.ColorMultiplier = colorMultiplier.Value.ToVector4(); }
+                if (colorMultiplier.HasValue) 
+                { 
+                    particle.ColorMultiplier = colorMultiplier.Value.ToVector4(); 
+                }
+                else if (Prefab.ColorMultiplier != Color.White)
+                {
+                    particle.ColorMultiplier = Prefab.ColorMultiplier.ToVector4();
+                }
            }
        }

@@ -138,6 +145,8 @@ namespace Barotrauma.Particles

        public readonly bool CopyEntityAngle;

+        public readonly Color ColorMultiplier;
+
        public bool DrawOnTop => forceDrawOnTop || ParticlePrefab.DrawOnTop;
        private readonly bool forceDrawOnTop;

@@ -204,11 +213,12 @@ namespace Barotrauma.Particles
            }

            EmitInterval = element.GetAttributeFloat("emitinterval", 0.0f);
-            ParticlesPerSecond = element.GetAttributeInt("particlespersecond", 0);
+            ParticlesPerSecond = element.GetAttributeFloat("particlespersecond", 0);
            ParticleAmount = element.GetAttributeInt("particleamount", 0);
            HighQualityCollisionDetection = element.GetAttributeBool("highqualitycollisiondetection", false);
            CopyEntityAngle = element.GetAttributeBool("copyentityangle", false);
-            forceDrawOnTop = element.GetAttributeBool("drawontop", false);
+            forceDrawOnTop = element.GetAttributeBool("drawontop", false); 
+            ColorMultiplier = element.GetAttributeColor("colormultiplier", Color.White);
        }
    }
 }