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

Jump to bottom

Added camera tracking #226

Merged
merged 32 commits into from
Jul 6, 2021
Merged

Added camera tracking #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
3a05520
Split transport scene manager into a plugin outside Scene3D
chapulina May 8, 2021
a603923
tweaks
chapulina May 8, 2021
0223961
Add scene provider example
chapulina May 12, 2021
b53bb5e
Example to populate the scene using transport
chapulina May 12, 2021
dc3c7eb
sceneFromFirstRenderEngine
chapulina May 15, 2021
ca619ad
Added camera_controller_manager
ahcorde May 26, 2021
a1627f8
Fixed texture Id (#229)
ahcorde Jun 8, 2021
42e071f
Add sky tag to the new Scene3D (#230)
ahcorde Jun 10, 2021
591d48c
Improve example
chapulina Jun 17, 2021
af9c530
Create a new plugin and deprecate old one
chapulina Jun 17, 2021
c50f517
Add tests
chapulina Jun 19, 2021
0c4e312
Add tutorial
chapulina Jun 19, 2021
f19621c
Merge branch 'main' into chapulina/6/new_scene
chapulina Jun 19, 2021
6d3690d
codecheck
chapulina Jun 19, 2021
f9e9a52
Merge branch 'main' into chapulina/6/new_scene
chapulina Jun 24, 2021
7e3be22
Merge branch 'main' into chapulina/6/new_scene
chapulina Jun 24, 2021
1896080
Update plugins with forward merge, improve pose example
chapulina Jun 24, 2021
8a3f62f
PR feedback
chapulina Jun 24, 2021
42f29c0
PR feedback
chapulina Jun 25, 2021
dea2fd4
Merge branch 'main' into chapulina/6/new_scene
chapulina Jun 25, 2021
081410e
Merge branch 'main' into chapulina/6/new_scene
ahcorde Jun 28, 2021
83d7c33
Merge remote-tracking branch 'origin/chapulina/6/new_scene' into ahco…
ahcorde Jun 28, 2021
d68ffc8
Added feddback
ahcorde Jun 28, 2021
65fb234
make linters happy
ahcorde Jun 28, 2021
c0ebe09
Merge branch 'main' into chapulina/6/new_scene
chapulina Jun 30, 2021
cdb85dc
ign-utils impl
chapulina Jun 30, 2021
25d0d1c
Merge branch 'chapulina/6/new_scene' into ahcorde/camera_controller_m…
chapulina Jul 1, 2021
5fc8a01
Add to scene.config and to examples
chapulina Jul 1, 2021
1a75774
Added feedback and other tweaks
ahcorde Jul 1, 2021
ce06dda
Merge remote-tracking branch 'origin/main' into ahcorde/camera_contro…
ahcorde Jul 1, 2021
cb656ee
Restored Scene3d example config file
ahcorde Jul 1, 2021
3a5ae75
Add test, some cleanup
chapulina Jul 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-common
ign_find_package(ignition-common4 REQUIRED VERSION 4.1)
ign_find_package(ignition-common4 REQUIRED COMPONENTS profiler VERSION 4.1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a nightly build failure is a good reminder to update the Debian metadata with this new dependency

CMake Error at /usr/share/cmake/ignition-cmake2/cmake2/IgnConfigureBuild.cmake:59 (message):
  -- 	Missing dependency [ignition-common4] (Components: profiler)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add these to the buildfarmer's dashboard 😏

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will be learning about that soon

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can start by adding them to our Jenkins views: gazebo-tooling/release-tools#491

set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})

#--------------------------------------
Expand Down
13 changes: 13 additions & 0 deletions examples/config/scene3d.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@
<deletion_topic>/example/delete</deletion_topic>
<scene_topic>/example/scene</scene_topic>
</plugin>
<plugin filename="CameraTracking" name="Camera tracking">
<ignition-gui>
<anchors target="View 1">
<line own="right" target="right"/>
<line own="top" target="top"/>
</anchors>
<property key="resizable" type="bool">false</property>
<property key="width" type="double">5</property>
<property key="height" type="double">5</property>
<property key="state" type="string">floating</property>
<property key="showTitleBar" type="bool">false</property>
</ignition-gui>
</plugin>
<plugin filename="WorldControl">
<ignition-gui>
<title>Controls</title>
Expand Down
29 changes: 29 additions & 0 deletions examples/standalone/scene_provider/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,32 @@ ign gui -c examples/config/scene3d.config

You should see a black box moving around the scene.

## Testing other plugins

### Camera tracking

Some commands to test camera tracking with this demo:

Move to box:

```
ign service -s /gui/move_to --reqtype ignition.msgs.StringMsg --reptype ignition.msgs.Boolean --timeout 2000 --req 'data: "box_model"'
```

Echo camera pose:

```
ign topic -e -t /gui/camera/pose
```

Follow box:

```
ign service -s /gui/follow --reqtype ignition.msgs.StringMsg --reptype ignition.msgs.Boolean --timeout 2000 --req 'data: "box_model"'
```

Update follow offset:

```
ign service -s /gui/follow/offset --reqtype ignition.msgs.Vector3d --reptype ignition.msgs.Boolean --timeout 2000 --req 'x: 5, y: 5, z: 5'
```
1 change: 1 addition & 0 deletions src/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ function(ign_gui_add_plugin plugin_name)
endfunction()

# Plugins
add_subdirectory(camera_tracking)
add_subdirectory(grid_3d)
add_subdirectory(grid_config)
add_subdirectory(image_display)
Expand Down
11 changes: 11 additions & 0 deletions src/plugins/camera_tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ign_gui_add_plugin(CameraTracking
SOURCES
CameraTracking.cc
QT_HEADERS
CameraTracking.hh
TEST_SOURCES
# CameraTracking_TEST.cc
PUBLIC_LINK_LIBS
ignition-rendering${IGN_RENDERING_VER}::ignition-rendering${IGN_RENDERING_VER}
ignition-common${IGN_COMMON_VER}::profiler
)
Loading