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

Merge branch 'xMAC94x/fix_tracy' into 'master'

Browse Source 
fix tracy-server compilation via cargo tracy-server

See merge request veloren/veloren!2409
This commit is contained in:
Marcel 2021-06-11 08:32:53 +00:00
commit 068ce2c665
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/lib.rs
View File

@ -300,7 +300,7 @@ impl Server {
let map = world.get_map_data(index.as_index_ref(), &state.thread_pool()); let map = world.get_map_data(index.as_index_ref(), &state.thread_pool());
#[cfg(not(feature = "worldgen"))] #[cfg(not(feature = "worldgen"))]
let (world, index) = World::generate(settings.world_seed, &state.thread_pool()); let (world, index) = World::generate(settings.world_seed);
#[cfg(not(feature = "worldgen"))] #[cfg(not(feature = "worldgen"))]
let map = WorldMapMsg { let map = WorldMapMsg {
dimensions_lg: Vec2::zero(), dimensions_lg: Vec2::zero(),
@ -310,6 +310,7 @@ impl Server {
sea_level: 0.0, sea_level: 0.0,
alt: Grid::new(Vec2::new(1, 1), 1), alt: Grid::new(Vec2::new(1, 1), 1),
sites: Vec::new(), sites: Vec::new(),
pois: Vec::new(),
}; };
#[cfg(feature = "worldgen")] #[cfg(feature = "worldgen")]

2
server/src/test_world.rs
View File

@ -1,5 +1,6 @@
use common::{ use common::{
generation::{ChunkSupplement, EntityInfo}, generation::{ChunkSupplement, EntityInfo},
resources::TimeOfDay,
terrain::{ terrain::{
Block, BlockKind, MapSizeLg, SpriteKind, TerrainChunk, TerrainChunkMeta, TerrainChunkSize, Block, BlockKind, MapSizeLg, SpriteKind, TerrainChunk, TerrainChunkMeta, TerrainChunkSize,
}, },
@ -48,6 +49,7 @@ impl World {
_index: IndexRef, _index: IndexRef,
chunk_pos: Vec2<i32>, chunk_pos: Vec2<i32>,
_should_continue: impl FnMut() -> bool, _should_continue: impl FnMut() -> bool,
_time: Option<TimeOfDay>,
) -> Result<(TerrainChunk, ChunkSupplement), ()> { ) -> Result<(TerrainChunk, ChunkSupplement), ()> {
let (x, y) = chunk_pos.map(|e| e.to_le_bytes()).into_tuple(); let (x, y) = chunk_pos.map(|e| e.to_le_bytes()).into_tuple();
let mut rng = SmallRng::from_seed([ let mut rng = SmallRng::from_seed([