Skip to content

Commit 2973087

Browse files
committed
Update objects & core dlls to 2.13
1 parent d1a0a66 commit 2973087

File tree

118 files changed

+4603
-641
lines changed

Some content is hidden

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

118 files changed

+4603
-641
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ ExportedObj/
4545
*.pidb
4646
*.booproj
4747
*.svd
48-
*.pdb
48+
#*.pdb
4949
*.mdb
5050
*.opendb
5151
*.VC.db
5252

5353
# Unity3D generated meta files
5454
*.pidb.meta
55-
*.pdb.meta
55+
#*.pdb.meta
5656
*.mdb.meta
5757

5858
# Unity3D generated file on crash reports

Assets/Extra/PerformanceTestSender.cs

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
using System.Threading;
2+
using System.Threading.Tasks;
3+
using Speckle.ConnectorUnity.Components;
4+
using Speckle.Core.Api;
5+
using Speckle.Core.Models;
6+
using Speckle.Core.Transports;
7+
using UnityEngine;
8+
9+
namespace Extra
10+
{
11+
/// <summary>
12+
/// Script used to generate streams for performance benchmarking in other hostApps.
13+
/// Will send several several commits with a varying number of copies on a GameObject (with children)
14+
/// </summary>
15+
[ExecuteAlways]
16+
[RequireComponent(typeof(SpeckleSender))]
17+
public sealed class PerformanceTestSender : MonoBehaviour
18+
{
19+
[Range(0, 100)]
20+
public int numberOfIterations = 10;
21+
22+
public Vector3 translation = Vector3.forward * 100;
23+
24+
public GameObject objectToSend;
25+
26+
private SpeckleSender sender;
27+
private void Awake()
28+
{
29+
sender = GetComponent<SpeckleSender>();
30+
}
31+
32+
public async Task SendIterations()
33+
{
34+
GameObject go = new GameObject();
35+
for (int i = 0; i < numberOfIterations; i++)
36+
{
37+
Instantiate(objectToSend, translation * i, Quaternion.identity, go.transform);
38+
39+
Base b = sender.Converter.RecursivelyConvertToSpeckle(go, _ => true);
40+
await Send(b, $"{i}");
41+
}
42+
Debug.Log("Done!");
43+
}
44+
45+
private async Task<string> Send(Base data, string branchName)
46+
{
47+
var client = sender.Account.Client;
48+
var stream = sender.Stream.Selected;
49+
ServerTransport transport = new ServerTransport(sender.Account.Selected, stream!.id);
50+
51+
await client.BranchCreate(new BranchCreateInput(){streamId = stream.id, name = branchName});
52+
53+
return await SpeckleSender.SendDataAsync(CancellationToken.None,
54+
remoteTransport: transport,
55+
data: data,
56+
client: client!,
57+
branchName: branchName,
58+
createCommit: true,
59+
onProgressAction: null,
60+
onErrorAction: (m, e) => throw e);
61+
}
62+
}
63+
64+
#if UNITY_EDITOR
65+
[UnityEditor.CustomEditor(typeof(PerformanceTestSender))]
66+
public sealed class PerformanceTestSenderEditor : UnityEditor.Editor
67+
{
68+
public override async void OnInspectorGUI()
69+
{
70+
DrawDefaultInspector();
71+
72+
if (GUILayout.Button("Create and send"))
73+
{
74+
await ((PerformanceTestSender)target).SendIterations();
75+
}
76+
}
77+
}
78+
#endif
79+
}

Assets/Extra/PerformanceTestSender.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Extra/Speckle.Extra.asmdef

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "Speckle.Extra",
3-
"references":[ "GUID:eed1b8b83e2c0074d9e5de2348e3ff72", "GUID:e6adfdc4e436206479f48eafc82f32b5" ]
3+
"references":[ "GUID:eed1b8b83e2c0074d9e5de2348e3ff72", "GUID:e6adfdc4e436206479f48eafc82f32b5", "GUID:d274441ecc3eb3f43b093eec1503d681" ]
44
}

Packages/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.collab-proxy": "1.17.6",
5-
"com.unity.ide.rider": "3.0.16",
6-
"com.unity.ide.visualstudio": "2.0.16",
4+
"com.unity.collab-proxy": "2.0.1",
5+
"com.unity.ide.rider": "3.0.18",
6+
"com.unity.ide.visualstudio": "2.0.17",
77
"com.unity.ide.vscode": "1.2.5",
88
"com.unity.test-framework": "1.1.31",
99
"com.unity.textmeshpro": "3.0.6",

Packages/packages-lock.json

+4-24
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
"dependencies": {}
88
},
99
"com.unity.collab-proxy": {
10-
"version": "1.17.6",
10+
"version": "2.0.1",
1111
"depth": 0,
1212
"source": "registry",
13-
"dependencies": {
14-
"com.unity.services.core": "1.0.1"
15-
},
13+
"dependencies": {},
1614
"url": "https://packages.unity.com"
1715
},
1816
"com.unity.ext.nunit": {
@@ -23,7 +21,7 @@
2321
"url": "https://packages.unity.com"
2422
},
2523
"com.unity.ide.rider": {
26-
"version": "3.0.16",
24+
"version": "3.0.18",
2725
"depth": 0,
2826
"source": "registry",
2927
"dependencies": {
@@ -32,7 +30,7 @@
3230
"url": "https://packages.unity.com"
3331
},
3432
"com.unity.ide.visualstudio": {
35-
"version": "2.0.16",
33+
"version": "2.0.17",
3634
"depth": 0,
3735
"source": "registry",
3836
"dependencies": {
@@ -47,24 +45,6 @@
4745
"dependencies": {},
4846
"url": "https://packages.unity.com"
4947
},
50-
"com.unity.nuget.newtonsoft-json": {
51-
"version": "3.0.2",
52-
"depth": 2,
53-
"source": "registry",
54-
"dependencies": {},
55-
"url": "https://packages.unity.com"
56-
},
57-
"com.unity.services.core": {
58-
"version": "1.6.0",
59-
"depth": 1,
60-
"source": "registry",
61-
"dependencies": {
62-
"com.unity.modules.unitywebrequest": "1.0.0",
63-
"com.unity.nuget.newtonsoft-json": "3.0.2",
64-
"com.unity.modules.androidjni": "1.0.0"
65-
},
66-
"url": "https://packages.unity.com"
67-
},
6848
"com.unity.sysroot": {
6949
"version": "2.0.3",
7050
"depth": 1,
Binary file not shown.
Binary file not shown.

Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Abstractions.dll.meta

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.Features.dll.meta

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.Http.dll.meta

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.AspNetCore.WebUtilities.dll.meta

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.DependencyInjection.Abstractions.dll.meta

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/systems.speckle.speckle-unity/Runtime/Core/Microsoft.Extensions.ObjectPool.dll.meta

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)