Skip to content

Commit

Permalink
Resolved bad type. fixes unity build
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicholas Gyde authored and madratman committed Jul 20, 2020
1 parent 87574bb commit 316367a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ WorldSimApi::Pose WorldSimApi::getObjectPose(const std::string& object_name) con
return UnityUtilities::Convert_to_Pose(airSimPose);
}

Vector3r WorldSimApi::getObjectScale(const std::string& object_name) const {}
Vector3r WorldSimApi::getObjectScaleInternal(const std::string& object_name) const {}
bool WorldSimApi::setObjectScale(const std::string& object_name, const Vector3r& scale);
msr::airlib::Vector3r WorldSimApi::getObjectScale(const std::string& object_name) const { return Vector3r(); }
msr::airlib::Vector3r WorldSimApi::getObjectScaleInternal(const std::string& object_name) const { return Vector3r(); }
bool WorldSimApi::setObjectScale(const std::string& object_name, const Vector3r& scale) { return false; }

bool WorldSimApi::setObjectPose(const std::string& object_name, const WorldSimApi::Pose& pose, bool teleport)
{
Expand Down
2 changes: 1 addition & 1 deletion Unity/AirLibWrapper/AirsimWrapper/Source/WorldSimApi.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class WorldSimApi : public msr::airlib::WorldSimApiBase
virtual Pose getObjectPose(const std::string& object_name) const override;

virtual Vector3r getObjectScale(const std::string& object_name) const override;
virtual Vector3r getObjectScaleInternal(const std::string& object_name) const override;
Vector3r getObjectScaleInternal(const std::string& object_name) const;
virtual bool setObjectPose(const std::string& object_name, const Pose& pose, bool teleport) override;
virtual bool setObjectScale(const std::string& object_name, const Vector3r& scale) override;

Expand Down

0 comments on commit 316367a

Please sign in to comment.