Changeset 831

Timestamp:

2010-06-14 23:49:26 (13 years ago)

Author:

sijoseha

Message:

Building up

Location:

2010/23/sijoseha/alpha/Effects

Files:

• Explosion.cs (modified) (2 diffs)
• Particle.cs (modified) (2 diffs)
• ParticleGame.cs (modified) (4 diffs)
• ParticleSystem.cs (modified) (7 diffs)

2010/23/sijoseha/alpha/Effects/Explosion.cs

@@ -17 +17 @@
     {
 
-        public Explosion(ParticleGame game, Vector2 position, String textureName)
-            : base(game, position, textureName)
+        public Explosion(ParticleGame game, Vector2 position)
+            : base(game, position)
         {
 
@@ -25 +25 @@
         protected override void InitializeParticles()
         {
-            
+            textureName = "Glow";
+
+
+            textureType = TextureType.Single;
+
+            minLifetime = 0.5f;
+            maxLifetime = 1.0f;
+
+            minScale = 0.5f;
+            maxScale = 1.0f;
+
+            minVelocity = 5f;
+            maxVelocity = 10f;
+
+            rotation = 0.0f;
         }
     }

2010/23/sijoseha/alpha/Effects/Particle.cs

@@ -14 +14 @@
 namespace Effects
 {
-    class Particle
+    public class Particle
     {
 
@@ -84 +84 @@
         #endregion
 
-        public void Initialize(Texture2D texture, Vector2 position, float scale, float rotation, Vector2 velocity, float lifetime)
+        public void Initialize(Vector2 position, float scale, float rotation, Vector2 velocity, float lifetime)
         {
             this.alive = true;
-            this.texture = texture;
             this.position = position;
             this.scale = scale;

2010/23/sijoseha/alpha/Effects/ParticleGame.cs

@@ -26 +26 @@
         }
         
-        
-        Particle[] particles;
         Random random = new Random();
-        const int amountOfParticles = 15;
 
         KeyboardState previousKeyboardState = Keyboard.GetState();
+
+        Explosion explosion;
 
         public ParticleGame()
         {
             graphics = new GraphicsDeviceManager(this);
+
+            explosion = new Explosion(this, Vector2.Zero);
+
             Content.RootDirectory = "Content";
         }
@@ -58 +60 @@
         protected override void LoadContent()
         {
-            particles = new Particle[amountOfParticles];
             Texture2D glowTexture = Content.Load<Texture2D>("Glow");
             Texture2D glowTexture2 = Content.Load<Texture2D>("Glow2");
             // Create a new SpriteBatch, which can be used to draw textures.
             spriteBatch = new SpriteBatch(GraphicsDevice);
-            for (int i = 0; i < particles.Length; i++)
-            {
-                particles[i] = new Particle(this, glowTexture, glowTexture2, new Vector2(
-                    (float)random.NextDouble() * graphics.GraphicsDevice.Viewport.Width,
-                    (float)random.NextDouble() * graphics.GraphicsDevice.Viewport.Height), 2.0f);
-                particles[i].Scale = (float)random.NextDouble();//0.2f + (float)random.NextDouble() * 0.8f;
-                particles[i].Velocity = new Vector2(
-                    (float)random.NextDouble() * 5 - 2.5f,
-                    (float)random.NextDouble() * 5 - 2.5f);
-
-            }
             // TODO: use this.Content to load your game content here
         }
@@ -94 +84 @@
         {
             float dt = (float)gameTime.ElapsedGameTime.TotalSeconds;
-            KeyboardState keyboardState = Keyboard.GetState();
-            MouseState mouseState = Mouse.GetState();
-            // Allows the game to exit
-            if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed)
-                this.Exit();
-            for (int i = 0; i < particles.Length; i++)
-            {
-                if (particles[i].Alive)
-                {
-                    particles[i].CurrentTime += dt;
-                    particles[i].Scale = 1.0f - (particles[i].Lifetime * particles[i].CurrentTime);
-                    particles[i].Position += particles[i].Velocity;
-                    if (particles[i].CurrentTime > particles[i].Lifetime)
-                    {
-                        particles[i].Alive = false;
-                    }
-                }
-                if (!particles[i].Alive)
-                {
-                    particles[i].Alive = true;
-                    particles[i].Lifetime = 2.0f;
-                    particles[i].CurrentTime = 0.0f;
-                    particles[i].Scale = 1.0f;
-                    particles[i].Position = new Vector2(
-                        (float)mouseState.X,
-                        (float)mouseState.Y);
-                    particles[i].Velocity = new Vector2(
-                        (float)random.NextDouble() * 5 - 2.5f,
-                        (float)random.NextDouble() * 5 - 2.5f);
-                    //particles[i].Position = new Vector2(
-                    //(float)random.NextDouble() * graphics.GraphicsDevice.Viewport.Width,
-                    //(float)random.NextDouble() * graphics.GraphicsDevice.Viewport.Height);
-                }
-            }
-
-            // TODO: Add your update logic here
-
-            previousKeyboardState = keyboardState;
             base.Update(gameTime);
         }
@@ -143 +95 @@
             GraphicsDevice.Clear(Color.Black);
             // TODO: Add your drawing code here
-
             base.Draw(gameTime);
         }

2010/23/sijoseha/alpha/Effects/ParticleSystem.cs

@@ -38 +38 @@
         protected Vector2 origin;
 
-        protected Vector2 minVelocity;
-        protected Vector2 maxVelocity;
+        protected float minVelocity;
+        protected float maxVelocity;
 
         protected float minLifetime;
@@ -46 +46 @@
         #endregion
 
-        private enum TextureType
+        protected enum TextureType
         {
             Single,
@@ -52 +52 @@
         };
 
-        private TextureType textureType;
+        protected TextureType textureType;
 
         private Texture2D texture, innerTexture, outerTexture;
@@ -64 +64 @@
         }
 
-        public ParticleSystem(ParticleGame game, Vector2 position, String textureName)
+        public ParticleSystem(ParticleGame game, Vector2 position)
             : base(game)
         {
-            textureType = TextureType.Single;
-            this.game = game;
-        }
-
-        public ParticleSystem(ParticleGame game, Vector2 position, String innerTextureName, String outerTextureName)
-            : base(game)
-        {
-            textureType = TextureType.Dual;
             this.game = game;
         }
@@ -80 +72 @@
         protected abstract void InitializeParticles();
 
+        protected virtual void InitializeParticle(Particle p, Vector2 position)
+        {
+            Vector2 direction = new Vector2(-100, 0);
+
+            float scale = 1.0f;
+            float rotation = 0.0f;
+            float velocity = 1.0f;
+            float lifetime = 1.0f;
+
+            p.Initialize(position, scale, rotation, velocity * direction, lifetime);
+        }
+
         public override void Initialize()
         {
+            particles = new Particle[maxAmountOfParticles];
             for (int i = 0; i < maxAmountOfParticles; i++)
             {
@@ -91 +96 @@
         protected override void LoadContent()
         {
-            particles = new Particle[maxAmountOfParticles];
             if (textureType == TextureType.Single)
             {
@@ -111 +115 @@
         public override void Update(GameTime gameTime)
         {
+            float time = (float)gameTime.ElapsedGameTime.TotalSeconds;
+
+            foreach (Particle p in particles)
+            {
+                if (p.Alive)
+                {
+                    p.Update(time);
+                }
+            }
 
             base.Update(gameTime);