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

Fixed warnings

Browse Source
This commit is contained in:
Joshua Barretto 2023-09-24 16:30:17 +01:00
parent a5ec81a2ab
commit 879a28fbb6
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/net/src/synced_components.rs
View File

@ -75,7 +75,7 @@ macro_rules! reexport_comps {
($($name:ident: $type:ident,)*) => { ($($name:ident: $type:ident,)*) => {
mod inner { mod inner {
pub use common::comp::*; pub use common::comp::*;
use common::link::Is use common::link::Is;
use common::{ use common::{
mounting::{Mount, Rider, VolumeRider}, mounting::{Mount, Rider, VolumeRider},
tether::{Leader, Follower}, tether::{Leader, Follower},

4
server/src/cmd.rs
View File

@ -40,6 +40,8 @@ use common::{
effect::Effect, effect::Effect,
event::{EventBus, ServerEvent}, event::{EventBus, ServerEvent},
generation::{EntityConfig, EntityInfo}, generation::{EntityConfig, EntityInfo},
link::Is,
mounting::Rider,
npc::{self, get_npc_name}, npc::{self, get_npc_name},
outcome::Outcome, outcome::Outcome,
parse_cmd_args, parse_cmd_args,
@ -47,7 +49,7 @@ use common::{
rtsim::{Actor, Role}, rtsim::{Actor, Role},
terrain::{Block, BlockKind, CoordinateConversions, SpriteKind, TerrainChunkSize}, terrain::{Block, BlockKind, CoordinateConversions, SpriteKind, TerrainChunkSize},
tether::Tethered, tether::Tethered,
uid::{IdMaps, Uid}, uid::Uid,
vol::ReadVol, vol::ReadVol,
weather, Damage, DamageKind, DamageSource, Explosion, LoadoutBuilder, RadiusEffect, weather, Damage, DamageKind, DamageSource, Explosion, LoadoutBuilder, RadiusEffect,
}; };

13
voxygen/src/scene/tether.rs
View File

@ -1,20 +1,13 @@
use crate::{ use crate::render::{
render::{ pipelines::tether::{BoundLocals, Locals, Vertex},
pipelines::tether::{BoundLocals, Locals, Vertex}, FirstPassDrawer, Mesh, Model, Quad, Renderer,
Consts, CullingMode, FirstPassDrawer, Instances, LodObjectInstance, LodObjectVertex, Mesh,
Model, Quad, Renderer, Tri,
},
scene::{camera, Camera},
settings::Settings,
}; };
use client::Client; use client::Client;
use common::{ use common::{
assets::{AssetExt, ObjAsset},
comp, comp,
link::Is, link::Is,
tether::Follower, tether::Follower,
uid::{IdMaps, Uid}, uid::{IdMaps, Uid},
util::srgba_to_linear,
}; };
use hashbrown::HashMap; use hashbrown::HashMap;
use specs::{Join, WorldExt}; use specs::{Join, WorldExt};