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

final asset corrections, fix glider anim

Browse Source
This commit is contained in:
jshipsey 2021-03-01 17:37:47 -05:00
parent 803c7d81dc
commit 8a82e1aa37
13 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/common/items/armor/twigflowers/belt.ron → assets/common/items/armor/twigsflowers/belt.ron
View File

0
assets/common/items/armor/twigflowers/chest.ron → assets/common/items/armor/twigsflowers/chest.ron
View File

0
assets/common/items/armor/twigflowers/foot.ron → assets/common/items/armor/twigsflowers/foot.ron
View File

0
assets/common/items/armor/twigflowers/hand.ron → assets/common/items/armor/twigsflowers/hand.ron
View File

0
assets/common/items/armor/twigflowers/pants.ron → assets/common/items/armor/twigsflowers/pants.ron
View File

0
assets/common/items/armor/twigflowers/shoulder.ron → assets/common/items/armor/twigsflowers/shoulder.ron
View File

8
assets/voxygen/item_image_manifest.ron
View File

@ -1259,7 +1259,7 @@
),
//Leather Armor
Armor(Shoulder("Leather")): VoxTrans(
"voxel.armor.shoulder.leather_right-1",
"voxel.armor.leather.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//Agile Armor
@ -1425,7 +1425,7 @@
(0.0, -1.0, 0.0), (-90.0, 135.0, 0.0), 1.0,
),
Armor(Shoulder("Twigs")): VoxTrans(
"voxel.armor.twigs.shoulders",
"voxel.armor.twigs.shoulder",
(0.0, 0.0, 0.0), (-90.0, 130.0, 0.0), 1.2,
),
//TwigsLeaves Set
@ -1467,7 +1467,7 @@
(0.0, 0.0, 0.0), (-90.0, 180.0, 0.0), 1.4,
),
Armor(Foot("TwigsFlowers")): VoxTrans(
"voxel.armor.fotwigsflowersot.foot",
"voxel.armor.twigsflowers.foot",
(0.0, 0.0, 0.0), (-95.0, 140.0, 0.0), 1.1,
),
Armor(Hand("TwigsFlowers")): VoxTrans(
@ -1609,7 +1609,7 @@
(0.0, -2.0, 0.0), (-90.0, 180.0, 0.0), 1.0,
),
Armor(Back("Backpack")): VoxTrans(
"voxel.armor.misc.backpack",
"voxel.armor.misc.back.backpack",
(0.0, 0.0, 0.0), (-90.0, 0.0, 0.0), 1.0,
),
Armor(Back("BackpackBlue")): VoxTrans(

BIN
assets/voxygen/voxel/armor/cultist/shoulder.vox Normal file
View File

Binary file not shown.

0
assets/voxygen/voxel/armor/misc/pants/grayscale_pants.vox → assets/voxygen/voxel/armor/misc/pants/grayscale.vox
View File

12
server/src/migrations/2021-03-01-053817_armor-reorganization/up.sql
View File

@ -47,7 +47,7 @@ SET item_definition_id = 'common.items.armor.tarasque.belt' WHERE item_definitio
UPDATE item
SET item_definition_id = 'common.items.armor.twigs.belt' WHERE item_definition_id = 'common.items.armor.belt.twig';
UPDATE item
SET item_definition_id = 'common.items.armor.twigflowers.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsflowers';
SET item_definition_id = 'common.items.armor.twigsflowers.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsflowers';
UPDATE item
SET item_definition_id = 'common.items.armor.twigsleaves.belt' WHERE item_definition_id = 'common.items.armor.belt.twigsleaves';
UPDATE item
@ -91,7 +91,7 @@ SET item_definition_id = 'common.items.armor.tarasque.chest' WHERE item_definiti
UPDATE item
SET item_definition_id = 'common.items.armor.twigs.chest' WHERE item_definition_id = 'common.items.armor.chest.twig';
UPDATE item
SET item_definition_id = 'common.items.armor.twigflowers.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsflowers';
SET item_definition_id = 'common.items.armor.twigsflowers.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsflowers';
UPDATE item
SET item_definition_id = 'common.items.armor.twigsleaves.chest' WHERE item_definition_id = 'common.items.armor.chest.twigsleaves';
UPDATE item
@ -155,7 +155,7 @@ SET item_definition_id = 'common.items.armor.tarasque.foot' WHERE item_definitio
UPDATE item
SET item_definition_id = 'common.items.armor.twigs.foot' WHERE item_definition_id = 'common.items.armor.foot.twig';
UPDATE item
SET item_definition_id = 'common.items.armor.twigflowers.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsflowers';
SET item_definition_id = 'common.items.armor.twigsflowers.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsflowers';
UPDATE item
SET item_definition_id = 'common.items.armor.twigsleaves.foot' WHERE item_definition_id = 'common.items.armor.foot.twigsleaves';
UPDATE item
@ -197,7 +197,7 @@ SET item_definition_id = 'common.items.armor.tarasque.hand' WHERE item_definitio
UPDATE item
SET item_definition_id = 'common.items.armor.twigs.hand' WHERE item_definition_id = 'common.items.armor.hand.twig';
UPDATE item
SET item_definition_id = 'common.items.armor.twigflowers.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsflowers';
SET item_definition_id = 'common.items.armor.twigsflowers.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsflowers';
UPDATE item
SET item_definition_id = 'common.items.armor.twigsleaves.hand' WHERE item_definition_id = 'common.items.armor.hand.twigsleaves';
UPDATE item
@ -257,7 +257,7 @@ SET item_definition_id = 'common.items.armor.tarasque.pants' WHERE item_definiti
UPDATE item
SET item_definition_id = 'common.items.armor.twigs.pants' WHERE item_definition_id = 'common.items.armor.pants.twig';
UPDATE item
SET item_definition_id = 'common.items.armor.twigflowers.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsflowers';
SET item_definition_id = 'common.items.armor.twigsflowers.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsflowers';
UPDATE item
SET item_definition_id = 'common.items.armor.twigsleaves.pants' WHERE item_definition_id = 'common.items.armor.pants.twigsleaves';
UPDATE item
@ -323,7 +323,7 @@ SET item_definition_id = 'common.items.armor.tarasque.shoulder' WHERE item_defin
UPDATE item
SET item_definition_id = 'common.items.armor.twigs.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigs';
UPDATE item
SET item_definition_id = 'common.items.armor.twigflowers.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsflowers';
SET item_definition_id = 'common.items.armor.twigsflowers.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsflowers';
UPDATE item
SET item_definition_id = 'common.items.armor.twigsleaves.shoulder' WHERE item_definition_id = 'common.items.armor.shoulder.twigsleaves';
UPDATE item

10
voxygen/anim/src/character/gliding.rs
View File

@ -44,8 +44,8 @@ impl Animation for GlidingAnimation {
let slowa = (anim_time * 3.0 + PI / 2.0).sin();
let head_look = Vec2::new(
(global_time + anim_time / 4.0).floor().mul(7331.0).sin() * 0.5,
(global_time + anim_time / 4.0).floor().mul(1337.0).sin() * 0.25,
((global_time + anim_time) / 5.0).floor().mul(7331.0).sin() * 0.5,
((global_time + anim_time) / 5.0).floor().mul(1337.0).sin() * 0.25,
);
let ori: Vec2<f32> = Vec2::from(orientation);
@ -71,8 +71,10 @@ impl Animation for GlidingAnimation {
next.chest.orientation = Quaternion::rotation_z(slowa * 0.02);
next.belt.orientation = Quaternion::rotation_z(slowa * 0.1 + tilt * tiltcancel * 12.0);
next.belt.position = Vec3::new(0.0, s_a.belt.0, s_a.belt.1);
next.shorts.orientation = Quaternion::rotation_z(slowa * 0.12 + tilt * tiltcancel * 16.0);
next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
next.hand_l.position = Vec3::new(-9.5, -3.0, 10.0);
next.hand_l.orientation =
@ -105,8 +107,8 @@ impl Animation for GlidingAnimation {
Quaternion::rotation_x(0.8) * Quaternion::rotation_y(slowa * 0.04);
next.glider.scale = Vec3::one();
next.torso.position = Vec3::new(0.0, -4.0, 10.0) / 11.0 * s_a.scaler;
next.torso.orientation = Quaternion::rotation_x(-0.06 * speed.max(12.0) + slow * 0.04)
next.torso.position = Vec3::new(0.0, -1.0, 0.0) / 11.0 * s_a.scaler;
next.torso.orientation = Quaternion::rotation_x(-0.03 * speed.max(12.0) + slow * 0.04)
* Quaternion::rotation_y(tilt * tiltcancel * 32.0);
next

2
voxygen/anim/src/character/jump.rs
View File

@ -43,7 +43,7 @@ impl Animation for JumpAnimation {
let switch = if random > 0.5 { 1.0 } else { -1.0 };
let speed = Vec2::<f32>::from(velocity).magnitude();
let speednorm = speed / 10.0;
let speednorm = (speed / 10.0).min(1.0);
let ori: Vec2<f32> = Vec2::from(orientation);
let last_ori = Vec2::from(last_ori);

4
voxygen/anim/src/character/stand.rs
View File

@ -34,8 +34,8 @@ impl Animation for StandAnimation {
let slow = (anim_time * 1.0).sin();
let impact = (avg_vel.z).max(-15.0);
let head_look = Vec2::new(
(global_time + anim_time / 12.0).floor().mul(7331.0).sin() * 0.3,
(global_time + anim_time / 12.0).floor().mul(1337.0).sin() * 0.15,
((global_time + anim_time) / 10.0).floor().mul(7331.0).sin() * 0.15,
((global_time + anim_time) / 10.0).floor().mul(1337.0).sin() * 0.07,
);
next.head.scale = Vec3::one() * s_a.head_scale;
next.chest.scale = Vec3::one() * 1.01;