From c155390e22e5067b0a2beccf95b6cabdafde954d Mon Sep 17 00:00:00 2001
From: Hazel Rae Aranda <hazelra@disroot.org>
Date: Tue, 9 Mar 2021 15:51:45 -0500
Subject: [PATCH] Gotta move

---
 assets/shaders/crt/frag.glsl                |   4 +-
 assets/textures/backgrounds/grass-hills.png | Bin 0 -> 23350 bytes
 assets/textures/tiles/atlas                 |   0
 src/assets.rs                               | 153 ++++++++++++++++++++
 src/main.rs                                 |  26 ++--
 src/resources.rs                            |  74 ----------
 src/state.rs                                |  20 +--
 src/state/test_state.rs                     |  64 ++++----
 8 files changed, 218 insertions(+), 123 deletions(-)
 create mode 100644 assets/textures/backgrounds/grass-hills.png
 create mode 100644 assets/textures/tiles/atlas
 create mode 100644 src/assets.rs
 delete mode 100644 src/resources.rs

diff --git a/assets/shaders/crt/frag.glsl b/assets/shaders/crt/frag.glsl
index a320c80..621c9c9 100644
--- a/assets/shaders/crt/frag.glsl
+++ b/assets/shaders/crt/frag.glsl
@@ -8,8 +8,8 @@ uniform sampler2D texture;
 uniform vec2 screen_resolution;
 
 uniform vec2 curvature = vec2(3.0, 3.0);
-uniform vec2 scanline_opacity = vec2(1.0, 1.0);
-uniform float brightness = 3.0;
+uniform vec2 scanline_opacity = vec2(0.5, 0.5);
+uniform float brightness = 2.0;
 
 out vec4 f_color;
 
diff --git a/assets/textures/backgrounds/grass-hills.png b/assets/textures/backgrounds/grass-hills.png
new file mode 100644
index 0000000000000000000000000000000000000000..23a60c3a9ea9ec41b299091e17e969211315d32c
GIT binary patch
literal 23350
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

literal 0
HcmV?d00001

