From eed932212d9e60694db85202c3f723ec59c74f62 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Wed, 20 Sep 2023 22:37:03 -0700 Subject: [PATCH] comment code that will be deleted soon and cause merge conflicts for no reason --- src/main.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.rs b/src/main.rs index 5ce29549..dbbbb82b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -409,11 +409,14 @@ impl strafe_client::framework::Example for GraphicsData { modeldatas.append(&mut generate_modeldatas(unit_cube.clone())); println!("models.len = {:?}", modeldatas.len()); modeldatas[0].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,0.,-10.))); + //quad monkeys modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,5.,10.))); modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(20.,5.,10.))); modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(10.,5.,20.))); modeldatas[1].transforms.push(glam::Mat4::from_translation(glam::vec3(20.,5.,20.))); + //teapot modeldatas[2].transforms.push(glam::Mat4::from_translation(glam::vec3(-10.,5.,10.))); + //ground modeldatas[3].transforms.push(glam::Mat4::from_translation(glam::vec3(0.,0.,0.))*glam::Mat4::from_scale(glam::vec3(160.0, 1.0, 160.0))); let camera_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {