Skip to content

Commit e438897

Browse files
committedMay 26, 2019
minor changes
1 parent 9ad1b34 commit e438897

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed
 

‎src/gfx/render_system.rs

+13-7
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ use crate::ecs::components::base::C_Spatial2D;
1010
use crate::ecs::components::gfx::C_Renderable;
1111
use crate::ecs::components::transform::C_Transform2D;
1212
use crate::gfx;
13-
use crate::gfx::ui::UI_Request;
13+
use crate::gfx::ui::{UI_Request, UI_System};
1414
use crate::resources;
1515
use std::cell::Ref;
1616
use std::sync::mpsc::{Receiver, Sender};
1717
use std::sync::{Arc, Mutex};
1818
use std::thread::{self, JoinHandle};
1919
use std::time::Duration;
2020

21-
pub struct Render_System {
22-
config: Render_System_Config,
23-
pub camera: C_Spatial2D, // TODO figure out where to put this
24-
}
25-
2621
pub struct Render_System_Config {
2722
pub clear_color: Color,
2823
}
@@ -56,7 +51,7 @@ fn render_loop(
5651
let mut time = Time::new();
5752
let mut gres = resources::gfx::Gfx_Resources::new();
5853
let mut input_system = Input_System::new(input_actions_tx);
59-
let mut ui_system = gfx::ui::UI_System::new(ui_req_rx);
54+
let mut ui_system = UI_System::new(ui_req_rx);
6055

6156
ui_system.init(&env, &mut gres).unwrap();
6257

@@ -88,6 +83,11 @@ fn render_loop(
8883
}
8984
}
9085

86+
pub struct Render_System {
87+
config: Render_System_Config,
88+
pub camera: C_Spatial2D,
89+
}
90+
9191
impl Render_System {
9292
pub fn new() -> Self {
9393
Render_System {
@@ -102,6 +102,12 @@ impl Render_System {
102102
}
103103
}
104104

105+
pub fn init(&mut self, cfg: Render_System_Config) -> Maybe_Error {
106+
self.config = cfg;
107+
self.camera.transform.translate(150.0, 100.0);
108+
Ok(())
109+
}
110+
105111
pub fn update(
106112
&mut self,
107113
window: &mut gfx::window::Window_Handle,

0 commit comments

Comments
 (0)
Please sign in to comment.