adsf

mahi97 · mahi97 · commit c993f30dda55 · 2018-12-29T02:00:39.000+03:30
diff --git a/src/vec2.rs b/src/vec2.rs
@@ -40,18 +40,13 @@ impl Vec2 {
         (*self - other).len()
     }
 
-<<<<<<< HEAD
     fn th(&self) -> AngDeg {
         AngDeg{degree:(self.normalize().y).atan2(self.normalize().x) * RAD2DEG}
     }
 
     fn is_valid(&self) -> bool {
         (self.x - INVALID_).abs() > std::f64::EPSILON &&
         (self.y - INVALID_).abs() > std::f64::EPSILON
-=======
-    fn th(self) -> AngDeg {
-        AngDeg{degree:(self.normalize().y).atan2(self.normalize().x )* 180.0 / 3.1415}
->>>>>>> origin/kickV2
     }
 
     fn rotate(&mut self, deg: f64) -> Vec2 {

Original file line number	Diff line number	Diff line change
`@@ -40,18 +40,13 @@ impl Vec2 {`
`40`	`40`	`(*self - other).len()`
`41`	`41`	`}`
`42`	`42`
`43`		`-<<<<<<< HEAD`
`44`	`43`	`fn th(&self) -> AngDeg {`
`45`	`44`	`AngDeg{degree:(self.normalize().y).atan2(self.normalize().x) * RAD2DEG}`
`46`	`45`	`}`
`47`	`46`
`48`	`47`	`fn is_valid(&self) -> bool {`
`49`	`48`	`(self.x - INVALID_).abs() > std::f64::EPSILON &&`
`50`	`49`	`(self.y - INVALID_).abs() > std::f64::EPSILON`
`51`		`-=======`
`52`		`- fn th(self) -> AngDeg {`
`53`		`- AngDeg{degree:(self.normalize().y).atan2(self.normalize().x )* 180.0 / 3.1415}`
`54`		`->>>>>>> origin/kickV2`
`55`	`50`	`}`
`56`	`51`
`57`	`52`	`fn rotate(&mut self, deg: f64) -> Vec2 {`