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

Remove derpy eyes :( , fix undead eye indices, fmt

Browse Source
This commit is contained in:
Imbris 2019-09-01 17:46:30 -04:00
parent ca4da22c7d
commit 8a994ada8e
4 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/figure/eyes/undead/female.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/voxel/figure/eyes/undead/male.vox (Stored with Git LFS)
View File

Binary file not shown.

38
common/src/comp/body/humanoid.rs
View File

@ -84,65 +84,58 @@ pub const DANARI_SKIN_COLORS: [(u8, u8, u8); 4] = [
]; ];
pub const DWARF_SKIN_COLORS: [(u8, u8, u8); 3] = [(215, 175, 123), (191, 125, 94), (212, 128, 89)]; pub const DWARF_SKIN_COLORS: [(u8, u8, u8); 3] = [(215, 175, 123), (191, 125, 94), (212, 128, 89)];
pub const ELF_SKIN_COLORS: [(u8, u8, u8); 3] = [(176, 161, 181), (132, 139, 161), (138, 119, 201)]; pub const ELF_SKIN_COLORS: [(u8, u8, u8); 3] = [(176, 161, 181), (132, 139, 161), (138, 119, 201)];
pub const HUMAN_SKIN_COLORS: [(u8, u8, u8); 3] = pub const HUMAN_SKIN_COLORS: [(u8, u8, u8); 3] = [(255, 200, 159), (186, 140, 104), (87, 57, 34)];
[(255, 200, 159), (186, 140, 104), (87, 57, 34)];
pub const ORC_SKIN_COLORS: [(u8, u8, u8); 3] = [(77, 150, 51), (82, 117, 36), (71, 94, 42)]; pub const ORC_SKIN_COLORS: [(u8, u8, u8); 3] = [(77, 150, 51), (82, 117, 36), (71, 94, 42)];
pub const UNDEAD_SKIN_COLORS: [(u8, u8, u8); 3] = pub const UNDEAD_SKIN_COLORS: [(u8, u8, u8); 3] =
[(255, 255, 255), (178, 178, 178), (145, 135, 121)]; [(255, 255, 255), (178, 178, 178), (145, 135, 121)];
// Eye colors // Eye colors
pub const DANARI_EYE_COLORS: [EyeColor; 7] = [ pub const DANARI_EYE_COLORS: [EyeColor; 6] = [
EyeColor::Black, EyeColor::Black,
EyeColor::Blue, EyeColor::Blue,
EyeColor::Green, EyeColor::Green,
EyeColor::Brown, EyeColor::Brown,
EyeColor::Red, EyeColor::Red,
EyeColor::White,
EyeColor::Orange, EyeColor::Orange,
]; ];
pub const DWARF_EYE_COLORS: [EyeColor; 7] = [ pub const DWARF_EYE_COLORS: [EyeColor; 6] = [
EyeColor::Black, EyeColor::Black,
EyeColor::Blue, EyeColor::Blue,
EyeColor::Green, EyeColor::Green,
EyeColor::Brown, EyeColor::Brown,
EyeColor::Red, EyeColor::Red,
EyeColor::White,
EyeColor::Orange, EyeColor::Orange,
]; ];
pub const ELF_EYE_COLORS: [EyeColor; 7] = [ pub const ELF_EYE_COLORS: [EyeColor; 6] = [
EyeColor::Black, EyeColor::Black,
EyeColor::Blue, EyeColor::Blue,
EyeColor::Green, EyeColor::Green,
EyeColor::Brown, EyeColor::Brown,
EyeColor::Red, EyeColor::Red,
EyeColor::White,
EyeColor::Orange, EyeColor::Orange,
]; ];
pub const HUMAN_EYE_COLORS: [EyeColor; 7] = [ pub const HUMAN_EYE_COLORS: [EyeColor; 6] = [
EyeColor::Black, EyeColor::Black,
EyeColor::Blue, EyeColor::Blue,
EyeColor::Green, EyeColor::Green,
EyeColor::Brown, EyeColor::Brown,
EyeColor::Red, EyeColor::Red,
EyeColor::White,
EyeColor::Orange, EyeColor::Orange,
]; ];
pub const ORC_EYE_COLORS: [EyeColor; 7] = [ pub const ORC_EYE_COLORS: [EyeColor; 6] = [
EyeColor::Black, EyeColor::Black,
EyeColor::Blue, EyeColor::Blue,
EyeColor::Green, EyeColor::Green,
EyeColor::Brown, EyeColor::Brown,
EyeColor::Red, EyeColor::Red,
EyeColor::White,
EyeColor::Orange, EyeColor::Orange,
]; ];
pub const UNDEAD_EYE_COLORS: [EyeColor; 7] = [ pub const UNDEAD_EYE_COLORS: [EyeColor; 6] = [
EyeColor::Black, EyeColor::Black,
EyeColor::Blue, EyeColor::Blue,
EyeColor::Green, EyeColor::Green,
EyeColor::Brown, EyeColor::Brown,
EyeColor::Red, EyeColor::Red,
EyeColor::White,
EyeColor::Orange, EyeColor::Orange,
]; ];
@ -296,17 +289,7 @@ pub enum EyeColor {
Brown, Brown,
Red, Red,
Orange, Orange,
White,
} }
pub const ALL_EYE_COLORS: [EyeColor; 7] = [
EyeColor::Black,
EyeColor::Blue,
EyeColor::Green,
EyeColor::Brown,
EyeColor::Red,
EyeColor::White,
EyeColor::Orange,
];
impl EyeColor { impl EyeColor {
pub fn light_rgb(self) -> Rgb<u8> { pub fn light_rgb(self) -> Rgb<u8> {
match self { match self {
@ -315,7 +298,6 @@ impl EyeColor {
EyeColor::Green => Rgb::new(110, 167, 113), EyeColor::Green => Rgb::new(110, 167, 113),
EyeColor::Brown => Rgb::new(73, 42, 36), EyeColor::Brown => Rgb::new(73, 42, 36),
EyeColor::Red => Rgb::new(182, 0, 0), EyeColor::Red => Rgb::new(182, 0, 0),
EyeColor::White => Rgb::new(255, 255, 255),
EyeColor::Orange => Rgb::new(161, 69, 0), EyeColor::Orange => Rgb::new(161, 69, 0),
} }
} }
@ -326,15 +308,11 @@ impl EyeColor {
EyeColor::Green => Rgb::new(81, 124, 84), EyeColor::Green => Rgb::new(81, 124, 84),
EyeColor::Brown => Rgb::new(54, 30, 26), EyeColor::Brown => Rgb::new(54, 30, 26),
EyeColor::Red => Rgb::new(148, 0, 0), EyeColor::Red => Rgb::new(148, 0, 0),
EyeColor::White => Rgb::new(255, 255, 255),
EyeColor::Orange => Rgb::new(148, 64, 0), EyeColor::Orange => Rgb::new(148, 64, 0),
} }
} }
pub fn white_rgb(self) -> Rgb<u8> { pub fn white_rgb(self) -> Rgb<u8> {
match self { Rgb::new(255, 255, 255)
EyeColor::White => Rgb::new(0, 0, 0),
_ => Rgb::new(255, 255, 255),
}
} }
} }

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

@ -15,8 +15,7 @@ use crate::{
use client::Client; use client::Client;
use common::{ use common::{
comp::{ comp::{
ActionState::*, Body, ActionState::*, Body, CharacterState, Last, MovementState::*, Ori, Pos, Scale, Stats, Vel,
CharacterState, Last, MovementState::*, Ori, Pos, Scale, Stats, Vel,
}, },
terrain::TerrainChunkSize, terrain::TerrainChunkSize,
vol::VolSize, vol::VolSize,
@ -24,8 +23,8 @@ use common::{
use hashbrown::HashMap; use hashbrown::HashMap;
use log::debug; use log::debug;
use specs::{Entity as EcsEntity, Join}; use specs::{Entity as EcsEntity, Join};
use vek::*;
use std::time::Instant; use std::time::Instant;
use vek::*;
const DAMAGE_FADE_COEFFICIENT: f64 = 5.0; const DAMAGE_FADE_COEFFICIENT: f64 = 5.0;