Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add Cone Geometry Message #47

Merged
merged 1 commit into from
May 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 39 additions & 0 deletions proto/ignition/msgs/conegeom.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright (C) 2020 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.
*
*/

syntax = "proto3";
package ignition.msgs;
option java_package = "com.ignition.msgs";
option java_outer_classname = "ConeGeomProtos";

/// \ingroup ignition.msgs
/// \interface ConeGeom
/// \brief Information about a cone geometry

import "ignition/msgs/header.proto";

message ConeGeom
{
/// \brief Optional header data
Header header = 1;

/// \brief The base radius of cone in meters
double radius = 2;

/// \brief The distance in meters from the base to the apex of the cone
double length = 3;
}
9 changes: 6 additions & 3 deletions proto/ignition/msgs/geometry.proto
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import "ignition/msgs/heightmapgeom.proto";
import "ignition/msgs/meshgeom.proto";
import "ignition/msgs/vector3d.proto";
import "ignition/msgs/polylinegeom.proto";
import "ignition/msgs/conegeom.proto";

message Geometry
{
Expand All @@ -49,7 +50,8 @@ message Geometry
TRIANGLE_FAN = 7;
LINE_STRIP = 8;
POLYLINE = 9;
EMPTY = 10;
CONE = 10;
EMPTY = 11;
}

/// \brief Optional header data
Expand All @@ -63,7 +65,8 @@ message Geometry
ImageGeom image = 7;
HeightmapGeom heightmap = 8;
MeshGeom mesh = 9;
ConeGeom cone = 10;

repeated Vector3d points = 10;
repeated Polyline polyline = 11;
repeated Vector3d points = 11;
repeated Polyline polyline = 12;
}