From b5355d1cd3b9fdb40d4cefe008b84a462c8351d3 Mon Sep 17 00:00:00 2001
From: Alexander Eckart <brunzel@gmx.li>
Date: Fri, 2 Mar 2012 16:33:44 +0100
Subject: [PATCH] added additional constructor to particle effect and particle,
 made the area changeable

---
 Vocaluxe/Base/CDraw.cs | 73 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 67 insertions(+), 6 deletions(-)

diff --git a/Vocaluxe/Base/CDraw.cs b/Vocaluxe/Base/CDraw.cs
index 514d3adc..3a62415b 100644
--- a/Vocaluxe/Base/CDraw.cs
+++ b/Vocaluxe/Base/CDraw.cs
@@ -319,6 +319,7 @@ namespace Vocaluxe.Base
     {
         #region private vars
         private string _TextureName;
+        private STexture _Texture;
         private SRectF _Rect;
         private float _Size;
         private SColorF _Color;
@@ -333,7 +334,7 @@ namespace Vocaluxe.Base
         private float _Vsize;       //size changing speed: period [s]
         private float _LastTime;
         private EParticeType _Type;
-
+        
         private Stopwatch _Timer;
         #endregion private vars
 
@@ -386,6 +387,7 @@ namespace Vocaluxe.Base
         public CParticle(string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
         {
             _TextureName = textureName;
+            _Texture = new STexture(-1);
             _Color = color;
             _Rect = new SRectF(x, y, size, size, z);
             _Size = size;
@@ -403,6 +405,29 @@ namespace Vocaluxe.Base
             _MaxAge = maxage;
             _Rotation = (float)(CGame.Rand.NextDouble() * 360.0);
         }
+
+        public CParticle(STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
+        {
+            _TextureName = String.Empty;
+            _Texture = texture;
+            _Color = color;
+            _Rect = new SRectF(x, y, size, size, z);
+            _Size = size;
+            _Alpha = 1f;
+            _Angle = 0f;
+            _Vx = vx;
+            _Vy = vy;
+            _Vr = vr;
+            _Vsize = vsize;
+            _LastTime = 0f;
+            _Type = type;
+
+            _Timer = new Stopwatch();
+            _Age = 0f;
+            _MaxAge = maxage;
+            _Rotation = (float)(CGame.Rand.NextDouble() * 360.0);
+        }
+
         #endregion Constructors
 
         public void Update()
@@ -553,7 +578,10 @@ namespace Vocaluxe.Base
 
         public void Draw()
         {
-            CDraw.DrawTexture(CTheme.GetSkinTexture(_TextureName), _Rect, new SColorF(_Color.R, _Color.G, _Color.B, _Color.A * Alpha2 * _Alpha));
+            if (_TextureName != String.Empty)
+                CDraw.DrawTexture(CTheme.GetSkinTexture(_TextureName), _Rect, new SColorF(_Color.R, _Color.G, _Color.B, _Color.A * Alpha2 * _Alpha));
+            else
+                CDraw.DrawTexture(_Texture, _Rect, new SColorF(_Color.R, _Color.G, _Color.B, _Color.A * Alpha2 * _Alpha));
         }
     }
 
@@ -561,6 +589,7 @@ namespace Vocaluxe.Base
     {
         private List<CParticle> _Stars;
         private string _TextureName;
+        private STexture _Texture;
         private int _MaxNumber;
         private SRectF _Area;
         private SColorF _Color;
@@ -579,12 +608,33 @@ namespace Vocaluxe.Base
             }
         }
 
+        public SRectF Area
+        {
+            get { return _Area; }
+            set { _Area = value; }
+        }
+
         public CParticleEffect(int MaxNumber, SColorF Color, SRectF Area, string TextureName, float Size, EParticeType Type)
         {
             _Stars = new List<CParticle>();
             _Area = Area;
             _Color = Color;
             _TextureName = TextureName;
+            _Texture = new STexture(-1);
+            _MaxNumber = MaxNumber;
+            _Size = Size;
+            _Type = Type;
+            _SpawnTimer = new Stopwatch();
+            _NextSpawnTime = 0f;
+        }
+
+        public CParticleEffect(int MaxNumber, SColorF Color, SRectF Area, STexture texture, float Size, EParticeType Type)
+        {
+            _Stars = new List<CParticle>();
+            _Area = Area;
+            _Color = Color;
+            _TextureName = String.Empty;
+            _Texture = texture;
             _MaxNumber = MaxNumber;
             _Size = Size;
             _Type = Type;
@@ -682,10 +732,21 @@ namespace Vocaluxe.Base
                 if (h < 0)
                     h = 0;
 
-                CParticle star = new CParticle(_TextureName, _Color,
-                    CGame.Rand.Next(w) + _Area.X - size / 4f,
-                    CGame.Rand.Next(h) + _Area.Y - size / 4f,
-                    size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
+                CParticle star;
+                if (_TextureName != String.Empty)
+                {
+                    star = new CParticle(_TextureName, _Color,
+                        CGame.Rand.Next(w) + _Area.X - size / 4f,
+                        CGame.Rand.Next(h) + _Area.Y - size / 4f,
+                        size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
+                }
+                else
+                {
+                    star = new CParticle(_Texture, _Color,
+                        CGame.Rand.Next(w) + _Area.X - size / 4f,
+                        CGame.Rand.Next(h) + _Area.Y - size / 4f,
+                        size, lifetime, _Area.Z, vx, vy, vr, vsize, _Type);
+                }
 
                 _Stars.Add(star);
             }