diff --git a/assets/textures/tiles/atlas b/assets/textures/tiles/atlas
new file mode 100644
index 0000000..e69de29
diff --git a/src/assets.rs b/src/assets.rs
new file mode 100644
index 0000000..5ff2d2e
--- /dev/null
+++ b/src/assets.rs
@@ -0,0 +1,153 @@
+use std::collections::HashMap;
+
+use glium::{
+    texture::{RawImage2d, SrgbTexture2d},
+    Display, Program,
+};
+use glob::glob;
+
+pub type Textures = HashMap<String, SrgbTexture2d>;
+
+#[derive(Debug)]
+pub struct TextureAtlas {
+    pub texture: SrgbTexture2d,
+    rects: HashMap<String, glium::Rect>,
+    width: u32,
+    height: u32,
+}
+
+pub struct AtlasUVs {
+    pub bottom_left: [f32; 2],
+    pub bottom_right: [f32; 2],
+    pub top_left: [f32; 2],
+    pub top_right: [f32; 2],
+}
+
+impl TextureAtlas {
+    fn new(display: &Display) -> TextureAtlas {
+        log::info!("Loading textures");
+        let paths = glob("assets/textures/**/*.png").unwrap();
+        let items = paths.map(|entry| {
+            let path = entry.unwrap();
+
+            let image = image::open(&path).unwrap().to_rgba8();
+            let image_dimensions = image.dimensions();
+            let image = image.into_raw();
+
+            let name_path = path
+                .with_extension("")
+                .strip_prefix("assets/textures/")
+                .unwrap()
+                .to_owned();
+            let mut name = String::new();
+            for part in name_path.iter() {
+                name.push_str(part.to_str().unwrap());
+                name.push(':');
+            }
+            name.pop();
+
+            crunch::Item::new(
+                (name, image),
+                image_dimensions.0 as usize,
+                image_dimensions.1 as usize,
+                crunch::Rotation::None,
+            )
+        });
+
+        log::info!("Packing textures into atlas");
+        let (width, height, items) = crunch::pack_into_po2(4096, items).unwrap();
+
+        let items = items.into_iter().map(|entry| {
+            let rect = glium::Rect {
+                left: entry.0.x as u32,
+                bottom: entry.0.y as u32,
+                width: entry.0.w as u32,
+                height: entry.0.h as u32,
+            };
+            let name = entry.1 .0;
+            let image = entry.1 .1;
+            (name, image, rect)
+        });
+        let mut atlas = TextureAtlas {
+            texture: SrgbTexture2d::empty(display, width as u32, height as u32).unwrap(),
+            rects: HashMap::new(),
+            width: width as u32,
+            height: height as u32,
+        };
+        for (name, image, rect) in items {
+            atlas.texture.write(
+                rect,
+                RawImage2d::from_raw_rgba_reversed(&image, (rect.width, rect.height)),
+            );
+            atlas.rects.insert(name, rect);
+        }
+        atlas
+    }
+
+    pub fn get_uv(&self, name: String) -> AtlasUVs {
+        let rect = self.rects.get(&name).unwrap();
+        AtlasUVs {
+            bottom_left: Self::coord_to_uv(
+                rect.left,
+                rect.bottom + rect.height,
+                self.width,
+                self.height,
+            ),
+            bottom_right: Self::coord_to_uv(
+                rect.left + rect.width,
+                rect.bottom + rect.height,
+                self.width,
+                self.height,
+            ),
+            top_left: Self::coord_to_uv(rect.left, rect.bottom, self.width, self.height),
+            top_right: Self::coord_to_uv(
+                rect.left + rect.width,
+                rect.bottom,
+                self.width,
+                self.height,
+            ),
+        }
+    }
+
+    fn coord_to_uv(x: u32, y: u32, width: u32, height: u32) -> [f32; 2] {
+        [x as f32 / width as f32, (y as f32 / height as f32)]
+    }
+}
+
+pub type Shaders = HashMap<String, Program>;
+
+fn load_shaders(display: &Display) -> Shaders {
+    log::info!("Loading shaders.");
+    let mut shaders: Shaders = Shaders::new();
+    for entry in glob("assets/shaders/*").unwrap() {
+        if let Ok(path) = entry {
+            // Operate only on directories
+            if path.is_file() {
+                continue;
+            }
+
+            let vert_source = std::fs::read_to_string(path.join("vert.glsl")).unwrap();
+            let frag_source = std::fs::read_to_string(path.join("frag.glsl")).unwrap();
+            let program = Program::from_source(display, &vert_source, &frag_source, None).unwrap();
+
+            let name = path.file_name().unwrap().to_str().unwrap().to_owned();
+            shaders.insert(name.to_string(), program);
+            log::info!("Loaded shader {:?} from {:?}.", name, path);
+        }
+    }
+    shaders
+}
+
+pub struct Assets {
+    pub texture_atlas: TextureAtlas,
+    pub shaders: Shaders,
+}
+
+impl Assets {
+    pub fn new(display: &Display) -> Assets {
+        Assets {
+            texture_atlas: TextureAtlas::new(display),
+            shaders: load_shaders(display),
+        }
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index fcdb071..953c19a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,24 @@
 use std::time::{Duration, Instant};
 
 use anymap::AnyMap;
+use assets::{Assets, Shaders};
 use cgmath::Matrix3;
 use glium::{
     glutin, index::PrimitiveType, texture::Texture2d, uniform, Display, Frame, IndexBuffer,
     Surface, VertexBuffer,
 };
-use glium_glyph::{glyph_brush::Section, GlyphBrush};
+use glium_glyph::{
+    glyph_brush::{rusttype::Font, Section},
+    GlyphBrush,
+};
 use glutin::{
     event::{Event, WindowEvent},
     event_loop::ControlFlow,
 };
-use resources::Shaders;
 use simplelog::{TermLogger, TerminalMode};
 use state::GameState;
 
-pub mod resources;
+pub mod assets;
 pub mod state;
 
 const TIMESTEP: f32 = 1.0 / 20.0;
@@ -41,7 +44,7 @@ struct State {
     current_state: Box<dyn GameState>,
     next_state: Option<Box<dyn GameState>>,
 
-    resources: AnyMap,
+    resources: Assets,
 }
 
 impl State {
@@ -83,12 +86,11 @@ impl State {
         };
 
         // Set initial state
-        let current_state = Box::new(state::TestState);
+        let current_state = Box::new(state::TestState { time: 0.0 });
         let next_state = None;
 
         // The resources map
-        let mut resources = AnyMap::new();
-        resources::load_resources(display, &mut resources);
+        let resources = Assets::new(display);
 
         // Package it all together UwU
         State {
@@ -130,7 +132,7 @@ impl State {
         let render_indices =
             IndexBuffer::new(display, PrimitiveType::TriangleStrip, &[1, 2, 0, 3 as u16]).unwrap();
 
-        let program = self.resources.get::<Shaders>().unwrap().get("crt").unwrap();
+        let program = self.resources.shaders.get("crt").unwrap();
 
         let mut scale = (1.0, 1.0);
         if self.screen_scale.0 < self.screen_scale.1 {
@@ -143,7 +145,7 @@ impl State {
         let uniforms = uniform! {
             matrix: cgmath::conv::array3x3(scale_matrix),
             texture: self.render_texture.sampled().magnify_filter(glium::uniforms::MagnifySamplerFilter::Nearest),
-            screen_resolution: [SCREEN_WIDTH, SCREEN_HEIGHT],
+            screen_resolution: [SCREEN_HEIGHT, SCREEN_HEIGHT],
             /*curvature: [3.0, 3.0 as f32],
             scanline_opacity: [0.5, 0.5 as f32],
             brightness: 2.0 as f32,*/
@@ -180,6 +182,11 @@ fn main() {
         Display::new(wb, cb, &event_loop).unwrap()
     };
 
+    // For font rendering
+    let dejavu = std::fs::read("assets/fonts/DejaVuSans.ttf").unwrap();
+    let fonts = vec![Font::from_bytes(dejavu).unwrap()];
+    let mut glyph_brush = GlyphBrush::new(&display, fonts);
+
     // The main state of program or whatever
     let mut state = State::new(&display);
 
@@ -220,7 +227,6 @@ fn main() {
                 state.render(&display, &mut target);
 
                 // Draw the FPS Indicator
-                let glyph_brush = state.resources.get_mut::<GlyphBrush>().unwrap();
                 glyph_brush.queue(Section {
                     text: &format!("FPS: {:?}", state.current_fps),
                     screen_position: (0.0, 0.0),
diff --git a/src/resources.rs b/src/resources.rs
deleted file mode 100644
index 6b39354..0000000
--- a/src/resources.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-use std::collections::HashMap;
-
-use anymap::AnyMap;
-use glium::{texture::SrgbTexture2d, Display, Program};
-use glium_glyph::{glyph_brush::rusttype::Font, GlyphBrush};
-use glob::glob;
-
-pub type Textures = HashMap<String, SrgbTexture2d>;
-pub type Shaders = HashMap<String, Program>;
-
-// Set up and load all global resources.
-pub fn load_resources(display: &Display, resources: &mut AnyMap) {
-    // Load images
-    log::info!("Loading textures");
-    let mut textures: Textures = HashMap::new();
-    for entry in glob("assets/textures/**/*.png").unwrap() {
-        use image::io::Reader;
-
-        if let Ok(path) = entry {
-            let image = Reader::open(&path).unwrap().decode().unwrap().to_rgba8();
-            let image_dimensions = image.dimensions();
-
-            let image = glium::texture::RawImage2d::from_raw_rgba_reversed(
-                &image.into_raw(),
-                image_dimensions,
-            );
-            let texture = SrgbTexture2d::new(display, image).unwrap();
-
-            let name_path = path
-                .with_extension("")
-                .strip_prefix("assets/textures/")
-                .unwrap()
-                .to_owned();
-            let mut name = String::new();
-            for part in name_path.iter() {
-                name.push_str(part.to_str().unwrap());
-                name.push(':');
-            }
-            name.pop();
-
-            textures.insert(name.to_string(), texture);
-            log::info!("Loaded texture {:?} from {:?}.", name, path);
-        }
-    }
-    resources.insert(textures);
-
-    // Load shaders
-    log::info!("Loading shaders.");
-    let mut shaders: HashMap<String, Program> = HashMap::new();
-    for entry in glob("assets/shaders/*").unwrap() {
-        if let Ok(path) = entry {
-            // Operate only on directories
-            if path.is_file() {
-                continue;
-            }
-
-            let vert_source = std::fs::read_to_string(path.join("vert.glsl")).unwrap();
-            let frag_source = std::fs::read_to_string(path.join("frag.glsl")).unwrap();
-            let program = Program::from_source(display, &vert_source, &frag_source, None).unwrap();
-
-            let name = path.file_name().unwrap().to_str().unwrap().to_owned();
-            shaders.insert(name.to_string(), program);
-            log::info!("Loaded shader {:?} from {:?}.", name, path);
-        }
-    }
-    resources.insert(shaders);
-
-    // Set up font stuff
-    let dejavu = std::fs::read("assets/fonts/DejaVuSans.ttf").unwrap();
-    let fonts = vec![Font::from_bytes(dejavu).unwrap()];
-    let glyph_brush = GlyphBrush::new(display, fonts);
-    log::info!("Set up font.");
-    resources.insert(glyph_brush);
-}
diff --git a/src/state.rs b/src/state.rs
index 0354e4f..2c56313 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -4,26 +4,22 @@ use glium::{framebuffer::SimpleFrameBuffer, glutin::event::Event, Display, Frame
 mod test_state;
 pub use test_state::TestState;
 
+use crate::assets::Assets;
+
 pub trait GameState {
-    fn input(&mut self, resources: &mut AnyMap, event: &Event<()>);
-    fn update(&mut self, resources: &mut AnyMap, dt: f32) -> Option<Box<dyn GameState>>;
-    fn render(&mut self, resources: &mut AnyMap, display: &Display, target: &mut SimpleFrameBuffer);
+    fn input(&mut self, assets: &Assets, event: &Event<()>);
+    fn update(&mut self, assets: &Assets, dt: f32) -> Option<Box<dyn GameState>>;
+    fn render(&mut self, assets: &Assets, display: &Display, target: &mut SimpleFrameBuffer);
 }
 
 pub struct DummyState;
 
 impl GameState for DummyState {
-    fn update(&mut self, _resourcess: &mut AnyMap, _dt: f32) -> Option<Box<dyn GameState>> {
+    fn update(&mut self, _assets: &Assets, _dt: f32) -> Option<Box<dyn GameState>> {
         None
     }
 
-    fn input(&mut self, _resources: &mut AnyMap, _event: &Event<()>) {}
+    fn input(&mut self, _assets: &Assets, _event: &Event<()>) {}
 
-    fn render(
-        &mut self,
-        _resources: &mut AnyMap,
-        _display: &Display,
-        _target: &mut SimpleFrameBuffer,
-    ) {
-    }
+    fn render(&mut self, _assets: &Assets, _display: &Display, _target: &mut SimpleFrameBuffer) {}
 }
diff --git a/src/state/test_state.rs b/src/state/test_state.rs
index b215a9f..ed02ca2 100644
--- a/src/state/test_state.rs
+++ b/src/state/test_state.rs
@@ -2,24 +2,26 @@ use glium::{
     framebuffer::SimpleFrameBuffer, implement_vertex, index::PrimitiveType, uniform,
     uniforms::Sampler, IndexBuffer, Surface, VertexBuffer,
 };
-use resources::Shaders;
 
-use crate::resources::{self, Textures};
+use crate::assets::Assets;
 
 use super::GameState;
 
-pub struct TestState;
+pub struct TestState {
+    pub time: f32,
+}
 
 impl GameState for TestState {
-    fn input(&mut self, resources: &mut anymap::AnyMap, event: &glium::glutin::event::Event<()>) {}
+    fn input(&mut self, assets: &Assets, event: &glium::glutin::event::Event<()>) {}
 
-    fn update(&mut self, resources: &mut anymap::AnyMap, dt: f32) -> Option<Box<dyn GameState>> {
+    fn update(&mut self, assets: &Assets, dt: f32) -> Option<Box<dyn GameState>> {
+        self.time += 0.0;
         None
     }
 
     fn render(
         &mut self,
-        resources: &mut anymap::AnyMap,
+        assets: &Assets,
         display: &glium::Display,
         target: &mut SimpleFrameBuffer,
     ) {
@@ -33,24 +35,46 @@ impl GameState for TestState {
 
             implement_vertex!(Vertex, position, tex_coords);
 
+            let tex_coords = crate::assets::AtlasUVs {
+                top_left: [0.0, 0.0],
+                top_right: [1.0, 0.0],
+                bottom_left: [0.0, 1.0],
+                bottom_right: [1.0, 1.0],
+            };
+            let tex_coords = assets
+                .texture_atlas
+                .get_uv("backgrounds:grass-hills".to_string());
+
             VertexBuffer::new(
                 display,
                 &[
                     Vertex {
                         position: [-1.0, -1.0],
-                        tex_coords: [0.0, 0.0],
+                        tex_coords: [
+                            (tex_coords.top_left[0] - self.time.sin() / 8.0),
+                            tex_coords.top_left[1],
+                        ],
                     },
                     Vertex {
                         position: [-1.0, 1.0],
-                        tex_coords: [0.0, 1.0],
+                        tex_coords: [
+                            (tex_coords.bottom_left[0] - self.time.sin() / 8.0),
+                            tex_coords.bottom_left[1],
+                        ],
                     },
                     Vertex {
                         position: [1.0, 1.0],
-                        tex_coords: [1.0, 1.0],
+                        tex_coords: [
+                            (tex_coords.bottom_right[0] / 2.0 - self.time.sin() / 8.0),
+                            tex_coords.bottom_right[1],
+                        ],
                     },
                     Vertex {
                         position: [1.0, -1.0],
-                        tex_coords: [1.0, 0.0],
+                        tex_coords: [
+                            (tex_coords.top_right[0] / 2.0 - self.time.sin() / 8.0),
+                            tex_coords.top_right[1],
+                        ],
                     },
                 ],
             )
@@ -60,23 +84,13 @@ impl GameState for TestState {
         let index_buffer =
             IndexBuffer::new(display, PrimitiveType::TriangleStrip, &[1 as u16, 2, 0, 3]).unwrap();
 
-        let program = resources.get::<Shaders>().unwrap().get("basic").unwrap();
-
-        let texture = resources
-            .get::<Textures>()
-            .unwrap()
-            .get("tiles:dirt")
-            .unwrap();
+        let program = assets.shaders.get("basic").unwrap();
 
         let uniforms = uniform! {
-            /*matrix: [
-                [1.0,0.0,0.0],
-                [0.0,1.0,0.0],
-                [0.0,0.0,1.0 as f32],
-            ],*/
-            matrix: cgmath::conv::array3x3(cgmath::Matrix3::from_nonuniform_scale(1.0/crate::SCREEN_WIDTH*16.0, 1.0/crate::SCREEN_HEIGHT*16.0)),
-            texture: texture.sampled().magnify_filter(glium::uniforms::MagnifySamplerFilter::Nearest),
-
+            matrix: cgmath::conv::array3x3(
+                cgmath::Matrix3::from_nonuniform_scale(1.0, 1.0 as f32)
+            ),
+            texture: assets.texture_atlas.texture.sampled().magnify_filter(glium::uniforms::MagnifySamplerFilter::Nearest),
         };
 
         target