Merge branch 'master' of github.com:w-mj/DataStructureProject

car.cpp

@@ -58,7 +58,7 @@ void Car::Rotate(qreal ang)
 }
 
 //r为弯道半径，ang为转过的角度
-void Car::turnLeft(int r, int ang)
+void Car::turnLeft(int r, double ang)
 {
     qreal rad = qDegreesToRadians(ang);
     Forward(r*qSin(rad));
@@ -67,7 +67,7 @@ void Car::turnLeft(int r, int ang)
 }
 
 //r为弯道半径，ang为转过的角度
-void Car::turnRight(int r, int ang)
+void Car::turnRight(int r, double ang)
 {
     qreal rad = qDegreesToRadians(ang);
     Forward(r*qSin(rad));

car.h

@@ -21,8 +21,8 @@ public:
     void moveLeft(qreal vel = 3);   //向左平移
     void moveRight(qreal vel = 3);  //向右平移
     void Rotate(qreal ang = 30);    //原地旋转
-    void turnLeft(int r, int ang);  //左转
-    void turnRight(int r, int ang); //右转
+    void turnLeft(int r, double ang);  //左转
+    void turnRight(int r, double ang); //右转
 
     Color getColor();
     qreal getDir();