Skip to content

Commit

Permalink
Merge from 'develop' into 'main' for CLOiSim-4.9.0 (#322)
Browse files Browse the repository at this point in the history
  • Loading branch information
hyunseok-yang authored Nov 15, 2024
2 parents 53cee32 + 6095472 commit f4b22ad
Show file tree
Hide file tree
Showing 86 changed files with 3,287 additions and 1,755 deletions.
558 changes: 5 additions & 553 deletions Assets/Scenes/MainScene.unity

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Assets/Scripts/CLOiSimPlugins/Messages/.gen_proto_code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ MSG+="world_stats log_playback_stats "
MSG+="request response "
MSG+="perception perception_v "
MSG+="pid wrench joint_wrench "
MSG+="joystick "
MSG+="joint_state joint_state_v "
MSG+="joint_cmd joint_cmd_v "
MSG+="transform_stamped "
Expand Down
33 changes: 33 additions & 0 deletions Assets/Scripts/CLOiSimPlugins/Messages/joystick.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// <auto-generated>
// This file was generated by a tool; you should avoid making direct changes.
// Consider using 'partial classes' to extend these types
// Input: joystick.proto
// </auto-generated>

#region Designer generated code
#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
namespace cloisim.msgs
{

[global::ProtoBuf.ProtoContract()]
public partial class Joystick : global::ProtoBuf.IExtensible
{
private global::ProtoBuf.IExtension __pbn__extensionData;
global::ProtoBuf.IExtension global::ProtoBuf.IExtensible.GetExtensionObject(bool createIfMissing)
=> global::ProtoBuf.Extensible.GetExtensionObject(ref __pbn__extensionData, createIfMissing);

[global::ProtoBuf.ProtoMember(1, Name = @"translation")]
public Vector3d Translation { get; set; }

[global::ProtoBuf.ProtoMember(2, Name = @"rotation")]
public Vector3d Rotation { get; set; }

[global::ProtoBuf.ProtoMember(3, Name = @"buttons")]
public int[] Buttons { get; set; }

}

}

#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
#endregion
11 changes: 11 additions & 0 deletions Assets/Scripts/CLOiSimPlugins/Messages/joystick.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f4b22ad

Please sign in to comment.