-
Notifications
You must be signed in to change notification settings - Fork 270
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.
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
Run server and client in the same process #793
Open
ahcorde
wants to merge
49
commits into
main
Choose a base branch
from
ahcorde/same_process
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 33 commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
3a7d09c
Add scene manager GUI plugin that works with ign-gui's Scene3D
chapulina 80161fb
cleanup
chapulina 400974d
Added some-process flag
ahcorde ae902c3
Avoid some crashes
ahcorde 57cf18f
Improved implementation
ahcorde 343dba8
added more improvemetns
ahcorde 999620d
uncomment code
ahcorde 9498255
some fixes
ahcorde ea7107f
Updates
ahcorde cc4cf71
Updates
ahcorde 5521b40
Added feedback
ahcorde b7251f4
added more feedback
ahcorde 25ea384
make linters happy
ahcorde ce10db1
Fixed tests
ahcorde d0d7066
Merge branch 'main' into chapulina/6/scene_manager
chapulina b750115
Merge remote-tracking branch 'origin/chapulina/6/scene_manager' into …
ahcorde 7a50843
Added feedback
ahcorde 5f94fe2
Update to latest
chapulina 9962dbf
Same process bool as a component and minor fixes
ahcorde 84956cf
feedback
ahcorde c5b16d2
Merge branch 'main' into chapulina/6/scene_manager
chapulina 5e92077
Merge remote-tracking branch 'origin/chapulina/6/scene_manager' into …
ahcorde 51c8382
Use std::optional with SharedEntityComponentManager and SharedEventMa…
ahcorde 195c1e4
tick-tock runGui and createGui
ahcorde 47a87eb
make linters happy
ahcorde dc02d76
Using a worker pool to update plugins
ahcorde 7f63aa6
make linters happy
ahcorde c3095a2
Merge branch 'main' into chapulina/6/scene_manager
ahcorde 7e4a5f5
Restored CreateRenderingEntities in RenderUtils.cc
ahcorde fc23ff4
Merge remote-tracking branch 'origin/chapulina/6/scene_manager' into …
ahcorde 5c0c29f
make linters happy
ahcorde 247e827
Added feedback
ahcorde 2cad0b5
make linters happy
ahcorde c741662
Merge branch 'main' into chapulina/6/scene_manager
chapulina fbceade
Don't make it official yet
chapulina f27887a
Merge branch 'chapulina/6/scene_manager' of ssh://github.com/ignition…
chapulina 21e1b7b
alphabetize
chapulina 725a744
Merge branch 'chapulina/6/scene_manager' into ahcorde/same_process
ahcorde 8eeb5af
Fixed tests
ahcorde a01ebf0
Merge remote-tracking branch 'origin/main' into ahcorde/same_process
ahcorde af0c3f0
Windows compile fix
ahcorde e58339f
same process running on Scene3D
ahcorde 97898e4
Merge branch 'main' into ahcorde/same_process
ahcorde e1e1c6f
try to fix Windows build
ahcorde 78f940e
Merge branch 'main' into ahcorde/same_process
chapulina d6d1f8a
small cleanup tweaks, also fix OnPluginUpdate
chapulina 74ed8e2
Merge branch 'main' into ahcorde/same_process
chapulina baf095e
Merge remote-tracking branch 'origin/main' into ahcorde/same_process
ahcorde 449e6e4
make linters happy
ahcorde File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright (C) 2021 Open Source Robotics Foundation | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
#ifndef IGNITION_GAZEBO_COMPONENTS_SAMEPROCESS_HH_ | ||
#define IGNITION_GAZEBO_COMPONENTS_SAMEPROCESS_HH_ | ||
|
||
#include <ignition/gazebo/components/Factory.hh> | ||
#include <ignition/gazebo/components/Component.hh> | ||
#include <ignition/gazebo/config.hh> | ||
|
||
namespace ignition | ||
{ | ||
namespace gazebo | ||
{ | ||
// Inline bracket to help doxygen filtering. | ||
inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE { | ||
namespace components | ||
{ | ||
/// \brief A component used to hold if the server and gui are running in the | ||
/// same process. | ||
using SameProcess = Component<bool, class SameProcessTag>; | ||
|
||
IGN_GAZEBO_REGISTER_COMPONENT("ign_gazebo_components.SameProcess", | ||
SameProcess) | ||
} | ||
} | ||
} | ||
} | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe that the documentation for these variables needs to be updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe is not explained properly.
When running in the same process without sensors if there is an entity that we is marked to be removed, we need to call this event otherwise we will potentially lost the step where the entity is removed, because the gui loop rate is much more slower than the physics rate loop.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes sense 👍 I think that part that is confusing to me is that both of these events say that they emit render events, but the variable names don't seem to have anything to do with rendering. Should the part about emitting rendering events be updated?