Revert to official master branch.

TritonSailor · Aug 1, 2018 · 4db58ff · 4db58ff
2 parents c2a0488 + fe11e7e
commit 4db58ff
Show file tree

Hide file tree

Showing 6 changed files with 569 additions and 970 deletions.
diff --git a/AirLib/include/common/VectorMath.hpp b/AirLib/include/common/VectorMath.hpp
@@ -201,13 +201,13 @@ class VectorMathT {
 		return rotateVector(v_body, q, assume_unit_quat);
 	}
 
-    static Vector3T transformToWorldFrame(const Vector3T& v_body, const Pose& body_pose, bool assume_unit_quat = true)
-    {
-        //rotate
-        Vector3T v_world = transformToWorldFrame(v_body, body_pose.orientation, assume_unit_quat);
-        //translate
-        return v_world + body_pose.position;
-    }
+	static Vector3T transformToWorldFrame(const Vector3T& v_body, const Pose& body_pose, bool assume_unit_quat = true)
+	{
+		//rotate
+		Vector3T v_world = transformToWorldFrame(v_body, body_pose.orientation, assume_unit_quat);
+		//translate
+		return v_world + body_pose.position;
+	}
 
 	static QuaternionT negate(const QuaternionT& q)
 	{

diff --git a/AirLib/src/api/RpcLibClientBase.cpp b/AirLib/src/api/RpcLibClientBase.cpp
@@ -170,7 +170,7 @@ int RpcLibClientBase::simGetSegmentationObjectID(const std::string& mesh_name) c
 
 CollisionInfo RpcLibClientBase::simGetCollisionInfo(const std::string& vehicle_name) const
 {
-    return pimpl_->client.call("getCollisionInfo", vehicle_name).as<RpcLibAdapatorsBase::CollisionInfo>().to();
+    return pimpl_->client.call("simGetCollisionInfo", vehicle_name).as<RpcLibAdapatorsBase::CollisionInfo>().to();
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     CollisionInfo RpcLibClientBase::simGetCollisionInfo(const std::string& vehicle_name) const
     {
-        return pimpl_->client.call("getCollisionInfo", vehicle_name).as<RpcLibAdapatorsBase::CollisionInfo>().to();
+        return pimpl_->client.call("simGetCollisionInfo", vehicle_name).as<RpcLibAdapatorsBase::CollisionInfo>().to();
     }
@@ Expand Down @@