From 0d2cf27e27df6b500ac55ed90828c174acee9b96 Mon Sep 17 00:00:00 2001
From: grzi <jeremy.thulliez@gmail.com>
Date: Thu, 11 Mar 2021 19:03:38 +0100
Subject: [PATCH] feat: addition to the rendering trait and banner

---
 README.md                              |  9 ++-
 examples/hello-world/main.rs           |  8 +--
 src/application.rs                     | 24 ++++---
 src/config/scion_config.rs             |  2 +-
 src/lib.rs                             |  2 +-
 src/renderer/bidimensional/mod.rs      | 27 ++++++++
 src/renderer/bidimensional/renderer.rs | 16 +++++
 src/renderer/bidimensional/triangle.rs | 87 ++++++++++++++++++++++++++
 src/renderer/mod.rs                    | 16 +++++
 9 files changed, 175 insertions(+), 16 deletions(-)
 create mode 100644 src/renderer/bidimensional/mod.rs
 create mode 100644 src/renderer/bidimensional/renderer.rs
 create mode 100644 src/renderer/bidimensional/triangle.rs

diff --git a/README.md b/README.md
index 91ac412..04e8723 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,7 @@
-# scion
-Scion is a minimalist, **easy** to use, game engine built on top of legion and miniquad.
+<img src="repo/banner.png" alt="Scion Engine" />
+
+Scion is a minimalist, **easy** to use, modulable game engine built on top of legion and miniquad.
+
+
+
+
diff --git a/examples/hello-world/main.rs b/examples/hello-world/main.rs
index bdca38c..d7d735f 100644
--- a/examples/hello-world/main.rs
+++ b/examples/hello-world/main.rs
@@ -1,16 +1,16 @@
 use scion::application::Scion;
 use scion::legion::{system, Resources, World};
 use scion::utils::time::Time;
-use log::info;
+use log::{info};
 use scion::utils::window::WindowDimensions;
