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 tests and warnings for 3 -> 6 forward port #819

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Fix tests and warnings for 3 -> 6 forward port #819

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions ogre/include/gz/rendering/ogre/OgreVisual.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#ifndef GZ_RENDERING_OGRE_OGREVISUAL_HH_
#define GZ_RENDERING_OGRE_OGREVISUAL_HH_

#include <memory>

#include "gz/rendering/base/BaseVisual.hh"
#include "gz/rendering/ogre/OgreNode.hh"
#include "gz/rendering/ogre/OgreRenderTypes.hh"
Expand Down
3 changes: 3 additions & 0 deletions ogre/src/OgreDepthCamera.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ void OgreDepthCamera::Destroy()
this->ogreCamera = nullptr;
}
}

// call base node destroy to remove parent
OgreNode::Destroy();
}

//////////////////////////////////////////////////
Expand Down
2 changes: 2 additions & 0 deletions ogre2/include/gz/rendering/ogre2/Ogre2Camera.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#ifndef GZ_RENDERING_OGRE2_OGRE2CAMERA_HH_
#define GZ_RENDERING_OGRE2_OGRE2CAMERA_HH_

#include <memory>

#include "gz/rendering/base/BaseCamera.hh"
#include "gz/rendering/ogre2/Ogre2RenderTypes.hh"
#include "gz/rendering/ogre2/Ogre2Includes.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/Scene_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,9 @@ void SceneTest::DestroyNodes(const std::string &_renderEngine)
EXPECT_EQ(0u, scene->SensorCount());
EXPECT_EQ(0u, scene->LightCount());

EXPECT_DOUBLE_EQ(0.0, scene->SimTime().Double());
scene->SetSimTime(common::Time(3.55));
EXPECT_DOUBLE_EQ(3.55, scene->SimTime().Double());
EXPECT_EQ(std::chrono::milliseconds(0), scene->Time());
scene->SetTime(std::chrono::milliseconds(3550));
EXPECT_EQ(std::chrono::milliseconds(3550), scene->Time());

// Clean up
engine->DestroyScene(scene);
Expand Down