Skip to content

Commit

Permalink
Release v6.1 (Prod) (#944)
Browse files Browse the repository at this point in the history
  • Loading branch information
HunterBarclay authored Jan 5, 2024
2 parents 42c572e + 29d81dc commit b65ac76
Show file tree
Hide file tree
Showing 45 changed files with 1,066 additions and 1,484 deletions.
2 changes: 1 addition & 1 deletion VersionManager.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"Version": "6.0.0",
"Version": "6.1.0",
"URL": "https://synthesis.autodesk.com/download.html"
}
24 changes: 24 additions & 0 deletions api/Api/Mirabuf/JointInstance.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
namespace Mirabuf.Joint {
public partial class JointInstance {

public enum WheelTypeEnum {
Standard = 0, Omni = 1
}

private bool? _isWheel = null;
public bool IsWheel(Assembly assembly) {
if (!_isWheel.HasValue) {
Expand All @@ -11,5 +16,24 @@ public bool IsWheel(Assembly assembly) {
}
return _isWheel.Value;
}

private WheelTypeEnum? _wheelType = null;
public WheelTypeEnum GetWheelType(Assembly assembly) {
if (!_wheelType.HasValue) {
if (IsWheel(assembly)) {
var hasValue = assembly.Data.Joints.JointDefinitions[JointReference].UserData.Data
.TryGetValue("wheelType", out var wheelType);
if (hasValue && wheelType.Equals("1")) {
_wheelType = WheelTypeEnum.Omni;
} else {
_wheelType = WheelTypeEnum.Standard;
}
} else {
throw new System.Exception("Non-wheels don't have wheel types");
}
}

return _wheelType.Value;
}
}
}
4 changes: 2 additions & 2 deletions api/Api/Simulation/SimBehaviour.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public bool Enabled {
/// </summary>
/// <param name="simObjectId">ID of the SimObject within the SimulationManager</param>
/// <param name="inputs">A list of reserved inputs by the behaviour, along with a input to assign to each</param>
public SimBehaviour(string simObjectId) {
Enabled = true;
public SimBehaviour(string simObjectId, bool autoEnable = true) {
Enabled = autoEnable;
SimObjectId = simObjectId;
string id = simObjectId;
int _i = id.IndexOf("_", 0);
Expand Down
1 change: 1 addition & 0 deletions api/Api/Simulation/SimulationManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public static bool RemoveBehaviour(string simObjectName, SimBehaviour b) {
var cursor = list.First;
while (!removed && cursor != null) {
if (cursor.Value.Equals(b)) {
cursor.Value.Enabled = false;
cursor.Value.OnRemove();
list.Remove(cursor);
removed = true;
Expand Down
2 changes: 1 addition & 1 deletion api/Api/UIManager/UIParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static VisualElementAsset CreateVisualElements(string name, XmlNodeList n

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

_UnityVisualElement resultElement = (_UnityVisualElement)element;
_UnityVisualElement resultElement = (_UnityVisualElement)element!;

foreach (XmlNode child in node.ChildNodes)
{
Expand Down
2 changes: 0 additions & 2 deletions emulation/bridge/.gitignore

This file was deleted.

29 changes: 0 additions & 29 deletions emulation/bridge/Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions emulation/bridge/cmd/main.go

This file was deleted.

8 changes: 0 additions & 8 deletions emulation/bridge/go.mod

This file was deleted.

1,116 changes: 0 additions & 1,116 deletions emulation/bridge/go.sum

This file was deleted.

33 changes: 0 additions & 33 deletions emulation/bridge/pkg/protocol/grpc/server.go

This file was deleted.

159 changes: 0 additions & 159 deletions emulation/bridge/pkg/service/v1/emulator_service.go

This file was deleted.

4 changes: 0 additions & 4 deletions emulation/bridge/scripts/gen_grpc.sh

This file was deleted.

2 changes: 1 addition & 1 deletion engine/Assets/Scripts/AutoUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class AutoUpdater : MonoBehaviour {
public static bool UpdateAvailable { get; private set; } = false;
public static string UpdaterLink { get; private set; }

public const string LocalVersion = "6.0.0.0"; // must be a version value
public const string LocalVersion = "6.1.0.0"; // must be a version value

private void Start() {
if (CheckConnection()) {
Expand Down
11 changes: 3 additions & 8 deletions engine/Assets/Scripts/Behaviors/ArcadeDriveBehaviour.cs
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
using System;
using System.Collections.Generic;
using Google.Protobuf.WellKnownTypes;
using System.Collections.Generic;
using Synthesis.PreferenceManager;
using Synthesis.UI.Dynamic;
using SynthesisAPI.EventBus;
using SynthesisAPI.InputManager;
using SynthesisAPI.InputManager.Inputs;
using SynthesisAPI.Simulation;
using UnityEditor;
using UnityEngine;
using Input = UnityEngine.Input;
using Logger = SynthesisAPI.Utilities.Logger;
using Math = SynthesisAPI.Utilities.Math;
using Math = SynthesisAPI.Utilities.Math;

#nullable enable

Expand Down Expand Up @@ -94,7 +89,7 @@ public Analog TryLoadInput(string key, Analog defaultInput) {
}

private void OnValueInputAssigned(IEvent tmp) {
ValueInputAssignedEvent args = tmp as ValueInputAssignedEvent;
ValueInputAssignedEvent args = (tmp as ValueInputAssignedEvent)!;

if (args.InputKey.Length > MiraId.Length) {
string s = args.InputKey.Remove(0, MiraId.Length);
Expand Down
8 changes: 1 addition & 7 deletions engine/Assets/Scripts/Behaviors/GeneralArmBehaviour.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Google.Protobuf.WellKnownTypes;
using Synthesis.PreferenceManager;
using Synthesis.UI.Dynamic;
using SynthesisAPI.EventBus;
using SynthesisAPI.InputManager;
using SynthesisAPI.InputManager.Inputs;
using SynthesisAPI.Simulation;
using SynthesisAPI.Utilities;
using UnityEngine;

using Logger = SynthesisAPI.Utilities.Logger;

#nullable enable

namespace Synthesis {
Expand Down Expand Up @@ -74,7 +68,7 @@ public Analog TryLoadInput(string key, Analog defaultInput) {
}

private void OnValueInputAssigned(IEvent tmp) {
ValueInputAssignedEvent args = tmp as ValueInputAssignedEvent;
ValueInputAssignedEvent args = (tmp as ValueInputAssignedEvent)!;
if (args.InputKey.Equals(_forwardInputKey) || args.InputKey.Equals(_reverseInputKey)) {
if (_robot.RobotGUID != (MainHUD.SelectedRobot?.RobotGUID ?? string.Empty) ||
!((DynamicUIManager.ActiveModal as ChangeInputsModal)?.isSave ?? false))
Expand Down
Loading

0 comments on commit b65ac76

Please sign in to comment.