fix world particle artifacts (#47)

ACEmulator · Jan 26, 2022 · bd9a0f9 · bd9a0f9
1 parent 80b97b2
commit bd9a0f9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/ACViewer/Content/texture.fx b/ACViewer/Content/texture.fx
@@ -794,41 +794,20 @@ float4 ParticleInstancePS(ParticleVertexShaderOutput input) : COLOR
 
     color.a *= input.OpacityActive.x;
 
-    // only output completely opaque pixels
-    // also discard inactive particles
-    clip(color.a < 1.0f || input.OpacityActive.y == 0 ? -1 : 1);
-
-    return color;
-}
-
-float4 ParticleInstanceTransPS(ParticleVertexShaderOutput input) : COLOR
-{
-    float4 color = xTextures.Sample(TextureSampler, input.TextureCoordIdx);
-
-    color.a *= input.OpacityActive.x;
-
-    // only output semi-transparent pixels
-    // also discard inactive particles
-    clip(color.a < 1.0f && input.OpacityActive.y > 0 ? 1 : -1);
+    // discard inactive particles
+    clip(input.OpacityActive.y == 0 ? -1 : 1);
 
     return color;
 }
 
 technique ParticleInstance
 {
     pass Pass0
-    {
-        ZWriteEnable = true;
-
-        VertexShader = compile vs_4_0 ParticleInstanceVS();
-        PixelShader = compile ps_4_0 ParticleInstancePS();
-    }
-    pass Pass1
     {
         ZWriteEnable = false;
 
         VertexShader = compile vs_4_0 ParticleInstanceVS();
-        PixelShader = compile ps_4_0 ParticleInstanceTransPS();
+        PixelShader = compile ps_4_0 ParticleInstancePS();
     }
 }
 

diff --git a/ACViewer/Content/texture.mgfxo b/ACViewer/Content/texture.mgfxo
diff --git a/ACViewer/GameView.cs b/ACViewer/GameView.cs
@@ -142,8 +142,6 @@ protected override void Update(GameTime time)
                 _graphicsDeviceManager.ApplyChanges();
             }
 
-            PrevKeyboardState = keyboardState;
-
             if (Player != null)
                 Player.Update(time);
 
@@ -165,6 +163,8 @@ protected override void Update(GameTime time)
                     ParticleViewer.Update(time);
                     break;
             }
+
+            PrevKeyboardState = keyboardState;
         }
 
         private static readonly Color BackgroundColor = new Color(0, 0, 0);

diff --git a/ACViewer/Picker.cs b/ACViewer/Picker.cs
@@ -370,5 +370,11 @@ public static void DrawHitPoly()
                 GraphicsDevice.DrawUserIndexedPrimitives(PrimitiveType.LineList, HitVertices, 0, HitVertices.Length, HitIndices, 0, HitIndices.Length / 2);
             }
         }
+
+        public static void ClearSelection()
+        {
+            HitVertices = null;
+            HitIndices = null;
+        }
     }
 }
diff --git a/ACViewer/WorldViewer.cs b/ACViewer/WorldViewer.cs
@@ -208,6 +208,11 @@ public void Update(GameTime time)
                 ShowLocation();
             }
 
+            if (keyboardState.IsKeyDown(Keys.C) && !PrevKeyboardState.IsKeyDown(Keys.C))
+            {
+                Picker.ClearSelection();
+            }
+
             PrevKeyboardState = keyboardState;
 
             if (Camera != null)