fix incorrect merge + remove moved files

dimforge · Nov 19, 2024 · 2866883 · 2866883
1 parent cb7c924
commit 2866883
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 267 deletions.
diff --git a/crates/parry2d/examples/aabb2d.rs b/crates/parry2d/examples/aabb2d.rs
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-mod common_macroquad;
-
-extern crate nalgebra as na;
-
-use common_macroquad::{draw_polyline, lissajous_2d, mquad_from_na, na_from_mquad};
-=======
 mod common_macroquad2d;
 
 extern crate nalgebra as na;
 
 use common_macroquad2d::{draw_polyline, lissajous_2d, mquad_from_na, na_from_mquad};
->>>>>>> @{-1}
 use macroquad::prelude::*;
 use na::Isometry2;
 use parry2d::bounding_volume::{Aabb, BoundingVolume};

diff --git a/crates/parry2d/examples/bounding_sphere2d.rs b/crates/parry2d/examples/bounding_sphere2d.rs
@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-mod common_macroquad;
-
-extern crate nalgebra as na;
-
-use common_macroquad::{draw_polyline, lissajous_2d, mquad_from_na, na_from_mquad};
-use macroquad::prelude::*;
-use na::{Isometry2, Vector2};
-use parry2d::bounding_volume::{Aabb, BoundingVolume};
-use parry2d::shape::Ball;
-=======
 mod common_macroquad2d;
 
 extern crate nalgebra as na;
@@ -17,7 +6,6 @@ use common_macroquad2d::{draw_polyline, lissajous_2d, mquad_from_na, na_from_mqu
 use macroquad::prelude::*;
 use na::{Isometry2, Vector2};
 use parry2d::bounding_volume::{Aabb, BoundingVolume};
->>>>>>> @{-1}
 use parry2d::shape::Cuboid;
 
 const RENDER_SCALE: f32 = 30.0;
@@ -37,11 +25,8 @@ async fn main() {
         let cube2 = Cuboid::new(Vector2::new(1., 0.5));
 
         let cube1_pos = na_from_mquad(lissajous_2d(elapsed_time)) * 5f32;
-<<<<<<< HEAD
-        let cube1_pos = Isometry2::translation(cube1_pos.x, cube1_pos.y);
-=======
+
         let cube1_pos = Isometry2::from(cube1_pos);
->>>>>>> @{-1}
         let cube2_pos = Isometry2::identity();
 
         /*

diff --git a/crates/parry2d/examples/common_macroquad.rs b/crates/parry2d/examples/common_macroquad.rs
diff --git a/crates/parry2d/examples/convex_hull2d.rs b/crates/parry2d/examples/convex_hull2d.rs
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-mod common_macroquad;
-
-use std::f32::consts::{FRAC_PI_2, FRAC_PI_4};
-
-use common_macroquad::{draw_point, draw_polygon, lissajous_2d_with_params, na_from_mquad};
-=======
 mod common_macroquad2d;
 
 use std::f32::consts::{FRAC_PI_2, FRAC_PI_4};
 
 use common_macroquad2d::{draw_point, draw_polygon, lissajous_2d_with_params, na_from_mquad};
->>>>>>> @{-1}
 use macroquad::prelude::*;
 use nalgebra::Point2;
 use parry2d::transformation;

diff --git a/crates/parry3d/examples/common_macroquad.rs b/crates/parry3d/examples/common_macroquad.rs
diff --git a/crates/parry3d/examples/convex_decomposition.rs b/crates/parry3d/examples/convex_decomposition.rs
@@ -1,8 +1,8 @@
-mod common_macroquad;
+mod common_macroquad3d;
 
 extern crate nalgebra as na;
 
-use common_macroquad::mquad_mesh_from_points;
+use common_macroquad3d::mquad_mesh_from_points;
 use macroquad::prelude::*;
 use parry3d::{math::Point, shape::SharedShape};