Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix coding style issues #225

Merged
merged 2 commits into from
Feb 3, 2021
Merged

Fix coding style issues #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28e818
fix style issues
iche033 Feb 2, 2021
6cf3841
fix
iche033 Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ogre/include/ignition/rendering/ogre/OgreMaterialSwitcher.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ namespace ignition
// Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause
// issues
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4275)
#pragma warning(push)
#pragma warning(disable:4275)
#endif
public Ogre::MaterialManager::Listener,
#ifdef _MSC_VER
#pragma warning(pop)
#pragma warning(pop)
#endif
Ogre::RenderTargetListener
{
Expand Down
6 changes: 3 additions & 3 deletions ogre/include/ignition/rendering/ogre/OgreRenderTargetMaterial.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
// Ogre::MaterialManager::Listener isn't a dll-interface class, this may cause
// issues
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4275)
#pragma warning(push)
#pragma warning(disable:4275)
#endif

namespace ignition
Expand Down Expand Up @@ -107,7 +107,7 @@ namespace ignition
}

#ifdef _MSC_VER
#pragma warning(pop)
#pragma warning(pop)
#endif

#endif
12 changes: 7 additions & 5 deletions ogre2/src/Ogre2GpuRays.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,8 @@ void Ogre2LaserRetroMaterialSwitcher::preRenderTargetUpdate(
if (!subItem->hasCustomParameter(this->customParamIdx))
{
// limit laser retro value to 2000 (as in gazebo)
if (retroValue > 2000.0){
if (retroValue > 2000.0)
{
retroValue = 2000.0;
}
float color = retroValue / 2000.0;
Expand Down Expand Up @@ -696,7 +697,7 @@ void Ogre2GpuRays::Setup1stPass()
colorTexDef->preferDepthTexture = true;
colorTexDef->fsaaExplicitResolve = false;

nodeDef->setNumTargetPass(2);
nodeDef->setNumTargetPass(2);

Ogre::CompositorTargetDef *colorTargetDef =
nodeDef->addTargetPass("colorTexture");
Expand Down Expand Up @@ -796,7 +797,8 @@ void Ogre2GpuRays::Setup1stPass()
rt, this->dataPtr->cubeCam[i], wsDefName, false);

// add laser retro material switcher to render target listener
// so we can switch to use laser retro material when the camera is being udpated
// so we can switch to use laser retro material when the camera is being
// updated
Ogre::CompositorNode *node =
this->dataPtr->ogreCompositorWorkspace1st[i]->getNodeSequence()[0];
auto channelsTex = node->getLocalTextures();
Expand All @@ -807,11 +809,11 @@ void Ogre2GpuRays::Setup1stPass()
{
this->dataPtr->laserRetroMaterialSwitcher[i].reset(
new Ogre2LaserRetroMaterialSwitcher(this->scene));
c.target->addListener(this->dataPtr->laserRetroMaterialSwitcher[i].get());
c.target->addListener(
this->dataPtr->laserRetroMaterialSwitcher[i].get());
break;
}
}

}
}

Expand Down