Skip to content

Manual backport of #1243 to gz-rendering9(Close #1248) #1251

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

Merged
ahcorde merged 1 commit into from
Mar 23, 2026
Merged

Manual backport of #1243 to gz-rendering9(Close #1248) #1251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 31 additions & 20 deletions ogre2/src/Ogre2FrustumVisual.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,38 @@ void Ogre2FrustumVisual::ClearVisualData()
//////////////////////////////////////////////////
void Ogre2FrustumVisual::Update()
{
std::shared_ptr<Ogre2DynamicRenderable> renderable =
std::shared_ptr<Ogre2DynamicRenderable>(
std::shared_ptr<Ogre2DynamicRenderable> renderable;

// check if the renderable exists
if (this->dataPtr->rayLines.empty())
{
renderable = std::shared_ptr<Ogre2DynamicRenderable>(
new Ogre2DynamicRenderable(this->Scene()));
this->ogreNode->attachObject(renderable->OgreObject());

#if (!(OGRE_VERSION <= ((1 << 16) | (10 << 8) | 7)))
// the Materials are assigned here to avoid repetitive search for materials
Ogre::MaterialPtr rayLineMat =
Ogre::MaterialManager::getSingleton().getByName(
"Frustum/BlueRay");
#endif

#if (OGRE_VERSION <= ((1 << 16) | (10 << 8) | 7))
MaterialPtr mat = this->Scene()->Material("Frustum/BlueRay");
#else
MaterialPtr mat = this->Scene()->Material("Frustum/BlueRay");
#endif

renderable->SetMaterial(mat, false);
renderable->SetOperationType(MT_LINE_LIST);
this->dataPtr->rayLines.push_back(renderable);
this->ogreNode->attachObject(renderable->OgreObject());

#if (!(OGRE_VERSION <= ((1 << 16) | (10 << 8) | 7)))
// the Materials are assigned here to avoid repetitive search for materials
Ogre::MaterialPtr rayLineMat =
Ogre::MaterialManager::getSingleton().getByName(
"Frustum/BlueRay");
#endif

#if (OGRE_VERSION <= ((1 << 16) | (10 << 8) | 7))
MaterialPtr mat = this->Scene()->Material("Frustum/BlueRay");
#else
MaterialPtr mat = this->Scene()->Material("Frustum/BlueRay");
#endif

renderable->SetMaterial(mat, false);
renderable->SetOperationType(MT_LINE_LIST);
this->dataPtr->rayLines.push_back(renderable);
}
else
{
// clear the existing renderable
renderable = this->dataPtr->rayLines.front();
renderable->Clear();
}

// Tangent of half the field of view.
double tanFOV2 = std::tan(this->hfov() * 0.5);
Expand Down
Loading