-use scion::config::scion_config::{ScionConfig, ScionConfigBuilder};
-use scion::config::window_config::{WindowConfig, WindowConfigBuilder};
+
+
 use scion::renderer::{RendererType, ScionRenderer};
 use miniquad::Context;
 
 struct T;
 impl ScionRenderer for T{
-    fn draw(&mut self, context: &mut Context, world: &mut World, resource: &mut Resources) {
+    fn draw(&mut self, _context: &mut Context, _world: &mut World, _resource: &mut Resources) {
         unimplemented!()
     }
 }
diff --git a/src/application.rs b/src/application.rs
index 935c19c..a2090c5 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -6,7 +6,9 @@ use miniquad::{conf, Context, EventHandlerFree, UserData};
 use crate::config::scion_config::{ScionConfig, ScionConfigReader};
 use crate::utils::time::Time;
 use crate::utils::window::WindowDimensions;
-use crate::renderer::RendererType;
+use crate::renderer::{RendererType, ScionRenderer};
+
+use crate::renderer::bidimensional::triangle::Triangle;
 
 /// `Scion` is the entry point of any application made with Scion engine.
 pub struct Scion {
@@ -14,7 +16,8 @@ pub struct Scion {
     world: World,
     resources: Resources,
     schedule: Schedule,
-    context: Option<Context>
+    context: Option<Context>,
+    renderer: Box<dyn ScionRenderer>,
 }
 
 impl EventHandlerFree for Scion {
@@ -23,9 +26,11 @@ impl EventHandlerFree for Scion {
     }
 
     fn draw(&mut self) {
-        self.context.as_mut().expect("Miniquad context is mandatory to use the eventHandlerFree")
-            .clear(Some((0., 1., 1., 1.)), None, None);
+        self.renderer.draw(
+            self.context.as_mut().expect("Miniquad context is mandatory"),
+            &mut self.world, &mut self.resources)
     }
+
     fn resize_event(&mut self, w: f32, h: f32) {
         self.resources
             .get_mut::<WindowDimensions>().expect("Missing Screen Dimension Resource. Did something deleted it ?").set(w, h);
@@ -51,18 +56,19 @@ impl Scion {
         ScionBuilder::new(app_config)
     }
 
-    fn setup(mut self, context: Context ) -> Self{
+    fn setup(mut self, context: Context) -> Self {
         let screen_size = context.screen_size();
         self.context = Some(context);
         self.resources.insert(Time::default());
 
         self.resources.insert(WindowDimensions::new(screen_size));
+        self.world.push((Triangle,));
         self
     }
 
     fn next_frame(&mut self) {
-            self.resources.get_mut::<Time>().expect("Time is an internal resource and can't be missing").frame();
-            self.schedule.execute(&mut self.world, &mut self.resources);
+        self.resources.get_mut::<Time>().expect("Time is an internal resource and can't be missing").frame();
+        self.schedule.execute(&mut self.world, &mut self.resources);
     }
 }
 
@@ -111,10 +117,12 @@ impl ScionBuilder {
             world: Default::default(),
             resources: Default::default(),
             schedule: self.schedule_builder.build(),
-            context: None
+            context: None,
+            renderer: self.renderer.into_boxed_renderer()
         };
 
         let mut miniquad_conf = conf::Conf::default();
+        miniquad_conf.high_dpi=true;
         if let Some(window_config) = scion.config.window_config.as_ref() {
             miniquad_conf.fullscreen = window_config.fullscreen;
         }
diff --git a/src/config/scion_config.rs b/src/config/scion_config.rs
index 402da6c..560c5fd 100644
--- a/src/config/scion_config.rs
+++ b/src/config/scion_config.rs
@@ -90,7 +90,7 @@ mod tests {
     fn test_read_scion_toml() {
         // Delete scion.toml before the test
         let path = Path::new("Scion.toml");
-        std::fs::remove_file(path);
+        let _r = std::fs::remove_file(path);
 
         let config = ScionConfigReader::read_or_create_scion_toml();
         assert!(config.is_ok());
diff --git a/src/lib.rs b/src/lib.rs
index 4a59669..f47bfb5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,4 +4,4 @@ pub use legion;
 pub mod application;
 pub mod config;
 pub mod utils;
-pub mod renderer;
+pub mod renderer;
\ No newline at end of file
diff --git a/src/renderer/bidimensional/mod.rs b/src/renderer/bidimensional/mod.rs
new file mode 100644
index 0000000..5ac48df
--- /dev/null
+++ b/src/renderer/bidimensional/mod.rs
@@ -0,0 +1,27 @@
+pub mod renderer;
+pub mod triangle;
+
+#[repr(C)]
+pub struct Vec2 {
+    x: f32,
+    y: f32,
+}
+
+#[repr(C)]
+pub struct Vec4 {
+    r: f32,
+    g: f32,
+    b: f32,
+    a: f32,
+}
+
+#[repr(C)]
+pub struct Vertex {
+    pos: Vec2,
+    color: Vec4,
+}
+
+#[repr(C)]
+pub struct Uniforms {
+    pub offset: (f32, f32),
+}
\ No newline at end of file
diff --git a/src/renderer/bidimensional/renderer.rs b/src/renderer/bidimensional/renderer.rs
new file mode 100644
index 0000000..34b150b
--- /dev/null
+++ b/src/renderer/bidimensional/renderer.rs
@@ -0,0 +1,16 @@
+use crate::renderer::{ScionRenderer, Renderable2D};
+use miniquad::Context;
+use legion::{Resources, World, Entity, IntoQuery};
+use crate::renderer::bidimensional::triangle::Triangle;
+
+
+pub struct Scion2D;
+
+impl ScionRenderer for Scion2D {
+    fn draw(&mut self, context: &mut Context, world: &mut World, _resource: &mut Resources) {
+        let mut query_triangles = <(Entity, &Triangle)>::query();
+        query_triangles.for_each(world,|_triangle|{
+           Triangle::render(context)
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/renderer/bidimensional/triangle.rs b/src/renderer/bidimensional/triangle.rs
new file mode 100644
index 0000000..b7e0ae2
--- /dev/null
+++ b/src/renderer/bidimensional/triangle.rs
@@ -0,0 +1,87 @@
+use crate::renderer::Renderable2D;
+use miniquad::{Context, Buffer, BufferType, Bindings, Shader, Pipeline, BufferLayout, VertexAttribute, VertexFormat };
+use crate::renderer::bidimensional::{Vertex, Vec2, Uniforms, Vec4};
+
+pub struct Triangle;
+
+impl Renderable2D for Triangle {
+    fn render(context: &mut Context) {
+        let vertices: [Vertex; 3] = [
+            Vertex { pos: Vec2 { x: -0.5, y: -0.5 }, color: Vec4 { r: 1.0, g: 0., b: 0., a: 1.0, }, },
+            Vertex { pos: Vec2 { x: 0.5, y: -0.5 }, color: Vec4 { r: 0., g: 1., b: 0., a: 1.0 } },
+            Vertex { pos: Vec2 { x: 0., y: 0.5 }, color: Vec4 { r: 0., g: 0., b: 1., a: 1.0 } },
+        ];
+        let vertex_buffer = Buffer::immutable(context, BufferType::VertexBuffer, &vertices);
+
+        let indices: [u16; 6] = [0, 1, 2, 0, 2, 3];
+        let index_buffer = Buffer::immutable(context, BufferType::IndexBuffer, &indices);
+
+        let bindings = Bindings {
+            vertex_buffers: vec![vertex_buffer],
+            index_buffer,
+            images: vec![],
+        };
+
+        let shader = Shader::new(context, shader::VERTEX, shader::FRAGMENT, shader::meta()).unwrap();
+
+        let pipeline = Pipeline::new(
+            context,
+            &[BufferLayout::default()],
+            &[
+                VertexAttribute::new("pos", VertexFormat::Float2),
+                VertexAttribute::new("color", VertexFormat::Float4),
+            ],
+            shader,
+        );
+
+        context.begin_default_pass(Default::default());
+
+        context.apply_pipeline(&pipeline);
+        context.apply_bindings(&bindings);
+
+        context.apply_uniforms(&Uniforms {
+            offset: (0., 0.),
+        });
+
+        context.draw(0, 3, 1);
+        context.end_render_pass();
+
+        context.commit_frame();
+    }
+}
+
+mod shader {
+    use miniquad::*;
+
+    pub const VERTEX: &str =
+        r#"
+            #version 330 core
+            in vec2 pos;
+            in vec4 color;
+            uniform vec2 offset;
+            out lowp vec4 color_lowp;
+            void main() {
+                gl_Position = vec4(pos + offset, 0, 1);
+                color_lowp = color;
+            }
+        "#;
+
+    pub const FRAGMENT: &str =
+        r#"
+            #version 330 core
+            in lowp vec4 color_lowp;
+            out vec4 FragColor;
+            void main() {
+                FragColor = color_lowp;
+            }
+        "#;
+
+    pub fn meta() -> ShaderMeta {
+        ShaderMeta {
+            images: vec![],
+            uniforms: UniformBlockLayout {
+                uniforms: vec![UniformDesc::new("offset", UniformType::Float2)],
+            },
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index fe9a1ba..6925540 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -1,12 +1,19 @@
+pub mod bidimensional;
+use log::*;
 use miniquad::Context;
 use legion::{World, Resources};
 
+
 /// Trait to implement in order to create a renderer to use in a `Scion` application
 pub trait ScionRenderer {
     /// The draw method is called each frame
     fn draw(&mut self, context: &mut Context, world: &mut World, resource: &mut Resources);
 }
 
+pub trait Renderable2D {
+    fn render(context: &mut Context);
+}
+
 /// Type of renderer to use to render the game.
 pub enum RendererType {
     Scion2D,
@@ -17,4 +24,13 @@ impl Default for RendererType{
     fn default() -> Self {
         RendererType::Scion2D
     }
+}
+
+impl RendererType{
+    pub(crate) fn into_boxed_renderer(self) -> Box<dyn ScionRenderer>{
+        match self{
+            RendererType::Scion2D => { warn!("scion2S");Box::new(bidimensional::renderer::Scion2D) }
+            RendererType::Custom(boxed) => { warn!("Boxed"); boxed }
+        }
+    }
 }
\ No newline at end of file