ready for testing

This commit is contained in:
Piotrek
2021-05-06 14:49:15 +02:00
parent cb2379786c
commit 5b1ca38d75
4 changed files with 21 additions and 4 deletions
+5 -3
View File
@@ -1,5 +1,6 @@
mod camera_controller;
pub mod world;
use crate::renderer::content_view::ContentView;
use cgmath::{SquareMatrix, Point3, InnerSpace};
use winit::event::Event;
use crate::renderer::{camera::CameraTransform};
@@ -17,14 +18,15 @@ pub struct App {
}
impl App {
pub fn new() -> Self {
pub fn new(content: &mut dyn ContentView) -> Self {
let mut app = Self {
camera_controller: CameraController::new(),
world: World::new("default".to_string())
};
let block = app.world.gen_block(&Point3{x:0,y:0,z:0});
let pos = &Point3{x:0,y:0,z:0};
let block = app.world.gen_block(pos);
content.write(pos, block);
app
}
+1 -1
View File
@@ -24,7 +24,7 @@ fn main() {
.expect("Failed to create window");
let mut renderer = futures::executor::block_on(Renderer::new(&window));
let mut app = App::new();
let mut app = App::new(&mut renderer);
// Stats
let mut fps_timer = std::time::Instant::now();
+14
View File
@@ -0,0 +1,14 @@
use crate::Renderer;
use crate::app::world::block::WorldBlock;
use cgmath::Point3;
pub trait ContentView {
fn write(&mut self, block_pos: &Point3<u32>, block: &WorldBlock);
}
impl ContentView for Renderer {
fn write(&mut self, block_pos: &Point3<u32>, block: &WorldBlock) {
self.buffers.content.write(&self.queue, block_pos, block)
}
}
+1
View File
@@ -5,6 +5,7 @@ mod passes;
use passes::{RaytracePass, PostprocessPass};
pub mod camera;
use camera::Camera;
pub mod content_view;
pub struct Renderer {
surface: wgpu::Surface,