|
@@ -6,17 +6,12 @@ use ggez::{
|
|
|
Context, ContextBuilder, GameResult,
|
|
|
};
|
|
|
|
|
|
-mod nc {
|
|
|
- pub use ncollide2d::bounding_volume::*;
|
|
|
- pub use ncollide2d::broad_phase::*;
|
|
|
- pub use ncollide2d::narrow_phase::*;
|
|
|
-}
|
|
|
use specs::world::WorldExt;
|
|
|
|
|
|
pub mod components;
|
|
|
pub mod consts;
|
|
|
pub mod game;
|
|
|
-pub mod res;
|
|
|
+pub mod resources;
|
|
|
pub mod sys;
|
|
|
pub mod types;
|
|
|
|
|
@@ -43,7 +38,7 @@ impl EventHandler for MyGame {
|
|
|
if keycode == winit::VirtualKeyCode::Escape {
|
|
|
ggez::event::quit(ctx);
|
|
|
}
|
|
|
- self.world.write_resource::<res::KeySet>().insert(keycode);
|
|
|
+ self.world.write_resource::<resources::KeySet>().insert(keycode);
|
|
|
}
|
|
|
|
|
|
fn key_up_event(
|
|
@@ -52,7 +47,7 @@ impl EventHandler for MyGame {
|
|
|
keycode: winit::VirtualKeyCode,
|
|
|
_keymod: ggez::event::KeyMods,
|
|
|
) {
|
|
|
- self.world.write_resource::<res::KeySet>().remove(&keycode);
|
|
|
+ self.world.write_resource::<resources::KeySet>().remove(&keycode);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -61,7 +56,7 @@ fn main() -> Result<(), ggez::error::GameError> {
|
|
|
components::register(&mut world);
|
|
|
|
|
|
world.insert(ncollide2d::world::CollisionWorld::<f32, specs::Entity>::new(0.1));
|
|
|
- res::world_from_file(&mut world, "assets/main.tmx");
|
|
|
+ resources::world_from_file(&mut world, "assets/main.tmx");
|
|
|
|
|
|
// Make a Context and an EventLoop.
|
|
|
let (mut ctx, mut evloop) = ContextBuilder::new("game", "me")
|
|
@@ -82,7 +77,7 @@ fn main() -> Result<(), ggez::error::GameError> {
|
|
|
let mut sprites = ggez::graphics::spritebatch::SpriteBatch::new(image);
|
|
|
sprites.set_filter(ggez::graphics::FilterMode::Nearest);
|
|
|
world.insert(sprites);
|
|
|
- world.insert(res::KeySet::new());
|
|
|
+ world.insert(resources::KeySet::new());
|
|
|
|
|
|
let mut my_game = MyGame { world };
|
|
|
|