@@ -152,7 +152,7 @@ namespace Armada.Universes Armada = new Armada.Templates.Armada() {Handle = "armada"}; Armada.Pull<IBody>().Translation = new Vector3(0, 0, 0); - Armada.Pull<IBody>().Scale = Vector3.One * 10; + Armada.Pull<IBody>().Scale = Vector3.One * 20; //Armada.Pull<IModel>().Path = "Models/armada_epoch"; SceneGraph.Instance.Children.Add(Armada.Id, Armada); Armada/Universes/Master.cs @@ -76,6 +76,10 @@ namespace Harmony.Components.Particles motor.Pull<IBody>().Position = new Vector3(0, 200, 0); Motors.Add(1, motor); + motor = new Harmony.Templates.ParticleSystem.Motor(); + motor.Pull<IBody>().Position = new Vector3(0, 100, 0); + Motors.Add(2, motor); + //initialise the vertex buffer for the particles //alot of this is hard coded and can be changed at a later date when i CBF VertexPositionColor[] vertices = new VertexPositionColor[Budget * Budget]; @@ -198,11 +202,15 @@ namespace Harmony.Components.Particles PhysicsShader.Data.Parameters["TimeDelta"].SetValue((float)gameTime.ElapsedGameTime.TotalSeconds); //physicsEffect.Parameters["displacementMap"].SetValue(morphRenderTarget.GetTexture()); - Wind += new Vector4((float)random.NextDouble() - 0.5f, (float)random.NextDouble() - 0.5f, (float)random.NextDouble() - 0.5f, 0); - //WindDirection.Normalize(); Vector4 windUnit = Wind; windUnit.Normalize(); + if (Wind.Length() > 10.0f) + { + Wind = windUnit*10.0f; + } + //WindDirection.Normalize(); + PhysicsShader.Data.Parameters["WindDirection"].SetValue(windUnit); PhysicsShader.Data.Parameters["WindStrength"].SetValue(Wind.Length()); Harmony/Components/Particles/ParticleSystem.cs @@ -103,7 +103,7 @@ float4 ResetColorPS(in float2 uv : TEXCOORD0) : COLOR float4 ResetLifePS(in float2 uv : TEXCOORD0) : COLOR { float4 rand = tex2D(RandomSampler, uv); - return float4(Life, 1, Life * rand.x, 1); // age, alive, life, reset + return float4(Life + Life, 1, (Life * rand.x) + Life, 1); // age, alive, life, reset } float4 ResetPositionPS(in float2 uv : TEXCOORD0) : COLOR @@ -254,14 +254,14 @@ float4 UpdateVelocityPS(in float2 uv : TEXCOORD0) : COLOR float distanceToMotor = length(particleToMotor); - if (distanceToMotor > 0.001f) + if (distanceToMotor > 0.0001f) { - //float motorStrength = motor.w; - velocity += normalize(particleToMotor) * (distanceToMotor * distanceToMotor) * 0.5f; + float motorStrength = motor.w; + velocity = velocity + (normalize(particleToMotor) * (distanceToMotor * distanceToMotor) * 0.1f); } } - //velocity += WindDirection * WindStrength * TimeDelta; + velocity += WindDirection * WindStrength * TimeDelta; } return velocity; Harmony/Content/Shaders/ParticlePhysics.fx cfd2bf050f9dc60888d8191ad4c50ab3aaed3be4 pyrotechnick pyrotechnick@feistystudios.com http://github.com/feistystudios/StringTheory/commit/688125dd53ed67b1c87ca670a6baf80461044a3f 688125dd53ed67b1c87ca670a6baf80461044a3f 2009-10-17T23:24:25-07:00 2009-10-17T23:24:25-07:00 better demo 742c17252138399fab4a5e55826398d15ca93c0e pyrotechnick pyrotechnick@feistystudios.com