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 'desttinghim/depot-improvements' into 'master'

Browse Source 
Depot fix and default world AABB

See merge request veloren/veloren!2067
This commit is contained in:
Marcel 2021-04-05 19:11:14 +00:00
commit 07017da19b
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/depot.rs
View File

@ -94,7 +94,7 @@ impl<T> Depot<T> {
if entry.gen == id.gen {
entry.item.as_ref()
} else {
panic!("Stale ID used to access depot entry");
None
}
} else {
None
@ -106,7 +106,7 @@ impl<T> Depot<T> {
if entry.gen == id.gen {
entry.item.as_mut()
} else {
panic!("Stale ID used to access depot entry");
None
}
} else {
None

22
server/src/lib.rs
View File

@ -64,8 +64,9 @@ use common::{
resources::TimeOfDay,
rtsim::RtSimEntity,
slowjob::SlowJobPool,
terrain::TerrainChunkSize,
terrain::{TerrainChunk, TerrainChunkSize},
uid::UidAllocator,
vol::RectRasterableVol,
};
use common_ecs::run_now;
use common_net::{
@ -78,7 +79,7 @@ use common_net::{
use common_sys::plugin::memory_manager::EcsWorld;
#[cfg(feature = "plugins")]
use common_sys::plugin::PluginMgr;
use common_sys::state::State;
use common_sys::state::{BuildAreas, State};
use metrics::{EcsSystemMetrics, PhysicsMetrics, TickMetrics};
use network::{Network, Pid, ProtocolAddr};
use persistence::{
@ -325,6 +326,23 @@ impl Server {
// Set the spawn point we calculated above
state.ecs_mut().insert(SpawnPoint(spawn_point));
// Insert a default AABB for the world
// TODO: prevent this from being deleted
{
let mut build_areas = state.ecs().write_resource::<BuildAreas>();
let world_size = world.sim().get_size().map(|e| e as i32)
* TerrainChunk::RECT_SIZE.map(|e| e as i32);
let world_aabb = Aabb {
min: Vec3::new(0, 0, -32768),
max: Vec3::new(world_size.x, world_size.y, 32767),
}
.made_valid();
let world_aabb_id = build_areas.areas.insert(world_aabb);
build_areas
.area_names
.insert("world".to_string(), world_aabb_id);
}
// Insert the world into the ECS (todo: Maybe not an Arc?)
let world = Arc::new(world);
state.ecs_mut().insert(Arc::clone(&world));