mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
New Female Danari and Elf models, Airblocks for tower ruins and witch house
This commit is contained in:
parent
51e0edf516
commit
8c1d244bf8
BIN
assets/voxygen/element/icons/danari_f.png
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/danari_f.png
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/element/icons/elf_f.png
(Stored with Git LFS)
BIN
assets/voxygen/element/icons/elf_f.png
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/figure/head/head_danari_female.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/figure/head/head_danari_female.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/figure/head/head_elf_female.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/figure/head/head_elf_female.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/figure/head/head_female.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/figure/head/head_female.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/voxygen/voxel/figure/head/head_test2.vox
(Stored with Git LFS)
BIN
assets/voxygen/voxel/figure/head/head_test2.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/human/blacksmith.vox
(Stored with Git LFS)
BIN
assets/world/structure/human/blacksmith.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/natural/tower-ruin.vox
(Stored with Git LFS)
BIN
assets/world/structure/natural/tower-ruin.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/natural/witch-hut.vox
(Stored with Git LFS)
BIN
assets/world/structure/natural/witch-hut.vox
(Stored with Git LFS)
Binary file not shown.
@ -109,13 +109,13 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
|
||||
(Human, Male) => -0.75,
|
||||
(Human, Female) => -2.0,
|
||||
(Elf, Male) => -0.75,
|
||||
(Elf, Female) => -1.25,
|
||||
(Elf, Female) => -2.45,
|
||||
(Dwarf, Male) => -0.0,
|
||||
(Dwarf, Female) => -1.0,
|
||||
(Dwarf, Female) => -1.25,
|
||||
(Undead, Male) => -1.0,
|
||||
(Undead, Female) => -0.5,
|
||||
(Danari, Male) => 0.5,
|
||||
(Danari, Female) => -0.5,
|
||||
(Danari, Female) => -0.75,
|
||||
},
|
||||
neck_forward: match (body.race, body.body_type) {
|
||||
(Orc, Male) => 0.0,
|
||||
@ -127,9 +127,9 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
|
||||
(Dwarf, Male) => 2.0,
|
||||
(Dwarf, Female) => 0.0,
|
||||
(Undead, Male) => 1.0,
|
||||
(Undead, Female) => 1.0,
|
||||
(Undead, Female) => 0.75,
|
||||
(Danari, Male) => 0.5,
|
||||
(Danari, Female) => 0.0,
|
||||
(Danari, Female) => -3.0,
|
||||
},
|
||||
neck_right: match (body.race, body.body_type) {
|
||||
(Orc, Male) => 0.0,
|
||||
@ -137,7 +137,7 @@ impl<'a> From<&'a comp::humanoid::Body> for SkeletonAttr {
|
||||
(Human, Male) => 0.0,
|
||||
(Human, Female) => 0.0,
|
||||
(Elf, Male) => 0.0,
|
||||
(Elf, Female) => -0.25,
|
||||
(Elf, Female) => 0.0,
|
||||
(Dwarf, Male) => 0.0,
|
||||
(Dwarf, Female) => 0.0,
|
||||
(Undead, Male) => -0.5,
|
||||
|
@ -170,6 +170,7 @@ impl FigureModelCache {
|
||||
use humanoid::{BodyType::*, Race::*};
|
||||
|
||||
let (name, offset) = match (race, body_type) {
|
||||
// z-value should be 0.25 of the .vox total z
|
||||
(Human, Male) => (
|
||||
"figure/head/head_human_male.vox",
|
||||
Vec3::new(-7.0, -5.0, -2.25),
|
||||
@ -216,7 +217,7 @@ impl FigureModelCache {
|
||||
),
|
||||
(Danari, Female) => (
|
||||
"figure/head/head_danari_female.vox",
|
||||
Vec3::new(-9.0, -5.5, -2.5),
|
||||
Vec3::new(-9.0, -7.5, -3.0),
|
||||
),
|
||||
};
|
||||
Self::load_mesh(name, offset)
|
||||
|
@ -93,7 +93,7 @@ impl Window {
|
||||
|
||||
let win_builder = glutin::WindowBuilder::new()
|
||||
.with_title("Veloren")
|
||||
.with_dimensions(glutin::dpi::LogicalSize::new(1366.0, 768.0))
|
||||
.with_dimensions(glutin::dpi::LogicalSize::new(1920.0, 1080.0))
|
||||
.with_maximized(true);
|
||||
|
||||
let ctx_builder = glutin::ContextBuilder::new()
|
||||
|
Loading…
Reference in New Issue
Block a user