View difference between Paste ID: zLMjuKmp and SByR6H9H

-Notes:	-
+
         {
             base.Draw(gameTime, spriteBatch);
 
             GraphicsDevice.SetRenderTarget(renderTargetA);
             GraphicsDevice.Clear(ClearOptions.Target | ClearOptions.DepthBuffer, Color.Black, 1.0f, 0);
-	    //Set the rendertarget to draw the Blinn-Phong shaded scene to
+
-            GraphicsDevice.SetRenderTarget(renderTarget);
+
             material.DiffuseColor = Color.Red;
             material.AmbientColor = Color.Red;
             material.AmbientIntensity = 0.2f;
             material.SpecularColor = Color.White;
             material.SpecularIntensity = 2.0f;
             material.SpecularPower = 25.0f;
 
             #region Billboard
             GraphicsDevice.DepthStencilState = DepthStencilState.None;
 
-	    //Draw all the models
+            Matrix billboardMatrix = Matrix.CreateBillboard(lightPositions[0], camera.Eye, camera.Up, camera.Focus - camera.Eye);
 
             this.camera.SetEffectParameters(billboard);
             billboard.Parameters["World"].SetValue(world * billboardMatrix);
             billboard.Parameters["Tex"].SetValue(lightTexture);
             billboard.CurrentTechnique = billboard.Techniques["Technique1"];
 
             foreach (EffectPass pass in billboard.CurrentTechnique.Passes)
             {
                 pass.Apply();
                 this.GraphicsDevice.DrawUserIndexedPrimitives<VertexPositionNormalTexture>(PrimitiveType.TriangleList, lightQuad.QuadVertices, 0, lightQuad.QuadVertices.Length, lightQuad.QuadIndices, 0, lightQuad.QuadIndices.Length / 3);
             }
 
             GraphicsDevice.DepthStencilState = DepthStencilState.Default;
             #endregion
 
             #region OcclusionMap
             Effect tempEffect;
-	    //Restore the rendertarget to the backbuffer and clear it.
+
             {
-            GraphicsDevice.Clear(Color.Black);
+                tempEffect = m.Model.Meshes[0].MeshParts[0].Effect;
                 m.Model.Meshes[0].MeshParts[0].Effect = occlusion;
-	    //Pass the standard variable to the spriteBatch vertex shader.
+
-	    //The vertex shader isn't used (for as far as I can tell at least) but because the standard
+
-	    //vertex shader for spriteBatch is compiled in 2_0 and the God Ray shader in 3_0 I had to implement it
+
-	    //manually in order to compile it in 3_0.
+                occlusion.CurrentTechnique = occlusion.Techniques["Technique1"];
                 this.camera.SetEffectParameters(occlusion);
                 occlusion.Parameters["World"].SetValue(world * m.Transform);
 
                 mesh.Draw();
 
-	    //Setup all the required data for the shader
+                m.Model.Meshes[0].MeshParts[0].Effect = tempEffect;
-            postProcessing.CurrentTechnique = postProcessing.Techniques["Technique1"];
+
             #endregion
 
-	    postProcessing.Parameters["Tex"].SetValue(renderTarget);
+            #region PostProcessing
-            postProcessing.Parameters["exposure"].SetValue(0.5f);
+
-            postProcessing.Parameters["decay"].SetValue(0.5f);
+
-            postProcessing.Parameters["weight"].SetValue(0.5f);
+
-            postProcessing.Parameters["density"].SetValue(0.5f);
+
             GraphicsDevice.Viewport.Width, GraphicsDevice.Viewport.Height, 0, 0, 1);
-	    //Draw the renderTarget to the screen at the size of the viewport so it fits the screen
+
             postProcessing.Parameters["MatrixTransform"].SetValue(halfPixelOffset * projection);
-            spriteBatch.Draw(renderTarget, new Rectangle(spriteBatch.GraphicsDevice.Viewport.X, spriteBatch.GraphicsDevice.Viewport.Y, spriteBatch.GraphicsDevice.Viewport.Width, spriteBatch.GraphicsDevice.Viewport.Height), Color.White);
+
             postProcessing.CurrentTechnique = postProcessing.Techniques["Godrays"];
             Vector3 lightPosition = Vector3.Transform(lightPositions[0], world * camera.ViewMatrix * camera.ProjectionMatrix);
-	    //Restore some of the changes spriteBatch.Begin() made to the graphics device so the 3D render won't break
+
             postProcessing.Parameters["Tex"].SetValue(renderTargetA);
             postProcessing.Parameters["exposure"].SetValue(0.2f);
             postProcessing.Parameters["decay"].SetValue(0.999f);
             postProcessing.Parameters["weight"].SetValue(0.2f);
             postProcessing.Parameters["density"].SetValue(0.9f);
 
             spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive, SamplerState.PointWrap, DepthStencilState.Default, RasterizerState.CullNone, postProcessing);
             spriteBatch.Draw(renderTargetA, new Rectangle(spriteBatch.GraphicsDevice.Viewport.X, spriteBatch.GraphicsDevice.Viewport.Y, spriteBatch.GraphicsDevice.Viewport.Width, spriteBatch.GraphicsDevice.Viewport.Height), Color.White);
             spriteBatch.End();
 
             GraphicsDevice.BlendState = BlendState.Opaque;
             GraphicsDevice.DepthStencilState = DepthStencilState.Default;
             GraphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
             #endregion
 
             #region BlinnPhong
             GraphicsDevice.SetRenderTarget(renderTargetB);
             GraphicsDevice.Clear(ClearOptions.Target | ClearOptions.DepthBuffer, Color.Black, 1.0f, 0);
 
             foreach (ModelData m in models)
             {
                 ModelMesh mesh = m.Model.Meshes[0];
                 Effect e = mesh.Effects[0];
 
                 e.CurrentTechnique = e.Techniques[m.Technique];
                 material.SetEffectParameters(e);
                 this.camera.SetEffectParameters(e);
                 e.Parameters["World"].SetValue(world * m.Transform);
                 e.Parameters["WorldInverseTransposed"].SetValue(Matrix.Transpose(Matrix.Invert(world * m.Transform)));
                 e.Parameters["CameraEye"].SetValue(new Vector4(this.camera.Eye, 0));
                 // TODO: LightSource Color + Intensity
                 e.Parameters["LightSources"].SetValue(lightPositions);
 
                 mesh.Draw();
             }
             #endregion
 
             #region Drawing
             GraphicsDevice.SetRenderTarget(null);
             GraphicsDevice.Clear(ClearOptions.Target | ClearOptions.DepthBuffer, Color.Black, 1.0f, 0);
 
             spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Additive);
             spriteBatch.Draw(renderTargetB, new Rectangle(spriteBatch.GraphicsDevice.Viewport.X, spriteBatch.GraphicsDevice.Viewport.Y, spriteBatch.GraphicsDevice.Viewport.Width, spriteBatch.GraphicsDevice.Viewport.Height), Color.White);
             spriteBatch.End();
 
             GraphicsDevice.BlendState = BlendState.Opaque;
             GraphicsDevice.DepthStencilState = DepthStencilState.Default;
             GraphicsDevice.SamplerStates[0] = SamplerState.LinearWrap;
             #endregion
         }