|
@@ -129,7 +129,7 @@ impl<'a> State<'a> {
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
|
- let plan1 = object::generate_plane(512,512,100.,100.);
|
|
|
|
|
|
|
+ let plan1 = object::generate_plane(SIZE,SIZE,100.,100.);
|
|
|
//println!("{:?}", plan1.positions_list());
|
|
//println!("{:?}", plan1.positions_list());
|
|
|
let plan2 = plan1.clone();
|
|
let plan2 = plan1.clone();
|
|
|
let vertex_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
|
|
let vertex_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
|
|
@@ -194,11 +194,22 @@ impl<'a> State<'a> {
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ let x = compute::compute_pipeline::new_compute_pipeline(&device);
|
|
|
|
|
+ let y = compute::visualisation::new(&device);
|
|
|
|
|
+
|
|
|
|
|
+ let wireframe_pipeline = wireframe::wireframe_pipeline::new(&device, &config, &camera_bind_group_layout, &diffuse_bind_group_layout,&y.2);
|
|
|
|
|
+ let wireframe = true;
|
|
|
|
|
+
|
|
|
let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor{
|
|
let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor{
|
|
|
label: Some("Pipeline Layout"),
|
|
label: Some("Pipeline Layout"),
|
|
|
bind_group_layouts: &[
|
|
bind_group_layouts: &[
|
|
|
&camera_bind_group_layout,
|
|
&camera_bind_group_layout,
|
|
|
&diffuse_bind_group_layout,
|
|
&diffuse_bind_group_layout,
|
|
|
|
|
+ &y.2
|
|
|
],
|
|
],
|
|
|
push_constant_ranges: &[]
|
|
push_constant_ranges: &[]
|
|
|
});
|
|
});
|
|
@@ -239,12 +250,6 @@ impl<'a> State<'a> {
|
|
|
}),
|
|
}),
|
|
|
multiview: None
|
|
multiview: None
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
- let wireframe_pipeline = wireframe::wireframe_pipeline::new(&device, &config, &camera_bind_group_layout, &diffuse_bind_group_layout);
|
|
|
|
|
- let wireframe = true;
|
|
|
|
|
-
|
|
|
|
|
- let x = compute::compute_pipeline::new_compute_pipeline(&device);
|
|
|
|
|
- let y = compute::visualisation::new(&device);
|
|
|
|
|
//Compute
|
|
//Compute
|
|
|
Self {
|
|
Self {
|
|
|
wireframe,
|
|
wireframe,
|