diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md index 72765d9252..4e244838fd 100644 --- a/com.unity.netcode.gameobjects/CHANGELOG.md +++ b/com.unity.netcode.gameobjects/CHANGELOG.md @@ -1,4 +1,3 @@ - # Changelog All notable changes to this project will be documented in this file. @@ -10,11 +9,13 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [Unreleased] ### Added + - Added `NetworkObject` auto-add helper and Multiplayer Tools install reminder settings to Project Settings. (#2285) - Added `public string DisconnectReason` getter to `NetworkManager` and `string Reason` to `ConnectionApprovalResponse`. Allows connection approval to communicate back a reason. Also added `public void DisconnectClient(ulong clientId, string reason)` allowing setting a disconnection reason, when explicitly disconnecting a client. ### Changed +- Changed 3rd-party `XXHash` (32 & 64) implementation with an in-house reimplementation (#2310) - Optimized bandwidth usage by encoding most integer fields using variable-length encoding. (#2276) ### Fixed @@ -25,9 +26,10 @@ Additional documentation and release notes are available at [Multiplayer Documen - Fixed issue where in-scene placed `NetworkObjects` were not honoring the `AutoObjectParentSync` property. (#2281) - Fixed the issue where `NetworkManager.OnClientConnectedCallback` was being invoked before in-scene placed `NetworkObject`s had been spawned when starting `NetworkManager` as a host. (#2277) - Creating a `FastBufferReader` with `Allocator.None` will not result in extra memory being allocated for the buffer (since it's owned externally in that scenario). (#2265) + ### Removed -- Removed the `NetworkObject` auto-add and Multiplayer Tools install reminder settings from the Menu interface. (#2285) +- Removed the `NetworkObject` auto-add and Multiplayer Tools install reminder settings from the Menu interface. (#2285) ## [1.1.0] - 2022-10-21 @@ -179,6 +181,7 @@ Additional documentation and release notes are available at [Multiplayer Documen - Removed `ClientNetworkTransform` from the package samples and moved to Boss Room's Utilities package which can be found [here](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop/blob/main/Packages/com.unity.multiplayer.samples.coop/Utilities/Net/ClientAuthority/ClientNetworkTransform.cs) (#1912) ### Fixed + - Fixed issue where `NetworkSceneManager` did not synchronize despawned in-scene placed NetworkObjects. (#1898) - Fixed `NetworkTransform` generating false positive rotation delta checks when rolling over between 0 and 360 degrees. (#1890) - Fixed client throwing an exception if it has messages in the outbound queue when processing the `NetworkEvent.Disconnect` event and is using UTP. (#1884) @@ -232,10 +235,12 @@ Additional documentation and release notes are available at [Multiplayer Documen ## [1.0.0-pre.6] - 2022-03-02 ### Added + - NetworkAnimator now properly synchrhonizes all animation layers as well as runtime-adjusted weighting between them (#1765) - Added first set of tests for NetworkAnimator - parameter syncing, trigger set / reset, override network animator (#1735) ### Fixed + - Fixed an issue where sometimes the first client to connect to the server could see messages from the server as coming from itself. (#1683) - Fixed an issue where clients seemed to be able to send messages to ClientId 1, but these messages would actually still go to the server (id 0) instead of that client. (#1683) - Improved clarity of error messaging when a client attempts to send a message to a destination other than the server, which isn't allowed. (#1683) @@ -287,6 +292,7 @@ Additional documentation and release notes are available at [Multiplayer Documen - Removed `FixedQueue`, `StreamExtensions`, `TypeExtensions` (#1398) ### Fixed + - Fixed in-scene NetworkObjects that are moved into the DDOL scene not getting restored to their original active state (enabled/disabled) after a full scene transition (#1354) - Fixed invalid IL code being generated when using `this` instead of `this ref` for the FastBufferReader/FastBufferWriter parameter of an extension method. (#1393) - Fixed an issue where if you are running as a server (not host) the LoadEventCompleted and UnloadEventCompleted events would fire early by the NetworkSceneManager (#1379) @@ -301,6 +307,7 @@ Additional documentation and release notes are available at [Multiplayer Documen - Fixed network tick value sometimes being duplicated or skipped. (#1614) ### Changed + - The SDK no longer limits message size to 64k. (The transport may still impose its own limits, but the SDK no longer does.) (#1384) - Updated com.unity.collections to 1.1.0 (#1451) - NetworkManager's GameObject is no longer allowed to be nested under one or more GameObject(s).(#1484) diff --git a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.cs b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.cs new file mode 100644 index 0000000000..615736c3a1 --- /dev/null +++ b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.cs @@ -0,0 +1,248 @@ +using System; +using System.Text; +using System.Runtime.CompilerServices; + +namespace Unity.Netcode +{ + internal static class XXHash + { + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static unsafe uint Hash32(byte* input, int length, uint seed = 0) + { + unchecked + { + const uint prime1 = 2654435761u; + const uint prime2 = 2246822519u; + const uint prime3 = 3266489917u; + const uint prime4 = 0668265263u; + const uint prime5 = 0374761393u; + + uint hash = seed + prime5; + + if (length >= 16) + { + uint val0 = seed + prime1 + prime2; + uint val1 = seed + prime2; + uint val2 = seed + 0; + uint val3 = seed - prime1; + + int count = length >> 4; + for (int i = 0; i < count; i++) + { + var pos0 = *(uint*)(input + 0); + var pos1 = *(uint*)(input + 4); + var pos2 = *(uint*)(input + 8); + var pos3 = *(uint*)(input + 12); + + val0 += pos0 * prime2; + val0 = (val0 << 13) | (val0 >> (32 - 13)); + val0 *= prime1; + + val1 += pos1 * prime2; + val1 = (val1 << 13) | (val1 >> (32 - 13)); + val1 *= prime1; + + val2 += pos2 * prime2; + val2 = (val2 << 13) | (val2 >> (32 - 13)); + val2 *= prime1; + + val3 += pos3 * prime2; + val3 = (val3 << 13) | (val3 >> (32 - 13)); + val3 *= prime1; + + input += 16; + } + + hash = ((val0 << 01) | (val0 >> (32 - 01))) + + ((val1 << 07) | (val1 >> (32 - 07))) + + ((val2 << 12) | (val2 >> (32 - 12))) + + ((val3 << 18) | (val3 >> (32 - 18))); + } + + hash += (uint)length; + + length &= 15; + while (length >= 4) + { + hash += *(uint*)input * prime3; + hash = ((hash << 17) | (hash >> (32 - 17))) * prime4; + input += 4; + length -= 4; + } + while (length > 0) + { + hash += *input * prime5; + hash = ((hash << 11) | (hash >> (32 - 11))) * prime1; + ++input; + --length; + } + + hash ^= hash >> 15; + hash *= prime2; + hash ^= hash >> 13; + hash *= prime3; + hash ^= hash >> 16; + + return hash; + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static unsafe ulong Hash64(byte* input, int length, uint seed = 0) + { + unchecked + { + const ulong prime1 = 11400714785074694791ul; + const ulong prime2 = 14029467366897019727ul; + const ulong prime3 = 01609587929392839161ul; + const ulong prime4 = 09650029242287828579ul; + const ulong prime5 = 02870177450012600261ul; + + ulong hash = seed + prime5; + + if (length >= 32) + { + ulong val0 = seed + prime1 + prime2; + ulong val1 = seed + prime2; + ulong val2 = seed + 0; + ulong val3 = seed - prime1; + + int count = length >> 5; + for (int i = 0; i < count; i++) + { + var pos0 = *(ulong*)(input + 0); + var pos1 = *(ulong*)(input + 8); + var pos2 = *(ulong*)(input + 16); + var pos3 = *(ulong*)(input + 24); + + val0 += pos0 * prime2; + val0 = (val0 << 31) | (val0 >> (64 - 31)); + val0 *= prime1; + + val1 += pos1 * prime2; + val1 = (val1 << 31) | (val1 >> (64 - 31)); + val1 *= prime1; + + val2 += pos2 * prime2; + val2 = (val2 << 31) | (val2 >> (64 - 31)); + val2 *= prime1; + + val3 += pos3 * prime2; + val3 = (val3 << 31) | (val3 >> (64 - 31)); + val3 *= prime1; + + input += 32; + } + + hash = ((val0 << 01) | (val0 >> (64 - 01))) + + ((val1 << 07) | (val1 >> (64 - 07))) + + ((val2 << 12) | (val2 >> (64 - 12))) + + ((val3 << 18) | (val3 >> (64 - 18))); + + val0 *= prime2; + val0 = (val0 << 31) | (val0 >> (64 - 31)); + val0 *= prime1; + hash ^= val0; + hash = hash * prime1 + prime4; + + val1 *= prime2; + val1 = (val1 << 31) | (val1 >> (64 - 31)); + val1 *= prime1; + hash ^= val1; + hash = hash * prime1 + prime4; + + val2 *= prime2; + val2 = (val2 << 31) | (val2 >> (64 - 31)); + val2 *= prime1; + hash ^= val2; + hash = hash * prime1 + prime4; + + val3 *= prime2; + val3 = (val3 << 31) | (val3 >> (64 - 31)); + val3 *= prime1; + hash ^= val3; + hash = hash * prime1 + prime4; + } + + hash += (ulong)length; + + length &= 31; + while (length >= 8) + { + ulong lane = *(ulong*)input * prime2; + lane = ((lane << 31) | (lane >> (64 - 31))) * prime1; + hash ^= lane; + hash = ((hash << 27) | (hash >> (64 - 27))) * prime1 + prime4; + input += 8; + length -= 8; + } + if (length >= 4) + { + hash ^= *(uint*)input * prime1; + hash = ((hash << 23) | (hash >> (64 - 23))) * prime2 + prime3; + input += 4; + length -= 4; + } + while (length > 0) + { + hash ^= *input * prime5; + hash = ((hash << 11) | (hash >> (64 - 11))) * prime1; + ++input; + --length; + } + + hash ^= hash >> 33; + hash *= prime2; + hash ^= hash >> 29; + hash *= prime3; + hash ^= hash >> 32; + + return hash; + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static uint Hash32(this byte[] buffer) + { + int length = buffer.Length; + unsafe + { + fixed (byte* pointer = buffer) + { + return Hash32(pointer, length); + } + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static uint Hash32(this string text) => Hash32(Encoding.UTF8.GetBytes(text)); + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static uint Hash32(this Type type) => Hash32(type.FullName); + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static uint Hash32() => Hash32(typeof(T)); + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ulong Hash64(this byte[] buffer) + { + int length = buffer.Length; + unsafe + { + fixed (byte* pointer = buffer) + { + return Hash64(pointer, length); + } + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ulong Hash64(this string text) => Hash64(Encoding.UTF8.GetBytes(text)); + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ulong Hash64(this Type type) => Hash64(type.FullName); + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ulong Hash64() => Hash64(typeof(T)); + } +} diff --git a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs.meta b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.cs.meta similarity index 83% rename from com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs.meta rename to com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.cs.meta index 5c090bbab7..97156256bf 100644 --- a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs.meta +++ b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b5aa7a49e9e694f148d810d34577546b +guid: c3077af091aa443acbdea9d3e97727b0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.meta b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.meta deleted file mode 100644 index f1fa98a705..0000000000 --- a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c61e8fe9a68a486fbbc3128d233ded2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE deleted file mode 100644 index 6b55f78fe5..0000000000 --- a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015, 2016 Sedat Kapanoglu - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE.meta b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE.meta deleted file mode 100644 index c6b28aa115..0000000000 --- a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/LICENSE.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cf89ecbf6f9954c8ea6d0848b1e79d87 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs b/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs deleted file mode 100644 index cfcb9d642d..0000000000 --- a/com.unity.netcode.gameobjects/Runtime/Hashing/XXHash/XXHash.cs +++ /dev/null @@ -1,318 +0,0 @@ -// -// Copyright (c) 2015-2019 Sedat Kapanoglu -// MIT License (see LICENSE file for details) -// - -// @mfatihmar (Unity): Modified for Unity support - -using System.Text; -using System.Runtime.CompilerServices; - -namespace Unity.Netcode -{ - /// - /// XXHash implementation. - /// - internal static class XXHash - { - private const ulong k_Prime64v1 = 11400714785074694791ul; - private const ulong k_Prime64v2 = 14029467366897019727ul; - private const ulong k_Prime64v3 = 1609587929392839161ul; - private const ulong k_Prime64v4 = 9650029242287828579ul; - private const ulong k_Prime64v5 = 2870177450012600261ul; - - private const uint k_Prime32v1 = 2654435761u; - private const uint k_Prime32v2 = 2246822519u; - private const uint k_Prime32v3 = 3266489917u; - private const uint k_Prime32v4 = 668265263u; - private const uint k_Prime32v5 = 374761393u; - - public static uint Hash32(string text) => Hash32(text, Encoding.UTF8); - public static uint Hash32(string text, Encoding encoding) => Hash32(encoding.GetBytes(text)); - public static uint Hash32(byte[] buffer) - { - unsafe - { - fixed (byte* ptr = buffer) - { - return Hash32(ptr, buffer.Length); - } - } - } - - /// - /// Generate a 32-bit xxHash value. - /// - /// Input buffer. - /// Input buffer length. - /// Optional seed. - /// 32-bit hash value. - public static unsafe uint Hash32(byte* buffer, int bufferLength, uint seed = 0) - { - const int stripeLength = 16; - - int len = bufferLength; - int remainingLen = len; - uint acc; - - byte* pInput = buffer; - if (len >= stripeLength) - { - uint acc1 = seed + k_Prime32v1 + k_Prime32v2; - uint acc2 = seed + k_Prime32v2; - uint acc3 = seed; - uint acc4 = seed - k_Prime32v1; - - do - { - acc = processStripe32(ref pInput, ref acc1, ref acc2, ref acc3, ref acc4); - remainingLen -= stripeLength; - } while (remainingLen >= stripeLength); - } - else - { - acc = seed + k_Prime32v5; - } - - acc += (uint)len; - acc = processRemaining32(pInput, acc, remainingLen); - - return avalanche32(acc); - } - - public static ulong Hash64(string text) => Hash64(text, Encoding.UTF8); - public static ulong Hash64(string text, Encoding encoding) => Hash64(encoding.GetBytes(text)); - public static ulong Hash64(byte[] buffer) - { - unsafe - { - fixed (byte* ptr = buffer) - { - return Hash64(ptr, buffer.Length); - } - } - } - - /// - /// Generate a 64-bit xxHash value. - /// - /// Input buffer. - /// Input buffer length. - /// Optional seed. - /// Computed 64-bit hash value. - public static unsafe ulong Hash64(byte* buffer, int bufferLength, ulong seed = 0) - { - const int stripeLength = 32; - - int len = bufferLength; - int remainingLen = len; - ulong acc; - - byte* pInput = buffer; - if (len >= stripeLength) - { - ulong acc1 = seed + k_Prime64v1 + k_Prime64v2; - ulong acc2 = seed + k_Prime64v2; - ulong acc3 = seed; - ulong acc4 = seed - k_Prime64v1; - - do - { - acc = processStripe64(ref pInput, ref acc1, ref acc2, ref acc3, ref acc4); - remainingLen -= stripeLength; - } while (remainingLen >= stripeLength); - } - else - { - acc = seed + k_Prime64v5; - } - - acc += (ulong)len; - acc = processRemaining64(pInput, acc, remainingLen); - - - return avalanche64(acc); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static unsafe ulong processStripe64( - ref byte* pInput, - ref ulong acc1, - ref ulong acc2, - ref ulong acc3, - ref ulong acc4) - { - processLane64(ref acc1, ref pInput); - processLane64(ref acc2, ref pInput); - processLane64(ref acc3, ref pInput); - processLane64(ref acc4, ref pInput); - - ulong acc = Bits.RotateLeft(acc1, 1) - + Bits.RotateLeft(acc2, 7) - + Bits.RotateLeft(acc3, 12) - + Bits.RotateLeft(acc4, 18); - - mergeAccumulator64(ref acc, acc1); - mergeAccumulator64(ref acc, acc2); - mergeAccumulator64(ref acc, acc3); - mergeAccumulator64(ref acc, acc4); - return acc; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static unsafe void processLane64(ref ulong accn, ref byte* pInput) - { - ulong lane = *(ulong*)pInput; - accn = round64(accn, lane); - pInput += 8; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static unsafe ulong processRemaining64( - byte* pInput, - ulong acc, - int remainingLen) - { - for (ulong lane; remainingLen >= 8; remainingLen -= 8, pInput += 8) - { - lane = *(ulong*)pInput; - - acc ^= round64(0, lane); - acc = Bits.RotateLeft(acc, 27) * k_Prime64v1; - acc += k_Prime64v4; - } - - for (uint lane32; remainingLen >= 4; remainingLen -= 4, pInput += 4) - { - lane32 = *(uint*)pInput; - - acc ^= lane32 * k_Prime64v1; - acc = Bits.RotateLeft(acc, 23) * k_Prime64v2; - acc += k_Prime64v3; - } - - for (byte lane8; remainingLen >= 1; remainingLen--, pInput++) - { - lane8 = *pInput; - acc ^= lane8 * k_Prime64v5; - acc = Bits.RotateLeft(acc, 11) * k_Prime64v1; - } - - return acc; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static ulong avalanche64(ulong acc) - { - acc ^= acc >> 33; - acc *= k_Prime64v2; - acc ^= acc >> 29; - acc *= k_Prime64v3; - acc ^= acc >> 32; - return acc; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static ulong round64(ulong accn, ulong lane) - { - accn += lane * k_Prime64v2; - return Bits.RotateLeft(accn, 31) * k_Prime64v1; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static void mergeAccumulator64(ref ulong acc, ulong accn) - { - acc ^= round64(0, accn); - acc *= k_Prime64v1; - acc += k_Prime64v4; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static unsafe uint processStripe32( - ref byte* pInput, - ref uint acc1, - ref uint acc2, - ref uint acc3, - ref uint acc4) - { - processLane32(ref pInput, ref acc1); - processLane32(ref pInput, ref acc2); - processLane32(ref pInput, ref acc3); - processLane32(ref pInput, ref acc4); - - return Bits.RotateLeft(acc1, 1) - + Bits.RotateLeft(acc2, 7) - + Bits.RotateLeft(acc3, 12) - + Bits.RotateLeft(acc4, 18); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static unsafe void processLane32(ref byte* pInput, ref uint accn) - { - uint lane = *(uint*)pInput; - accn = round32(accn, lane); - pInput += 4; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static unsafe uint processRemaining32( - byte* pInput, - uint acc, - int remainingLen) - { - for (uint lane; remainingLen >= 4; remainingLen -= 4, pInput += 4) - { - lane = *(uint*)pInput; - acc += lane * k_Prime32v3; - acc = Bits.RotateLeft(acc, 17) * k_Prime32v4; - } - - for (byte lane; remainingLen >= 1; remainingLen--, pInput++) - { - lane = *pInput; - acc += lane * k_Prime32v5; - acc = Bits.RotateLeft(acc, 11) * k_Prime32v1; - } - - return acc; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static uint round32(uint accn, uint lane) - { - accn += lane * k_Prime32v2; - accn = Bits.RotateLeft(accn, 13); - accn *= k_Prime32v1; - return accn; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private static uint avalanche32(uint acc) - { - acc ^= acc >> 15; - acc *= k_Prime32v2; - acc ^= acc >> 13; - acc *= k_Prime32v3; - acc ^= acc >> 16; - return acc; - } - - /// - /// Bit operations. - /// - private static class Bits - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static ulong RotateLeft(ulong value, int bits) - { - return (value << bits) | (value >> (64 - bits)); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static uint RotateLeft(uint value, int bits) - { - return (value << bits) | (value >> (32 - bits)); - } - } - } -} diff --git a/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs new file mode 100644 index 0000000000..342a3739d0 --- /dev/null +++ b/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs @@ -0,0 +1,31 @@ +using NUnit.Framework; + +namespace Unity.Netcode.EditorTests +{ + public class XXHashTests + { + [Test] + public void TestXXHash32Short() + { + Assert.That("TestStuff".Hash32(), Is.EqualTo(0x64e10c4c)); + } + + [Test] + public void TestXXHash32Long() + { + Assert.That("TestingHashingWithLongStringValues".Hash32(), Is.EqualTo(0xba3d1783)); + } + + [Test] + public void TestXXHas64Short() + { + Assert.That("TestStuff".Hash64(), Is.EqualTo(0x4c3be8d82d14a5a9)); + } + + [Test] + public void TestXXHash64Long() + { + Assert.That("TestingHashingWithLongStringValues".Hash64(), Is.EqualTo(0x5b374f98b10bf246)); + } + } +} diff --git a/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs.meta new file mode 100644 index 0000000000..a7886b3f44 --- /dev/null +++ b/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ce9bdc7200b66410286810307554534b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.netcode.gameobjects/Third Party Notices.md b/com.unity.netcode.gameobjects/Third Party Notices.md deleted file mode 100644 index 5d05eaa379..0000000000 --- a/com.unity.netcode.gameobjects/Third Party Notices.md +++ /dev/null @@ -1,32 +0,0 @@ -This package contains third-party software components governed by the license(s) indicated below: ---------- - -## Package: Editor/CodeGen/XXHash - ---------- - -Component Name: xxHash - -License Type: MIT - -Copyright (c) 2015, 2016 Sedat Kapanoglu - -http://www.xxhash.com/ - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/com.unity.netcode.gameobjects/Third Party Notices.md.meta b/com.unity.netcode.gameobjects/Third Party Notices.md.meta deleted file mode 100644 index 68346b1c42..0000000000 --- a/com.unity.netcode.gameobjects/Third Party Notices.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 43e3f545298d44899b42e94aa7d17f07 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: