Skip to content

Commit

Permalink
Merge pull request #204 from scpeters/merge_8_main
Browse files Browse the repository at this point in the history
Merge 8 -> main
  • Loading branch information
scpeters authored Dec 5, 2021
2 parents 60f2551 + 7b22f24 commit 3074522
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

## Ignition Msgs 8.x

### Ignition Msgs 8.1.0 (2021-11-02)

1. Added WorldControlState message.
* [Pull request #190](https://github.com/ignitionrobotics/ign-msgs/pull/190)

1. Fixed trivial typo in command line help message.
* [Pull request #191](https://github.com/ignitionrobotics/ign-msgs/pull/191)

### Ignition Msgs 8.0.0 (2021-09-27)

1. scene.proto: add shadow_caster_material_name
Expand Down
44 changes: 44 additions & 0 deletions proto/ignition/msgs/world_control_state.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* 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.
*
*/

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

/// \ingroup ignition.msgs
/// \interface WorldControlState
/// \brief A message that allows for control of world functions, along with
/// a serialized state that can represent the state of an
/// entity-component-system (ECS)

import "ignition/msgs/header.proto";
import "ignition/msgs/serialized.proto";
import "ignition/msgs/world_control.proto";

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

/// \brief A WorldControl that allows for control of world functions
WorldControl world_control = 2;

/// \brief A SerializedState that can contain information about the
/// state of an entity-comonent-system (ECS)
SerializedState state = 3;
};

0 comments on commit 3074522

Please sign in to comment.