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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 24 additions & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 2 deletions
This file was deleted.

emulation/bridge/Makefile

Lines changed: 0 additions & 29 deletions
This file was deleted.

emulation/bridge/cmd/main.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

emulation/bridge/go.mod

Lines changed: 0 additions & 8 deletions
This file was deleted.

emulation/bridge/go.sum

Lines changed: 0 additions & 1116 deletions
This file was deleted.

0 commit comments

Comments
 (0)