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

Adding vertex mode for point cloud shape #1351

Merged
merged 3 commits into from
Jun 4, 2019
Merged

Adding vertex mode for point cloud shape #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f3c3cb
Adding vertex mode for point cloud shape
Jun 3, 2019
53c34a2
Merge branch 'master' into point_cloud_points
jslee02 Jun 4, 2019
35fa9b8
Update changelog
Jun 4, 2019
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

### [DART 6.10.0 (20XX-XX-XX)](https://github.com/dartsim/dart/milestone/58?closed=1)

* GUI

* Added point rendering mode to PointCloudShape: [#1351](https://github.com/dartsim/dart/pull/1351)

* dartpy

* Added raycast option and result: [#1343](https://github.com/dartsim/dart/pull/1343)
Expand Down
1 change: 1 addition & 0 deletions dart/dynamics/PointCloudShape.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class PointCloudShape : public Shape
BOX = 0, ///< 3D volumetric box
BILLBOARD_SQUARE, ///< 2D square always facing the screen
BILLBOARD_CIRCLE, ///< 2D circle always facing the screen
POINT, ///< Vertex
};

/// Constructor
Expand Down
6 changes: 3 additions & 3 deletions dart/gui/osg/ShapeFrameNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/

#include "osg/Geode"
#include "osg/Node"
#include "osg/Group"
#include <osg/Geode>
#include <osg/Node>
#include <osg/Group>

#include "dart/gui/osg/ShapeFrameNode.hpp"
#include "dart/gui/osg/Utils.hpp"
Expand Down
Loading