load

Author: mzhang28

resources/beatmap/insane.ron

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1eeb25b326a39e7318a10e3db5b6e99c37a23be967edeb5cbebeb9715e72fb08
-size 36
+oid sha256:59e6a1cc29021cd1ed7d3eea78775f26be328b4772f2a5a577f9689f5cb8f125
+size 83

src/bundle.rs

@@ -3,10 +3,13 @@ use amethyst::{
     ecs::prelude::DispatcherBuilder,
 };
 
+use crate::systems::*;
+
 pub struct OsuBundle;
 
 impl<'a, 'b> SystemBundle<'a, 'b> for OsuBundle {
     fn build(self, builder: &mut DispatcherBuilder<'a, 'b>) -> bundle::Result<()> {
+        builder.add(BeatmapSystem::new(), "beatmap_system", &[]);
         Ok(())
     }
 }

src/components/hitobject.rs

@@ -1,6 +1,15 @@
 use amethyst::ecs::prelude::{Component, DenseVecStorage};
 
-pub struct HitObject;
+#[derive(Clone)]
+pub struct HitObject {
+    pub time: f64,
+    pub kind: HitObjectKind,
+}
+
+#[derive(Clone)]
+pub enum HitObjectKind {
+    HitCircle,
+}
 
 impl Component for HitObject {
     type Storage = DenseVecStorage<Self>;

src/components/mod.rs

@@ -1,3 +1,3 @@
 mod hitobject;
 
-pub use hitobject::HitObject;
+pub use hitobject::{HitObject, HitObjectKind};

src/main.rs

@@ -10,10 +10,10 @@ mod state;
 mod systems;
 
 use amethyst::{
+    core::transform::TransformBundle,
     prelude::*,
     renderer::{DisplayConfig, DrawFlat2D, Pipeline, RenderBundle, Stage},
     ui::{DrawUi, UiBundle},
-    core::transform::TransformBundle,
     utils::application_root_dir,
 };
 

src/resources/hitcircle.rs

@@ -1,6 +1,9 @@
 use amethyst::{assets::Handle, renderer::Mesh};
 
+use crate::components::HitObject as HitObjectComponent;
+
 #[derive(Clone)]
 pub struct HitCircleResource {
     pub hitcircle_mesh: Handle<Mesh>,
+    pub component: HitObjectComponent,
 }

src/resources/mod.rs

@@ -1,22 +1,87 @@
 mod hitcircle;
 
 use amethyst::{
-    assets::{AssetStorage, Loader},
+    assets::{AssetStorage, Handle, Loader},
+    core::nalgebra::{Vector2, Vector3},
     ecs::prelude::World,
-    renderer::{PngFormat, Texture, TextureMetadata},
+    renderer::{Material, MaterialDefaults, Mesh, PngFormat, PosTex, Texture, TextureMetadata},
 };
 
-fn load_single_texture_png(name: &'static str, world: &mut World) {
+use crate::components::{HitObject as HitObjectComponent, HitObjectKind};
+
+use self::hitcircle::HitCircleResource;
+
+fn create_png_vertices(left: f32, bottom: f32, right: f32, top: f32) -> Vec<PosTex> {
+    vec![
+        PosTex {
+            position: Vector3::new(left, bottom, 0.0),
+            tex_coord: Vector2::new(0.0, 0.0),
+        },
+        PosTex {
+            position: Vector3::new(right, bottom, 0.0),
+            tex_coord: Vector2::new(1.0, 0.0),
+        },
+        PosTex {
+            position: Vector3::new(left, top, 0.0),
+            tex_coord: Vector2::new(0.0, 1.0),
+        },
+        PosTex {
+            position: Vector3::new(right, top, 0.0),
+            tex_coord: Vector2::new(1.0, 1.0),
+        },
+        PosTex {
+            position: Vector3::new(left, top, 0.),
+            tex_coord: Vector2::new(0.0, 1.0),
+        },
+        PosTex {
+            position: Vector3::new(right, bottom, 0.0),
+            tex_coord: Vector2::new(1.0, 0.0),
+        },
+    ]
+}
+
+fn load_single_texture_png(
+    name: &'static str,
+    png_size: [f32; 2],
+    world: &mut World,
+) -> (Handle<Mesh>, Material) {
     let loader = world.read_resource::<Loader>();
-    loader.load(
+    let albedo = loader.load(
         name,
         PngFormat,
         TextureMetadata::srgb_scale(),
         (),
         &world.read_resource::<AssetStorage<Texture>>(),
     );
+
+    let mat_defaults = world.read_resource::<MaterialDefaults>();
+    let material = Material {
+        albedo,
+        ..mat_defaults.0.clone()
+    };
+
+    let vertices = create_png_vertices(0.0, 0.0, png_size[0], png_size[1]);
+    let mesh = loader.load_from_data(
+        vertices.into(),
+        (),
+        &world.read_resource::<AssetStorage<Mesh>>(),
+    );
+    (mesh, material)
+}
+
+fn load_hitcircle_resource(world: &mut World) -> HitCircleResource {
+    let (mesh, material) =
+        load_single_texture_png("resources/skin/hitcircle.png", [128.0, 128.0], world);
+    let resource = HitCircleResource {
+        hitcircle_mesh: mesh,
+        component: HitObjectComponent {
+            time: 0.0,
+            kind: HitObjectKind::HitCircle,
+        }
+    };
+    world.add_resource(resource.clone());
+    resource
 }
 
 pub fn load_skin(world: &mut World) {
-    load_single_texture_png("resources/skin/hitcircle.png", world);
 }

src/systems/beatmap.rs

@@ -1,14 +1,19 @@
-use amethyst::{ecs::prelude::*, core::timing::Time};
+use amethyst::{core::timing::Time, ecs::prelude::*};
 
 use crate::components::HitObject;
 
 pub struct BeatmapSystem;
 
+impl BeatmapSystem {
+    pub fn new() -> Self {
+        BeatmapSystem
+    }
+}
+
 impl<'s> System<'s> for BeatmapSystem {
-    type SystemData = (WriteStorage<'s, HitObject>, Read<'s, Time>,);
+    type SystemData = (WriteStorage<'s, HitObject>, Read<'s, Time>);
 
-    fn run(&mut self, (mut hitobjects, time,): Self::SystemData) {
-        for hitobject in &mut hitobjects.join() {
-        }
+    fn run(&mut self, (mut hitobjects, time): Self::SystemData) {
+        for hitobject in &mut hitobjects.join() {}
     }
 }

src/systems/mod.rs

@@ -1 +1,3 @@
 mod beatmap;
+
+pub use beatmap::BeatmapSystem;