From 91057edfac8ced520408e8aac4b5e7cf2579e306 Mon Sep 17 00:00:00 2001 From: timokoesters Date: Mon, 22 Apr 2019 10:20:25 +0200 Subject: [PATCH 1/2] Remove .internal and .internal_mut Former-commit-id: 261b656ec400f6780f2be2f5a4c331cc3b2a64a2 --- common/src/state.rs | 44 ++++++++++++++++++------------------- server/src/cmd.rs | 2 +- server/src/lib.rs | 38 +++++++++++++++----------------- voxygen/src/scene/figure.rs | 2 +- voxygen/src/scene/mod.rs | 1 - 5 files changed, 41 insertions(+), 46 deletions(-) diff --git a/common/src/state.rs b/common/src/state.rs index 6a12cc6d7d..e8b4601d94 100644 --- a/common/src/state.rs +++ b/common/src/state.rs @@ -97,41 +97,41 @@ impl State { ecs.register_synced::(); // Register unsynched (or synced by other means) components - ecs.internal_mut().register::(); - ecs.internal_mut().register::(); - ecs.internal_mut().register::(); - ecs.internal_mut().register::(); - ecs.internal_mut().register::(); - ecs.internal_mut().register::(); + ecs.register::(); + ecs.register::(); + ecs.register::(); + ecs.register::(); + ecs.register::(); + ecs.register::(); // Register resources used by the ECS - ecs.internal_mut().add_resource(TimeOfDay(0.0)); - ecs.internal_mut().add_resource(Time(0.0)); - ecs.internal_mut().add_resource(DeltaTime(0.0)); - ecs.internal_mut().add_resource(TerrainMap::new()); + ecs.add_resource(TimeOfDay(0.0)); + ecs.add_resource(Time(0.0)); + ecs.add_resource(DeltaTime(0.0)); + ecs.add_resource(TerrainMap::new()); } /// Register a component with the state's ECS pub fn with_component(mut self) -> Self where ::Storage: Default { - self.ecs.internal_mut().register::(); + self.ecs.register::(); self } /// Write a component attributed to a particular entity pub fn write_component(&mut self, entity: EcsEntity, comp: C) { - let _ = self.ecs.internal_mut().write_storage().insert(entity, comp); + let _ = self.ecs.write_storage().insert(entity, comp); } /// Read a component attributed to a particular entity pub fn read_component_cloned(&self, entity: EcsEntity) -> Option { - self.ecs.internal().read_storage().get(entity).cloned() + self.ecs.read_storage().get(entity).cloned() } /// Get a read-only reference to the storage of a particular component type pub fn read_storage(&self) -> EcsStorage>> { - self.ecs.internal().read_storage::() + self.ecs.read_storage::() } /// Get a reference to the internal ECS world @@ -154,27 +154,25 @@ impl State { /// /// Note that this should not be used for physics, animations or other such localised timings. pub fn get_time_of_day(&self) -> f64 { - self.ecs.internal().read_resource::().0 + self.ecs.read_resource::().0 } /// Get the current in-game time. /// /// Note that this does not correspond to the time of day. pub fn get_time(&self) -> f64 { - self.ecs.internal().read_resource::