Skip to content

Commit

Permalink
Add back/gui/follow doxygen.
Browse files Browse the repository at this point in the history
Signed-off-by: Benjamin Perseghetti <[email protected]>
  • Loading branch information
bperseghetti committed May 18, 2024
1 parent 0417d76 commit 882f6bb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions examples/standalone/scene_provider/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ Update follow offset from track topic:
gz topic -t /gui/track -m gz.msgs.CameraTrack -p 'track_mode: 2, follow_target: {name: "box_model"}, follow_offset: {x: -1, y: 0, z: 1}'
```

Follow box from service (depricated):
Follow box from service (deprecated):

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

Update follow offset from follow offset service (depricated):
Update follow offset from follow offset service (deprecated):

```bash
gz service -s /gui/follow/offset --reqtype gz.msgs.Vector3d --reptype gz.msgs.Boolean --timeout 2000 --req 'x: 5, y: 5, z: 5'
Expand Down
9 changes: 5 additions & 4 deletions src/plugins/camera_tracking/CameraTracking.cc
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ class CameraTrackingPrivate
/// \brief Offset on target to be tracked
public: math::Vector3d trackOffset = math::Vector3d(0, 0, 0);

/// \brief Camera tracking message
public: gz::msgs::CameraTrack trackMsg;

/// \brief Flag to indicate new tracking
Expand Down Expand Up @@ -159,10 +160,10 @@ class CameraTrackingPrivate
/// \brief Move to service
public: std::string moveToService;

/// \brief Follow service
/// \brief Follow service (deprecated)
public: std::string followService;

/// \brief Follow offset service
/// \brief Follow offset service (deprecated)
public: std::string followOffsetService;

/// \brief The pose set from the move to pose service.
Expand Down Expand Up @@ -223,7 +224,7 @@ void CameraTrackingPrivate::Initialize()
this->node.Advertise(this->followService,
&CameraTrackingPrivate::OnFollow, this);
gzmsg << "Follow service on ["
<< this->followService << "]" << std::endl;
<< this->followService << "] (deprecated)" << std::endl;

// track
this->trackTopic = "/gui/track";
Expand Down Expand Up @@ -259,7 +260,7 @@ void CameraTrackingPrivate::Initialize()
this->node.Advertise(this->followOffsetService,
&CameraTrackingPrivate::OnFollowOffset, this);
gzmsg << "Follow offset service on ["
<< this->followOffsetService << "]" << std::endl;
<< this->followOffsetService << "] (deprecated)" << std::endl;
}

/////////////////////////////////////////////////
Expand Down
3 changes: 3 additions & 0 deletions src/plugins/camera_tracking/CameraTracking.hh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ namespace gz::gui::plugins
/// and "follow".
///
/// Services:
/// * `/gui/follow`: Set the user camera to follow a given target,
/// identified by name (deprecated).
/// * `/gui/follow/offset`: Set the offset for following (deprecated).
/// * `/gui/move_to`: Move the user camera to look at a given target,
/// identified by name.
/// * `/gui/move_to/pose`: Move the user camera to a given pose.
Expand Down
1 change: 1 addition & 0 deletions src/plugins/camera_tracking_config/CameraTrackingConfig.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (C) 2024 CogniPilot Foundation
* Copyright (C) 2024 Rudis Laboratories LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 1 addition & 0 deletions src/plugins/camera_tracking_config/CameraTrackingConfig.hh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (C) 2024 CogniPilot Foundation
* Copyright (C) 2024 Rudis Laboratories LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (C) 2024 CogniPilot Foundation
* Copyright (C) 2024 Rudis Laboratories LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down

0 comments on commit 882f6bb

Please sign in to comment.