Merge pull request #590 from ignitionrobotics/merge6main

Merge part of 6 -> main
gazebosim · Mar 21, 2022 · 6f5faaf · 6f5faaf
2 parents 322128e + 50a01ac
commit 6f5faaf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/include/ignition/rendering/base/BaseCamera.hh b/include/ignition/rendering/base/BaseCamera.hh
@@ -355,7 +355,7 @@ namespace ignition
         {
           math::Pose3d targetCamPose = math::Pose3d(this->followOffset,
               this->WorldRotation());
-          targetCamPose += this->followNode->WorldPose();
+          targetCamPose = this->followNode->WorldPose() * targetCamPose;
 
           math::Vector3d pos = this->WorldPosition() +
               (targetCamPose.Pos() - this->WorldPosition()) * this->followPGain;
@@ -375,7 +375,7 @@ namespace ignition
         }
         else
         {
-          targetPose += this->trackNode->WorldPose();
+          targetPose = this->trackNode->WorldPose() * targetPose;
         }
 
         math::Pose3d p =

diff --git a/include/ignition/rendering/base/BaseJointVisual.hh b/include/ignition/rendering/base/BaseJointVisual.hh
@@ -406,7 +406,7 @@ namespace ignition
 
         // get rotation of joint visual in model frame
         ignition::math::Quaterniond quatFromModel =
-            (this->LocalPose() + parentInitPose).Rot();
+            (parentInitPose * this->LocalPose()).Rot();
 
         // rotate arrow visual so that the axis vector applies to the model
         // frame.

diff --git a/include/ignition/rendering/base/BaseNode.hh b/include/ignition/rendering/base/BaseNode.hh
@@ -428,7 +428,7 @@ namespace ignition
         return pose;
       }
 
-      return pose + parent->WorldPose();
+      return parent->WorldPose() * pose;
     }
 
     //////////////////////////////////////////////////

diff --git a/ogre2/src/Ogre2Material.cc b/ogre2/src/Ogre2Material.cc
@@ -692,7 +692,11 @@ void Ogre2Material::UpdateShaderParams(ConstShaderParamsPtr _params,
       continue;
     }
 
-    if (!_ogreParams->_findNamedConstantDefinition(name_param.first))
+    if (!_ogreParams->_findNamedConstantDefinition(name_param.first) &&
+        !(Ogre2RenderEngine::Instance()->GraphicsAPI() !=
+            GraphicsAPI::OPENGL &&
+            (ShaderParam::PARAM_TEXTURE == name_param.second.Type() ||
+             ShaderParam::PARAM_TEXTURE_CUBE == name_param.second.Type())))
     {
       ignwarn << "Unable to find GPU program parameter: "
               << name_param.first << std::endl;