Skip to content

Commit b65ac76

Browse files
Release v6.1 (Prod) (#944)
2 parents 42c572e + 29d81dc commit b65ac76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1066
-1484
lines changed

VersionManager.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"Version": "6.0.0",
2+
"Version": "6.1.0",
33
"URL": "https://synthesis.autodesk.com/download.html"
44
}

api/Api/Mirabuf/JointInstance.cs

+24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
namespace Mirabuf.Joint {
22
public partial class JointInstance {
3+
4+
public enum WheelTypeEnum {
5+
Standard = 0, Omni = 1
6+
}
7+
38
private bool? _isWheel = null;
49
public bool IsWheel(Assembly assembly) {
510
if (!_isWheel.HasValue) {
@@ -11,5 +16,24 @@ public bool IsWheel(Assembly assembly) {
1116
}
1217
return _isWheel.Value;
1318
}
19+
20+
private WheelTypeEnum? _wheelType = null;
21+
public WheelTypeEnum GetWheelType(Assembly assembly) {
22+
if (!_wheelType.HasValue) {
23+
if (IsWheel(assembly)) {
24+
var hasValue = assembly.Data.Joints.JointDefinitions[JointReference].UserData.Data
25+
.TryGetValue("wheelType", out var wheelType);
26+
if (hasValue && wheelType.Equals("1")) {
27+
_wheelType = WheelTypeEnum.Omni;
28+
} else {
29+
_wheelType = WheelTypeEnum.Standard;
30+
}
31+
} else {
32+
throw new System.Exception("Non-wheels don't have wheel types");
33+
}
34+
}
35+
36+
return _wheelType.Value;
37+
}
1438
}
1539
}

api/Api/Simulation/SimBehaviour.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public bool Enabled {
3232
/// </summary>
3333
/// <param name="simObjectId">ID of the SimObject within the SimulationManager</param>
3434
/// <param name="inputs">A list of reserved inputs by the behaviour, along with a input to assign to each</param>
35-
public SimBehaviour(string simObjectId) {
36-
Enabled = true;
35+
public SimBehaviour(string simObjectId, bool autoEnable = true) {
36+
Enabled = autoEnable;
3737
SimObjectId = simObjectId;
3838
string id = simObjectId;
3939
int _i = id.IndexOf("_", 0);

api/Api/Simulation/SimulationManager.cs

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public static bool RemoveBehaviour(string simObjectName, SimBehaviour b) {
108108
var cursor = list.First;
109109
while (!removed && cursor != null) {
110110
if (cursor.Value.Equals(b)) {
111+
cursor.Value.Enabled = false;
111112
cursor.Value.OnRemove();
112113
list.Remove(cursor);
113114
removed = true;

api/Api/UIManager/UIParser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public static VisualElementAsset CreateVisualElements(string name, XmlNodeList n
128128

129129
// Logger.Log("Finished Creating Element");
130130

131-
_UnityVisualElement resultElement = (_UnityVisualElement)element;
131+
_UnityVisualElement resultElement = (_UnityVisualElement)element!;
132132

133133
foreach (XmlNode child in node.ChildNodes)
134134
{

emulation/bridge/.gitignore

-2
This file was deleted.

emulation/bridge/Makefile

-29
This file was deleted.

emulation/bridge/cmd/main.go

-14
This file was deleted.

emulation/bridge/go.mod

-8
This file was deleted.

emulation/bridge/go.sum

-1,116
This file was deleted.

emulation/bridge/pkg/protocol/grpc/server.go

-33
This file was deleted.

emulation/bridge/pkg/service/v1/emulator_service.go

-159
This file was deleted.

emulation/bridge/scripts/gen_grpc.sh

-4
This file was deleted.

engine/Assets/Scripts/AutoUpdater.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class AutoUpdater : MonoBehaviour {
1515
public static bool UpdateAvailable { get; private set; } = false;
1616
public static string UpdaterLink { get; private set; }
1717

18-
public const string LocalVersion = "6.0.0.0"; // must be a version value
18+
public const string LocalVersion = "6.1.0.0"; // must be a version value
1919

2020
private void Start() {
2121
if (CheckConnection()) {

engine/Assets/Scripts/Behaviors/ArcadeDriveBehaviour.cs

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using Google.Protobuf.WellKnownTypes;
1+
using System.Collections.Generic;
42
using Synthesis.PreferenceManager;
53
using Synthesis.UI.Dynamic;
64
using SynthesisAPI.EventBus;
75
using SynthesisAPI.InputManager;
86
using SynthesisAPI.InputManager.Inputs;
97
using SynthesisAPI.Simulation;
10-
using UnityEditor;
118
using UnityEngine;
12-
using Input = UnityEngine.Input;
13-
using Logger = SynthesisAPI.Utilities.Logger;
14-
using Math = SynthesisAPI.Utilities.Math;
9+
using Math = SynthesisAPI.Utilities.Math;
1510

1611
#nullable enable
1712

@@ -94,7 +89,7 @@ public Analog TryLoadInput(string key, Analog defaultInput) {
9489
}
9590

9691
private void OnValueInputAssigned(IEvent tmp) {
97-
ValueInputAssignedEvent args = tmp as ValueInputAssignedEvent;
92+
ValueInputAssignedEvent args = (tmp as ValueInputAssignedEvent)!;
9893

9994
if (args.InputKey.Length > MiraId.Length) {
10095
string s = args.InputKey.Remove(0, MiraId.Length);

engine/Assets/Scripts/Behaviors/GeneralArmBehaviour.cs

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
using System;
2-
using System.Collections;
3-
using System.Collections.Generic;
4-
using Google.Protobuf.WellKnownTypes;
52
using Synthesis.PreferenceManager;
63
using Synthesis.UI.Dynamic;
74
using SynthesisAPI.EventBus;
85
using SynthesisAPI.InputManager;
96
using SynthesisAPI.InputManager.Inputs;
107
using SynthesisAPI.Simulation;
11-
using SynthesisAPI.Utilities;
128
using UnityEngine;
139

14-
using Logger = SynthesisAPI.Utilities.Logger;
15-
1610
#nullable enable
1711

1812
namespace Synthesis {
@@ -74,7 +68,7 @@ public Analog TryLoadInput(string key, Analog defaultInput) {
7468
}
7569

7670
private void OnValueInputAssigned(IEvent tmp) {
77-
ValueInputAssignedEvent args = tmp as ValueInputAssignedEvent;
71+
ValueInputAssignedEvent args = (tmp as ValueInputAssignedEvent)!;
7872
if (args.InputKey.Equals(_forwardInputKey) || args.InputKey.Equals(_reverseInputKey)) {
7973
if (_robot.RobotGUID != (MainHUD.SelectedRobot?.RobotGUID ?? string.Empty) ||
8074
!((DynamicUIManager.ActiveModal as ChangeInputsModal)?.isSave ?? false))

0 commit comments

Comments
 (0)