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

Updated build_models.sh, models to fix Inverse Kinematics Request RPC #253

Merged
merged 3 commits into from
Mar 6, 2024
Merged

Updated build_models.sh, models to fix Inverse Kinematics Request RPC #253

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
66dbb62
updated build_models.sh
vanhalenar Mar 2, 2024
8fcbdd7
added back removal of temporary files
vanhalenar Mar 2, 2024
620a3d6
updated models
vanhalenar Mar 3, 2024
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
2 changes: 1 addition & 1 deletion arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,7 +870,7 @@ private async void OnConnectionStatusChanged(ConnectionStatusEnum newState) {

SystemInfo = systemInfo;
ServerVersion.text = "Editor version: " + Application.version +
"\nServer version: " + systemInfo.Version;
"\nServer version: " + systemInfo._Version;
ZdenekM marked this conversation as resolved.
Show resolved Hide resolved
ConnectionInfo.text = WebsocketManager.Instance.APIDomainWS;
MainMenu.Instance.gameObject.SetActive(false);

Expand Down
2 changes: 1 addition & 1 deletion arcor2_AREditor/Assets/BASE/Scripts/NotificationsModernUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public async override void SaveLogs(IO.Swagger.Model.Scene scene, IO.Swagger.Mod
StreamWriter logsFile = File.CreateText(dirname + "/logs.txt");
logsFile.WriteLine("Editor version: " + Application.version);
if (GameManager.Instance.SystemInfo != null) {
logsFile.WriteLine("Server version: " + GameManager.Instance.SystemInfo.Version);
logsFile.WriteLine("Server version: " + GameManager.Instance.SystemInfo._Version);
}

logsFile.WriteLine("Editor API version: " + GameManager.ApiVersion);
Expand Down
Binary file modified arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions scripts/build_models.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ sed -i'' 's/DataMember(Name="cylinder", EmitDefaultValue=true)/DataMember(Name="
sed -i'' 's/DataMember(Name="mesh", EmitDefaultValue=true)/DataMember(Name="mesh", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/ObjectModel.cs
sed -i'' 's/DataMember(Name="sphere", EmitDefaultValue=true)/DataMember(Name="sphere", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/ObjectModel.cs
sed -i'' 's/DataMember(Name="type", EmitDefaultValue=true)/DataMember(Name="type", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/ObjectModel.cs
sed -i'' 's/DataMember(Name="arm_id", EmitDefaultValue=true)/DataMember(Name="arm_id", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/InverseKinematicsRequestArgs.cs
sed -i'' 's/DataMember(Name="data", EmitDefaultValue=true)/DataMember(Name="data", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/InverseKinematicsRequest.cs
sed -i'' 's/DataMember(Name="object_model", EmitDefaultValue=true)/DataMember(Name="object_model", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/ObjectTypeMeta.cs
sed -i'' 's/DataMember(Name="arm_id", EmitDefaultValue=true)/DataMember(Name="arm_id", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/GetEndEffectorsRequestArgs.cs
sed -i'' 's/DataMember(Name="data", EmitDefaultValue=true)/DataMember(Name="data", EmitDefaultValue=false)/' ./"$tmpoutput"/src/IO.Swagger/Model/GetEndEffectorsRequest.cs

#find ./"$tmpoutput"/src/IO.Swagger/Model -type f -exec sed -i.bak "s/regexUuid.Match(this.Uuid/regexUuid.Match(this.Uuid.ToString()/g" {} \;

Expand Down
Loading