From f4abe4f2756e2c88f62d00c3ee4f14fbb4ad2569 Mon Sep 17 00:00:00 2001
From: Sam <samuelkeiffer@gmail.com>
Date: Thu, 27 Jan 2022 15:04:53 -0500
Subject: [PATCH] More tweaks

---
 assets/voxygen/shaders/trail-frag.glsl |  2 +-
 voxygen/src/scene/figure/mod.rs        | 11 ++++++-----
 voxygen/src/scene/trail.rs             |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/assets/voxygen/shaders/trail-frag.glsl b/assets/voxygen/shaders/trail-frag.glsl
index 42477754d7..ccdb98ede3 100644
--- a/assets/voxygen/shaders/trail-frag.glsl
+++ b/assets/voxygen/shaders/trail-frag.glsl
@@ -5,5 +5,5 @@ layout(location = 0) in vec3 f_pos;
 layout(location = 0) out vec4 tgt_color;
 
 void main() {
-    tgt_color = vec4(1);
+    tgt_color = vec4(vec3(0.5), 1);
 }
diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs
index e397c1aa3d..025a6398b2 100644
--- a/voxygen/src/scene/figure/mod.rs
+++ b/voxygen/src/scene/figure/mod.rs
@@ -6445,9 +6445,10 @@ impl<S: Skeleton> FigureState<S> {
         // Handle weapon trails
         let weapon_offsets = offsets.weapon_trail_mat.map(|mat| {
             let (trail_start, trail_end) = match tools.0 {
-                Some(ToolKind::Sword) => (29.0, 30.0),
-                Some(ToolKind::Axe) => (19.0, 20.0),
-                Some(ToolKind::Hammer) => (19.0, 20.0),
+                Some(ToolKind::Sword) => (29.0, 29.25),
+                // TODO: Make sure these are good positions, only did tweaking on sword
+                Some(ToolKind::Axe) => (19.0, 19.25),
+                Some(ToolKind::Hammer) => (19.0, 19.25),
                 _ => (0.0, 0.0),
             };
             (
@@ -6465,13 +6466,13 @@ impl<S: Skeleton> FigureState<S> {
                 let quad = if let (Some((p1, p2)), Some((p4, p3))) =
                     (self.abs_trail_points, offsets_abs_trail_points)
                 {
-                    use StageSection::{Action, Charge, Movement, Recover};
+                    use StageSection::{Action, Movement, Recover};
                     if matches!(
                         char_ability,
                         Some(
                             CharacterAbilityType::BasicMelee(Action)
                                 | CharacterAbilityType::ChargedMelee(Action)
-                                | CharacterAbilityType::DashMelee(Charge | Action)
+                                | CharacterAbilityType::DashMelee(Action)
                                 | CharacterAbilityType::ComboMelee(Action | Recover, _)
                                 | CharacterAbilityType::LeapMelee(Movement | Action)
                                 | CharacterAbilityType::SpinMelee(Action)
diff --git a/voxygen/src/scene/trail.rs b/voxygen/src/scene/trail.rs
index 87bbcb01e5..b2ce433eaf 100644
--- a/voxygen/src/scene/trail.rs
+++ b/voxygen/src/scene/trail.rs
@@ -19,7 +19,7 @@ pub struct TrailMgr {
     pub offset: usize,
 }
 
-const TRAIL_DYNAMIC_MODEL_SIZE: usize = 30;
+const TRAIL_DYNAMIC_MODEL_SIZE: usize = 15;
 
 impl TrailMgr {
     pub fn new(_renderer: &mut Renderer) -> Self {