Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks

Browse Source
This commit is contained in:
Sam 2022-01-27 15:04:53 -05:00
parent 1f2ede656e
commit f4abe4f275
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/trail-frag.glsl
View File

@ -5,5 +5,5 @@ layout(location = 0) in vec3 f_pos;
layout(location = 0) out vec4 tgt_color; layout(location = 0) out vec4 tgt_color;
void main() { void main() {
tgt_color = vec4(1); tgt_color = vec4(vec3(0.5), 1);
} }

11
voxygen/src/scene/figure/mod.rs
View File

@ -6445,9 +6445,10 @@ impl<S: Skeleton> FigureState<S> {
// Handle weapon trails // Handle weapon trails
let weapon_offsets = offsets.weapon_trail_mat.map(|mat| { let weapon_offsets = offsets.weapon_trail_mat.map(|mat| {
let (trail_start, trail_end) = match tools.0 { let (trail_start, trail_end) = match tools.0 {
Some(ToolKind::Sword) => (29.0, 30.0), Some(ToolKind::Sword) => (29.0, 29.25),
Some(ToolKind::Axe) => (19.0, 20.0), // TODO: Make sure these are good positions, only did tweaking on sword
Some(ToolKind::Hammer) => (19.0, 20.0), Some(ToolKind::Axe) => (19.0, 19.25),
Some(ToolKind::Hammer) => (19.0, 19.25),
_ => (0.0, 0.0), _ => (0.0, 0.0),
}; };
( (
@ -6465,13 +6466,13 @@ impl<S: Skeleton> FigureState<S> {
let quad = if let (Some((p1, p2)), Some((p4, p3))) = let quad = if let (Some((p1, p2)), Some((p4, p3))) =
(self.abs_trail_points, offsets_abs_trail_points) (self.abs_trail_points, offsets_abs_trail_points)
{ {
use StageSection::{Action, Charge, Movement, Recover}; use StageSection::{Action, Movement, Recover};
if matches!( if matches!(
char_ability, char_ability,
Some( Some(
CharacterAbilityType::BasicMelee(Action) CharacterAbilityType::BasicMelee(Action)
| CharacterAbilityType::ChargedMelee(Action) | CharacterAbilityType::ChargedMelee(Action)
| CharacterAbilityType::DashMelee(Charge | Action) | CharacterAbilityType::DashMelee(Action)
| CharacterAbilityType::ComboMelee(Action | Recover, _) | CharacterAbilityType::ComboMelee(Action | Recover, _)
| CharacterAbilityType::LeapMelee(Movement | Action) | CharacterAbilityType::LeapMelee(Movement | Action)
| CharacterAbilityType::SpinMelee(Action) | CharacterAbilityType::SpinMelee(Action)

2
voxygen/src/scene/trail.rs
View File

@ -19,7 +19,7 @@ pub struct TrailMgr {
pub offset: usize, pub offset: usize,
} }
const TRAIL_DYNAMIC_MODEL_SIZE: usize = 30; const TRAIL_DYNAMIC_MODEL_SIZE: usize = 15;
impl TrailMgr { impl TrailMgr {
pub fn new(_renderer: &mut Renderer) -> Self { pub fn new(_renderer: &mut Renderer) -> Self {