diff --git a/Assets/Speckle Connector/Core/Sentry.dll b/Assets/Speckle Connector/Core/Sentry.dll deleted file mode 100644 index be67ff9..0000000 Binary files a/Assets/Speckle Connector/Core/Sentry.dll and /dev/null differ diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.dll b/Assets/Speckle Connector/Core/SpeckleCore2.dll deleted file mode 100644 index 704a002..0000000 Binary files a/Assets/Speckle Connector/Core/SpeckleCore2.dll and /dev/null differ diff --git a/Assets/Speckle Connector/Objects/Objects.dll b/Assets/Speckle Connector/Objects/Objects.dll deleted file mode 100644 index 97154e6..0000000 Binary files a/Assets/Speckle Connector/Objects/Objects.dll and /dev/null differ diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0378a97..ece3a18 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -105,6 +105,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "systems.speckle.speckle-unity": { + "version": "file:systems.speckle.speckle-unity", + "depth": 0, + "source": "embedded", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/Assets/Speckle Connector/ConverterUnity.BuiltElements.cs b/Packages/systems.speckle.speckle-unity/ConverterUnity.BuiltElements.cs similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.BuiltElements.cs rename to Packages/systems.speckle.speckle-unity/ConverterUnity.BuiltElements.cs diff --git a/Assets/Speckle Connector/ConverterUnity.BuiltElements.cs.meta b/Packages/systems.speckle.speckle-unity/ConverterUnity.BuiltElements.cs.meta similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.BuiltElements.cs.meta rename to Packages/systems.speckle.speckle-unity/ConverterUnity.BuiltElements.cs.meta diff --git a/Assets/Speckle Connector/ConverterUnity.Geometry.cs b/Packages/systems.speckle.speckle-unity/ConverterUnity.Geometry.cs similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.Geometry.cs rename to Packages/systems.speckle.speckle-unity/ConverterUnity.Geometry.cs diff --git a/Assets/Speckle Connector/ConverterUnity.Geometry.cs.meta b/Packages/systems.speckle.speckle-unity/ConverterUnity.Geometry.cs.meta similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.Geometry.cs.meta rename to Packages/systems.speckle.speckle-unity/ConverterUnity.Geometry.cs.meta diff --git a/Assets/Speckle Connector/ConverterUnity.Units.cs b/Packages/systems.speckle.speckle-unity/ConverterUnity.Units.cs similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.Units.cs rename to Packages/systems.speckle.speckle-unity/ConverterUnity.Units.cs diff --git a/Assets/Speckle Connector/ConverterUnity.Units.cs.meta b/Packages/systems.speckle.speckle-unity/ConverterUnity.Units.cs.meta similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.Units.cs.meta rename to Packages/systems.speckle.speckle-unity/ConverterUnity.Units.cs.meta diff --git a/Assets/Speckle Connector/ConverterUnity.cs b/Packages/systems.speckle.speckle-unity/ConverterUnity.cs similarity index 98% rename from Assets/Speckle Connector/ConverterUnity.cs rename to Packages/systems.speckle.speckle-unity/ConverterUnity.cs index 660b15c..54d9edd 100644 --- a/Assets/Speckle Connector/ConverterUnity.cs +++ b/Packages/systems.speckle.speckle-unity/ConverterUnity.cs @@ -20,6 +20,8 @@ namespace Objects.Converter.Unity public string Name => nameof(ConverterUnity); public string Author => "Speckle"; public string WebsiteOrEmail => "https://speckle.systems"; + + public ProgressReport Report { get; } public IEnumerable GetServicedApplications() => new string[] {Applications.Other}; //TODO: add unity diff --git a/Assets/Speckle Connector/ConverterUnity.cs.meta b/Packages/systems.speckle.speckle-unity/ConverterUnity.cs.meta similarity index 100% rename from Assets/Speckle Connector/ConverterUnity.cs.meta rename to Packages/systems.speckle.speckle-unity/ConverterUnity.cs.meta diff --git a/Assets/Speckle Connector/Core.meta b/Packages/systems.speckle.speckle-unity/Core.meta similarity index 100% rename from Assets/Speckle Connector/Core.meta rename to Packages/systems.speckle.speckle-unity/Core.meta diff --git a/Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.Websocket.dll b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.Websocket.dll similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.Websocket.dll rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.Websocket.dll diff --git a/Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.Websocket.dll.meta b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.Websocket.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.Websocket.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.Websocket.dll.meta diff --git a/Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.dll b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.dll similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.dll rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.dll diff --git a/Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.dll.meta b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Client.Abstractions.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.Abstractions.dll.meta diff --git a/Assets/Speckle Connector/Core/GraphQL.Client.dll b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.dll similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Client.dll rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.dll diff --git a/Assets/Speckle Connector/Core/GraphQL.Client.dll.meta b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Client.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Client.dll.meta diff --git a/Assets/Speckle Connector/Core/GraphQL.Primitives.dll b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Primitives.dll similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Primitives.dll rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Primitives.dll diff --git a/Assets/Speckle Connector/Core/GraphQL.Primitives.dll.meta b/Packages/systems.speckle.speckle-unity/Core/GraphQL.Primitives.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/GraphQL.Primitives.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/GraphQL.Primitives.dll.meta diff --git a/Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll b/Packages/systems.speckle.speckle-unity/Core/Microsoft.Bcl.AsyncInterfaces.dll similarity index 100% rename from Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll rename to Packages/systems.speckle.speckle-unity/Core/Microsoft.Bcl.AsyncInterfaces.dll diff --git a/Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll.meta b/Packages/systems.speckle.speckle-unity/Core/Microsoft.Bcl.AsyncInterfaces.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/Microsoft.Bcl.AsyncInterfaces.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/Microsoft.Bcl.AsyncInterfaces.dll.meta diff --git a/Assets/Speckle Connector/Core/Piwik.Tracker.dll b/Packages/systems.speckle.speckle-unity/Core/Piwik.Tracker.dll similarity index 100% rename from Assets/Speckle Connector/Core/Piwik.Tracker.dll rename to Packages/systems.speckle.speckle-unity/Core/Piwik.Tracker.dll diff --git a/Assets/Speckle Connector/Core/Piwik.Tracker.dll.meta b/Packages/systems.speckle.speckle-unity/Core/Piwik.Tracker.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/Piwik.Tracker.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/Piwik.Tracker.dll.meta diff --git a/Packages/systems.speckle.speckle-unity/Core/Sentry.dll b/Packages/systems.speckle.speckle-unity/Core/Sentry.dll new file mode 100644 index 0000000..fff7479 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Core/Sentry.dll differ diff --git a/Assets/Speckle Connector/Core/Sentry.dll.meta b/Packages/systems.speckle.speckle-unity/Core/Sentry.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/Sentry.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/Sentry.dll.meta diff --git a/Assets/Speckle Connector/Core/Speckle.Newtonsoft.Json.dll b/Packages/systems.speckle.speckle-unity/Core/Speckle.Newtonsoft.Json.dll similarity index 100% rename from Assets/Speckle Connector/Core/Speckle.Newtonsoft.Json.dll rename to Packages/systems.speckle.speckle-unity/Core/Speckle.Newtonsoft.Json.dll diff --git a/Assets/Speckle Connector/Core/Speckle.Newtonsoft.Json.dll.meta b/Packages/systems.speckle.speckle-unity/Core/Speckle.Newtonsoft.Json.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/Speckle.Newtonsoft.Json.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/Speckle.Newtonsoft.Json.dll.meta diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.deps.json similarity index 97% rename from Assets/Speckle Connector/Core/SpeckleCore2.deps.json rename to Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.deps.json index aba7cfc..6c95a2f 100644 --- a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json +++ b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.deps.json @@ -13,7 +13,7 @@ "Microsoft.CSharp": "4.7.0", "NETStandard.Library": "2.0.3", "Piwik.Tracker": "3.0.0", - "Sentry": "3.9.0", + "Sentry": "3.9.4", "Speckle.Newtonsoft.Json": "12.0.3.1", "System.Data.SQLite.Core": "1.0.115" }, @@ -98,7 +98,7 @@ } } }, - "Sentry/3.9.0": { + "Sentry/3.9.4": { "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "System.Buffers": "4.5.1", @@ -108,8 +108,8 @@ }, "runtime": { "lib/netstandard2.0/Sentry.dll": { - "assemblyVersion": "3.9.0.0", - "fileVersion": "3.9.0.0" + "assemblyVersion": "3.9.4.0", + "fileVersion": "3.9.4.0" } } }, @@ -340,12 +340,12 @@ "path": "piwik.tracker/3.0.0", "hashPath": "piwik.tracker.3.0.0.nupkg.sha512" }, - "Sentry/3.9.0": { + "Sentry/3.9.4": { "type": "package", "serviceable": true, - "sha512": "sha512-U++mXgv9PVz6l28XXxLY9F6T2t/QuW+PtF4MBmBF4djnKWiqv3fHEHszKdux/t7tw1/wM2k0JdDrLSnOfcXhtg==", - "path": "sentry/3.9.0", - "hashPath": "sentry.3.9.0.nupkg.sha512" + "sha512": "sha512-q7LK5E/xNNNO0hVNYjvTqOKAzzKy2+YHxtmd9WKlrp2bo9/55VMtyQmqqjacQ8Tha6ugj50Z5XWu+2IEUiN4+Q==", + "path": "sentry/3.9.4", + "hashPath": "sentry.3.9.4.nupkg.sha512" }, "Speckle.Newtonsoft.Json/12.0.3.1": { "type": "package", diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json.meta b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.deps.json.meta similarity index 100% rename from Assets/Speckle Connector/Core/SpeckleCore2.deps.json.meta rename to Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.deps.json.meta diff --git a/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.dll b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.dll new file mode 100644 index 0000000..aa3c801 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.dll differ diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.dll.meta b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/SpeckleCore2.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.dll.meta diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.xml b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.xml similarity index 98% rename from Assets/Speckle Connector/Core/SpeckleCore2.xml rename to Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.xml index 62ef34d..ab8bdd6 100644 --- a/Assets/Speckle Connector/Core/SpeckleCore2.xml +++ b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.xml @@ -635,6 +635,11 @@ Used to ignore properties from expand objects etc + + + Keeps track of the conversion process + + Converts a native object to a Speckle one @@ -991,6 +996,21 @@ cannot correspond with the (ie, on receiving operations). + + + Keeps track of the conversion process + + + + + Keeps track of errors in the conversions. + + + + + Keeps track of errors in the operations of send/receive. + + Wrapper method around hashing functions. Defaults to md5. diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.xml.meta b/Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.xml.meta similarity index 100% rename from Assets/Speckle Connector/Core/SpeckleCore2.xml.meta rename to Packages/systems.speckle.speckle-unity/Core/SpeckleCore2.xml.meta diff --git a/Assets/Speckle Connector/Core/System.Buffers.dll b/Packages/systems.speckle.speckle-unity/Core/System.Buffers.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Buffers.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Buffers.dll diff --git a/Assets/Speckle Connector/Core/System.Buffers.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Buffers.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Buffers.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Buffers.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Collections.Immutable.dll b/Packages/systems.speckle.speckle-unity/Core/System.Collections.Immutable.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Collections.Immutable.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Collections.Immutable.dll diff --git a/Assets/Speckle Connector/Core/System.Collections.Immutable.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Collections.Immutable.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Collections.Immutable.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Collections.Immutable.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Data.SQLite.dll b/Packages/systems.speckle.speckle-unity/Core/System.Data.SQLite.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Data.SQLite.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Data.SQLite.dll diff --git a/Assets/Speckle Connector/Core/System.Data.SQLite.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Data.SQLite.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Data.SQLite.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Data.SQLite.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Memory.dll b/Packages/systems.speckle.speckle-unity/Core/System.Memory.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Memory.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Memory.dll diff --git a/Assets/Speckle Connector/Core/System.Memory.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Memory.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Memory.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Memory.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Numerics.Vectors.dll b/Packages/systems.speckle.speckle-unity/Core/System.Numerics.Vectors.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Numerics.Vectors.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Numerics.Vectors.dll diff --git a/Assets/Speckle Connector/Core/System.Numerics.Vectors.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Numerics.Vectors.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Numerics.Vectors.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Numerics.Vectors.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Reactive.dll b/Packages/systems.speckle.speckle-unity/Core/System.Reactive.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Reactive.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Reactive.dll diff --git a/Assets/Speckle Connector/Core/System.Reactive.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Reactive.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Reactive.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Reactive.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Reflection.Metadata.dll b/Packages/systems.speckle.speckle-unity/Core/System.Reflection.Metadata.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Reflection.Metadata.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Reflection.Metadata.dll diff --git a/Assets/Speckle Connector/Core/System.Reflection.Metadata.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Reflection.Metadata.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Reflection.Metadata.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Reflection.Metadata.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll b/Packages/systems.speckle.speckle-unity/Core/System.Runtime.CompilerServices.Unsafe.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Runtime.CompilerServices.Unsafe.dll diff --git a/Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Runtime.CompilerServices.Unsafe.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Runtime.CompilerServices.Unsafe.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Runtime.CompilerServices.Unsafe.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll b/Packages/systems.speckle.speckle-unity/Core/System.Text.Encodings.Web.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Text.Encodings.Web.dll diff --git a/Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Text.Encodings.Web.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Text.Encodings.Web.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Text.Encodings.Web.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Text.Json.dll b/Packages/systems.speckle.speckle-unity/Core/System.Text.Json.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Text.Json.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Text.Json.dll diff --git a/Assets/Speckle Connector/Core/System.Text.Json.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Text.Json.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Text.Json.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Text.Json.dll.meta diff --git a/Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll b/Packages/systems.speckle.speckle-unity/Core/System.Threading.Tasks.Extensions.dll similarity index 100% rename from Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll rename to Packages/systems.speckle.speckle-unity/Core/System.Threading.Tasks.Extensions.dll diff --git a/Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll.meta b/Packages/systems.speckle.speckle-unity/Core/System.Threading.Tasks.Extensions.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/System.Threading.Tasks.Extensions.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/System.Threading.Tasks.Extensions.dll.meta diff --git a/Assets/Speckle Connector/Core/x64.meta b/Packages/systems.speckle.speckle-unity/Core/x64.meta similarity index 100% rename from Assets/Speckle Connector/Core/x64.meta rename to Packages/systems.speckle.speckle-unity/Core/x64.meta diff --git a/Assets/Speckle Connector/Core/x64/SQLite.Interop.dll b/Packages/systems.speckle.speckle-unity/Core/x64/SQLite.Interop.dll similarity index 100% rename from Assets/Speckle Connector/Core/x64/SQLite.Interop.dll rename to Packages/systems.speckle.speckle-unity/Core/x64/SQLite.Interop.dll diff --git a/Assets/Speckle Connector/Core/x64/SQLite.Interop.dll.meta b/Packages/systems.speckle.speckle-unity/Core/x64/SQLite.Interop.dll.meta similarity index 100% rename from Assets/Speckle Connector/Core/x64/SQLite.Interop.dll.meta rename to Packages/systems.speckle.speckle-unity/Core/x64/SQLite.Interop.dll.meta diff --git a/Assets/Speckle Connector/Dispatcher.cs b/Packages/systems.speckle.speckle-unity/Dispatcher.cs similarity index 100% rename from Assets/Speckle Connector/Dispatcher.cs rename to Packages/systems.speckle.speckle-unity/Dispatcher.cs diff --git a/Assets/Speckle Connector/Dispatcher.cs.meta b/Packages/systems.speckle.speckle-unity/Dispatcher.cs.meta similarity index 100% rename from Assets/Speckle Connector/Dispatcher.cs.meta rename to Packages/systems.speckle.speckle-unity/Dispatcher.cs.meta diff --git a/Assets/Speckle Connector/Editor.meta b/Packages/systems.speckle.speckle-unity/Editor.meta similarity index 100% rename from Assets/Speckle Connector/Editor.meta rename to Packages/systems.speckle.speckle-unity/Editor.meta diff --git a/Assets/Speckle Connector/Editor/Speckle.Connector.Editor.asmdef b/Packages/systems.speckle.speckle-unity/Editor/Speckle.Connector.Editor.asmdef similarity index 100% rename from Assets/Speckle Connector/Editor/Speckle.Connector.Editor.asmdef rename to Packages/systems.speckle.speckle-unity/Editor/Speckle.Connector.Editor.asmdef diff --git a/Assets/Speckle Connector/Editor/Speckle.Connector.Editor.asmdef.meta b/Packages/systems.speckle.speckle-unity/Editor/Speckle.Connector.Editor.asmdef.meta similarity index 100% rename from Assets/Speckle Connector/Editor/Speckle.Connector.Editor.asmdef.meta rename to Packages/systems.speckle.speckle-unity/Editor/Speckle.Connector.Editor.asmdef.meta diff --git a/Assets/Speckle Connector/Editor/StreamManagerEditor.cs b/Packages/systems.speckle.speckle-unity/Editor/StreamManagerEditor.cs similarity index 94% rename from Assets/Speckle Connector/Editor/StreamManagerEditor.cs rename to Packages/systems.speckle.speckle-unity/Editor/StreamManagerEditor.cs index c5568f8..f0e119d 100644 --- a/Assets/Speckle Connector/Editor/StreamManagerEditor.cs +++ b/Packages/systems.speckle.speckle-unity/Editor/StreamManagerEditor.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Sentry; using Speckle.Core.Api; using Speckle.Core.Credentials; +using Speckle.Core.Kits; using Speckle.Core.Logging; using Speckle.Core.Transports; using UnityEditor; @@ -175,7 +176,22 @@ namespace Speckle.ConnectorUnity var go = _streamManager.ConvertRecursivelyToNative(@base, Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].id); - + + try + { + await Client.CommitReceived(new CommitReceivedInput + { + streamId = SelectedStream.id, + commitId = Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].id, + message = $"received commit from {Applications.Unity} Editor", + sourceApplication = Applications.Unity + }); + } + catch + { + // Do nothing! + } + } catch (Exception e) { diff --git a/Assets/Speckle Connector/Editor/StreamManagerEditor.cs.meta b/Packages/systems.speckle.speckle-unity/Editor/StreamManagerEditor.cs.meta similarity index 100% rename from Assets/Speckle Connector/Editor/StreamManagerEditor.cs.meta rename to Packages/systems.speckle.speckle-unity/Editor/StreamManagerEditor.cs.meta diff --git a/Assets/Speckle Connector/Objects.meta b/Packages/systems.speckle.speckle-unity/Objects.meta similarity index 100% rename from Assets/Speckle Connector/Objects.meta rename to Packages/systems.speckle.speckle-unity/Objects.meta diff --git a/Packages/systems.speckle.speckle-unity/Objects/Objects.dll b/Packages/systems.speckle.speckle-unity/Objects/Objects.dll new file mode 100644 index 0000000..ad3b857 Binary files /dev/null and b/Packages/systems.speckle.speckle-unity/Objects/Objects.dll differ diff --git a/Assets/Speckle Connector/Objects/Objects.dll.meta b/Packages/systems.speckle.speckle-unity/Objects/Objects.dll.meta similarity index 100% rename from Assets/Speckle Connector/Objects/Objects.dll.meta rename to Packages/systems.speckle.speckle-unity/Objects/Objects.dll.meta diff --git a/Assets/Speckle Connector/Parallel Extensions.meta b/Packages/systems.speckle.speckle-unity/Parallel Extensions.meta similarity index 100% rename from Assets/Speckle Connector/Parallel Extensions.meta rename to Packages/systems.speckle.speckle-unity/Parallel Extensions.meta diff --git a/Assets/Speckle Connector/Parallel Extensions/ParallelExtensionsExtras.dll b/Packages/systems.speckle.speckle-unity/Parallel Extensions/ParallelExtensionsExtras.dll similarity index 100% rename from Assets/Speckle Connector/Parallel Extensions/ParallelExtensionsExtras.dll rename to Packages/systems.speckle.speckle-unity/Parallel Extensions/ParallelExtensionsExtras.dll diff --git a/Assets/Speckle Connector/Parallel Extensions/ParallelExtensionsExtras.dll.meta b/Packages/systems.speckle.speckle-unity/Parallel Extensions/ParallelExtensionsExtras.dll.meta similarity index 100% rename from Assets/Speckle Connector/Parallel Extensions/ParallelExtensionsExtras.dll.meta rename to Packages/systems.speckle.speckle-unity/Parallel Extensions/ParallelExtensionsExtras.dll.meta diff --git a/Assets/Speckle Connector/Receiver.cs b/Packages/systems.speckle.speckle-unity/Receiver.cs similarity index 93% rename from Assets/Speckle Connector/Receiver.cs rename to Packages/systems.speckle.speckle-unity/Receiver.cs index 17ac027..6c33a81 100644 --- a/Assets/Speckle Connector/Receiver.cs +++ b/Packages/systems.speckle.speckle-unity/Receiver.cs @@ -13,6 +13,7 @@ using System.Linq; using System.Threading.Tasks; using Sentry; using Sentry.Protocol; +using Speckle.Core.Kits; using UnityEngine; namespace Speckle.ConnectorUnity @@ -155,6 +156,22 @@ namespace Speckle.ConnectorUnity { throw new SpeckleException(e.Message, e, true, SentryLevel.Error); } + + try + { + await Client.CommitReceived(new CommitReceivedInput + { + streamId = StreamId, + commitId = commitId, + message = "received commit from " + Applications.Unity, + sourceApplication = Applications.Unity + }); + } + catch + { + // Do nothing! + } + } diff --git a/Assets/Speckle Connector/Receiver.cs.meta b/Packages/systems.speckle.speckle-unity/Receiver.cs.meta similarity index 100% rename from Assets/Speckle Connector/Receiver.cs.meta rename to Packages/systems.speckle.speckle-unity/Receiver.cs.meta diff --git a/Assets/Speckle Connector/RecursiveConverter.cs b/Packages/systems.speckle.speckle-unity/RecursiveConverter.cs similarity index 100% rename from Assets/Speckle Connector/RecursiveConverter.cs rename to Packages/systems.speckle.speckle-unity/RecursiveConverter.cs diff --git a/Assets/Speckle Connector/RecursiveConverter.cs.meta b/Packages/systems.speckle.speckle-unity/RecursiveConverter.cs.meta similarity index 100% rename from Assets/Speckle Connector/RecursiveConverter.cs.meta rename to Packages/systems.speckle.speckle-unity/RecursiveConverter.cs.meta diff --git a/Assets/Speckle Connector/Sender.cs b/Packages/systems.speckle.speckle-unity/Sender.cs similarity index 100% rename from Assets/Speckle Connector/Sender.cs rename to Packages/systems.speckle.speckle-unity/Sender.cs diff --git a/Assets/Speckle Connector/Sender.cs.meta b/Packages/systems.speckle.speckle-unity/Sender.cs.meta similarity index 100% rename from Assets/Speckle Connector/Sender.cs.meta rename to Packages/systems.speckle.speckle-unity/Sender.cs.meta diff --git a/Assets/Speckle Connector/Speckle.Connector.asmdef b/Packages/systems.speckle.speckle-unity/Speckle.Connector.asmdef similarity index 100% rename from Assets/Speckle Connector/Speckle.Connector.asmdef rename to Packages/systems.speckle.speckle-unity/Speckle.Connector.asmdef diff --git a/Assets/Speckle Connector/Speckle.Connector.asmdef.meta b/Packages/systems.speckle.speckle-unity/Speckle.Connector.asmdef.meta similarity index 100% rename from Assets/Speckle Connector/Speckle.Connector.asmdef.meta rename to Packages/systems.speckle.speckle-unity/Speckle.Connector.asmdef.meta diff --git a/Assets/Speckle Connector/SpeckleProperties.cs b/Packages/systems.speckle.speckle-unity/SpeckleProperties.cs similarity index 100% rename from Assets/Speckle Connector/SpeckleProperties.cs rename to Packages/systems.speckle.speckle-unity/SpeckleProperties.cs diff --git a/Assets/Speckle Connector/SpeckleProperties.cs.meta b/Packages/systems.speckle.speckle-unity/SpeckleProperties.cs.meta similarity index 100% rename from Assets/Speckle Connector/SpeckleProperties.cs.meta rename to Packages/systems.speckle.speckle-unity/SpeckleProperties.cs.meta diff --git a/Assets/Speckle Connector/StreamManager.cs b/Packages/systems.speckle.speckle-unity/StreamManager.cs similarity index 100% rename from Assets/Speckle Connector/StreamManager.cs rename to Packages/systems.speckle.speckle-unity/StreamManager.cs diff --git a/Assets/Speckle Connector/StreamManager.cs.meta b/Packages/systems.speckle.speckle-unity/StreamManager.cs.meta similarity index 100% rename from Assets/Speckle Connector/StreamManager.cs.meta rename to Packages/systems.speckle.speckle-unity/StreamManager.cs.meta diff --git a/Assets/Speckle Connector/Streams.cs b/Packages/systems.speckle.speckle-unity/Streams.cs similarity index 100% rename from Assets/Speckle Connector/Streams.cs rename to Packages/systems.speckle.speckle-unity/Streams.cs diff --git a/Assets/Speckle Connector/Streams.cs.meta b/Packages/systems.speckle.speckle-unity/Streams.cs.meta similarity index 100% rename from Assets/Speckle Connector/Streams.cs.meta rename to Packages/systems.speckle.speckle-unity/Streams.cs.meta diff --git a/Assets/Speckle Connector/Utils.cs b/Packages/systems.speckle.speckle-unity/Utils.cs similarity index 100% rename from Assets/Speckle Connector/Utils.cs rename to Packages/systems.speckle.speckle-unity/Utils.cs diff --git a/Assets/Speckle Connector/Utils.cs.meta b/Packages/systems.speckle.speckle-unity/Utils.cs.meta similarity index 100% rename from Assets/Speckle Connector/Utils.cs.meta rename to Packages/systems.speckle.speckle-unity/Utils.cs.meta diff --git a/Packages/systems.speckle.speckle-unity/package.json b/Packages/systems.speckle.speckle-unity/package.json new file mode 100644 index 0000000..7c9ce66 --- /dev/null +++ b/Packages/systems.speckle.speckle-unity/package.json @@ -0,0 +1,24 @@ +{ + "name": "systems.speckle.speckle-unity", + "version": "2.2.4-beta", + "displayName": "Speckle Unity Connector", + "description": "AEC Interoperability for Unity through Speckle", + "unity": "2018.3", + "documentationUrl": "https://speckle.guide/user/unity.html", + "changelogUrl": "https://speckle.notion.site/Public-Changelog-45cb90c7514642ffab2e72d0288e4071", + "license": "Apache-2.0", + "licensesUrl": "https://github.com/specklesystems/speckle-unity/blob/main/LICENSE", + "keywords": [ + "speckle", + "aec", + "speckle-unity", + "version-control", + "interoperability", + "speckle systems" + ], + "author": { + "name": "Speckle Systems", + "email": "hello@speckle.systems", + "url": "https://speckle.systems" + } +} diff --git a/Assets/Speckle Connector.meta b/Packages/systems.speckle.speckle-unity/package.json.meta similarity index 57% rename from Assets/Speckle Connector.meta rename to Packages/systems.speckle.speckle-unity/package.json.meta index 02fece3..fd44777 100644 --- a/Assets/Speckle Connector.meta +++ b/Packages/systems.speckle.speckle-unity/package.json.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 2822f83843986b844820ecb3fe7c2c98 -folderAsset: yes -DefaultImporter: +guid: 37699b1aefd23994d939054301c85961 +PackageManifestImporter: externalObjects: {} userData: assetBundleName: