Fix namespacing of vector3r

CodexLabsLLC · Sep 3, 2022 · e32219f · e32219f
1 parent f78c7f7
commit e32219f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/SimMode/SimModeBase.cpp b/Unity/AirLibWrapper/AirsimWrapper/Source/SimMode/SimModeBase.cpp
@@ -107,6 +107,14 @@ std::unique_ptr<msr::airlib::ApiServerBase> SimModeBase::createApiServer() const
     return nullptr;
 }
 
+void SimModeBase::setExtForce(const msr::airlib::Vector3r& ext_force) const
+{
+    // should be overridden by derived class
+    unused(ext_force);
+    throw std::domain_error("setExtForce not implemented by SimMode");
+}
+
+
 void SimModeBase::setupClockSpeed()
 {
     //default setup - this should be overridden in derived modes as needed

diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/SimMode/SimModeBase.h b/Unity/AirLibWrapper/AirsimWrapper/Source/SimMode/SimModeBase.h
@@ -48,7 +48,7 @@ class SimModeBase
     virtual void continueForTime(double seconds);
     virtual void continueForFrames(uint32_t frames);
     virtual void setWind(const msr::airlib::Vector3r& wind) const;
-    virtual void setExtForce(const Vector3r& ext_force) const;
+    virtual void setExtForce(const msr::airlib::Vector3r& ext_force) const;
     void startApiServer();
     void stopApiServer();
     bool isApiServerStarted();

diff --git a/Unity/AirLibWrapper/AirsimWrapper/Source/SimMode/SimModeWorldBase.h b/Unity/AirLibWrapper/AirsimWrapper/Source/SimMode/SimModeWorldBase.h
@@ -37,7 +37,7 @@ class SimModeWorldBase : public SimModeBase
     virtual void pause(bool is_paused) override;
     virtual void continueForTime(double seconds) override;
     virtual void setWind(const msr::airlib::Vector3r& wind) const override;
-    virtual void setExtForce(const Vector3r& ext_force) const override;
+    virtual void setExtForce(const msr::airlib::Vector3r& ext_force) const override;
 
 private:
     std::unique_ptr<msr::airlib::PhysicsWorld> physics_world_;