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

Added sprites to ship models

Browse Source
This commit is contained in:
Joshua Barretto 2023-05-17 17:49:17 +01:00
parent dfbd9e8132
commit 74d4fc8e64
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
assets/common/manifests/ship_manifest.ron
View File

@ -70,6 +70,24 @@
offset: (-1.5, -6.0, -5.0), offset: (-1.5, -6.0, -5.0),
central: ("empty"), central: ("empty"),
), ),
custom_indices: {
1: Air(ChairSingle, 4),
2: Air(Helm, 0),
3: Air(Door, 6),
4: Air(Door, 2),
9: Air(CraftingBench, 0),
10: Air(Window1, 0),
11: Air(RepairBench, 0),
12: Air(DismantlingBench, 4),
13: Air(Window1, 2),
14: Air(Crate, 0),
15: Air(Anvil, 2),
16: Air(Tent, 0),
17: Air(CookingPot, 0),
18: Air(WallLamp, 4),
19: Air(Lantern, 4),
},
), ),
Galleon: ( Galleon: (
bone0: ( bone0: (
@ -90,7 +108,21 @@
), ),
custom_indices: { custom_indices: {
1: Air(Helm, 0), 1: Air(ChairSingle, 4),
2: Air(Helm, 0),
3: Air(DoorWide, 4),
4: Air(DoorWide, 0),
9: Air(CraftingBench, 0),
10: Air(Window1, 0),
11: Air(RepairBench, 0),
12: Air(DismantlingBench, 4),
13: Air(Window1, 2),
14: Air(Crate, 0),
15: Air(Cauldron, 2),
16: Air(Tent, 0),
17: Air(CookingPot, 0),
18: Air(WallLamp, 4),
19: Air(Lantern, 4),
}, },
), ),
}) })

BIN
assets/common/voxel/galleon/structure.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/common/voxel/sail_boat/structure.vox (Stored with Git LFS)
View File

Binary file not shown.

2
server/src/cmd.rs
View File

@ -1685,7 +1685,7 @@ fn handle_spawn_ship(
) -> CmdResult<()> { ) -> CmdResult<()> {
let angle = parse_cmd_args!(args, f32); let angle = parse_cmd_args!(args, f32);
let mut pos = position(server, target, "target")?; let mut pos = position(server, target, "target")?;
pos.0.z += 50.0; pos.0.z += 2.0;
const DESTINATION_RADIUS: f32 = 2000.0; const DESTINATION_RADIUS: f32 = 2000.0;
let angle = angle.map(|a| a * std::f32::consts::PI / 180.0); let angle = angle.map(|a| a * std::f32::consts::PI / 180.0);
let dir = angle.map(|a| Vec3::new(a.cos(), a.sin(), 0.0)); let dir = angle.map(|a| Vec3::new(a.cos(), a.sin(), 0.0));