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

Make Video recorder plugin work with MinimalScene #900

Merged
merged 15 commits into from
Sep 22, 2021
Merged

Make Video recorder plugin work with MinimalScene #900

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3a7d09c
Add scene manager GUI plugin that works with ign-gui's Scene3D
chapulina May 12, 2021
80161fb
cleanup
chapulina May 12, 2021
d0d7066
Merge branch 'main' into chapulina/6/scene_manager
chapulina Jun 19, 2021
5f94fe2
Update to latest
chapulina Jun 21, 2021
c5b16d2
Merge branch 'main' into chapulina/6/scene_manager
chapulina Jun 24, 2021
53ce2f2
Added Video recorder plugin
ahcorde Jul 2, 2021
514d329
Select the user camera with UserData method
ahcorde Jul 2, 2021
ce3f505
make linters happy
ahcorde Jul 2, 2021
3671b7e
Merge remote-tracking branch 'origin/main' into ahcorde/plugin/video_…
ahcorde Aug 12, 2021
7650dda
Move video recording logic to existing plugin and add legacy mode
chapulina Aug 13, 2021
f895be4
Merge branch 'main' into ahcorde/plugin/video_recorder_logic
ahcorde Aug 16, 2021
1dc3ac9
Merge branch 'main' into ahcorde/plugin/video_recorder_logic
chapulina Aug 17, 2021
a6771bf
Added feedback
ahcorde Sep 21, 2021
2aeb86f
merged from main
chapulina Sep 21, 2021
ab58eee
remove unused code
chapulina Sep 21, 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
Prev Previous commit
Next Next commit
cleanup 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
  • Loading branch information
@chapulina
chapulina committed May 12, 2021
commit 80161fb7fe13c8c1dabcbe4c7af8bafa38d59549
21 changes: 2 additions & 19 deletions src/gui/plugins/scene_manager/GzSceneManager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
//// \brief Pointer to the rendering scene
public: rendering::ScenePtr scene;

/// \brief Name of the world
public: std::string worldName;

/// \brief Rendering utility
public: RenderUtil renderUtil;
};
Expand All @@ -62,15 +59,15 @@ using namespace gazebo;

/////////////////////////////////////////////////
GzSceneManager::GzSceneManager()
: GuiSystem(), dataPtr(std::make_unique<GzSceneManagerPrivate>)
: GuiSystem(), dataPtr(std::make_unique<GzSceneManagerPrivate>())
{
}

/////////////////////////////////////////////////
GzSceneManager::~GzSceneManager() = default;

/////////////////////////////////////////////////
void GzSceneManager::LoadConfig(const tinyxml2::XMLElement *_pluginElem)
void GzSceneManager::LoadConfig(const tinyxml2::XMLElement *)
{
if (this->title.empty())
this->title = "Scene Manager";
Expand All @@ -84,20 +81,6 @@ void GzSceneManager::Update(const UpdateInfo &_info,
EntityComponentManager &_ecm)
{
IGN_PROFILE("GzSceneManager::Update");
if (this->dataPtr->worldName.empty())
{
// TODO(anyone) Only one scene is supported for now
Entity worldEntity;
_ecm.Each<components::World, components::Name>(
[&](const Entity &_entity,
const components::World * /* _world */ ,
const components::Name *_name)->bool
{
this->dataPtr->worldName = _name->Data();
worldEntity = _entity;
return false;
});
}

this->dataPtr->renderUtil.UpdateECM(_info, _ecm);
this->dataPtr->renderUtil.UpdateFromECM(_info, _ecm);
Expand Down