From d16db228ed1cfd973187ddc0fe22fcace7c1911b Mon Sep 17 00:00:00 2001 From: sebas77 Date: Sat, 2 Oct 2021 17:49:54 +0100 Subject: [PATCH] Fix Compilation Errors --- .gitignore | 2 ++ Svelto.Common | 2 +- Svelto.ECS.sln | 22 +++++++++++++++++++ Svelto.ECS/Core/ComponentBuilder.cs | 2 +- .../EntityReference/EnginesRoot.LocatorMap.cs | 2 +- .../DataStructures/ITypeSafeDictionary.cs | 2 +- .../DataStructures/TypeSafeDictionary.cs | 6 ++--- Svelto.ECS/Svelto.ECS.csproj | 8 +++---- Svelto.ECS/Svelto.ECS.nuspec | 2 +- Svelto.ECS/package.json | 2 +- Svelto.ECS/version.json | 2 +- 11 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 Svelto.ECS.sln diff --git a/.gitignore b/.gitignore index ec9e355..b66bf4a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ Svelto.ECS/Svelto.ECS.sdpkg.user Svelto.ECS/obj/ Svelto.ECS/.idea/ +.idea/ +Svelto.ECS/bin/ diff --git a/Svelto.Common b/Svelto.Common index 9b2780e..656980d 160000 --- a/Svelto.Common +++ b/Svelto.Common @@ -1 +1 @@ -Subproject commit 9b2780ebed4358bce64def40ecf42e7274f31b2a +Subproject commit 656980d4e1026955f27e84f97b77339fd7cbd87c diff --git a/Svelto.ECS.sln b/Svelto.ECS.sln new file mode 100644 index 0000000..76a9594 --- /dev/null +++ b/Svelto.ECS.sln @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Svelto.Common", "Svelto.Common\Svelto.Common.csproj", "{85590169-907B-46E7-8409-100FF08ACFCF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Svelto.ECS", "Svelto.ECS\Svelto.ECS.csproj", "{11637B78-CB8A-4F32-A1CF-6D82719B5CD6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {85590169-907B-46E7-8409-100FF08ACFCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85590169-907B-46E7-8409-100FF08ACFCF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85590169-907B-46E7-8409-100FF08ACFCF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85590169-907B-46E7-8409-100FF08ACFCF}.Release|Any CPU.Build.0 = Release|Any CPU + {11637B78-CB8A-4F32-A1CF-6D82719B5CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11637B78-CB8A-4F32-A1CF-6D82719B5CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11637B78-CB8A-4F32-A1CF-6D82719B5CD6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11637B78-CB8A-4F32-A1CF-6D82719B5CD6}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Svelto.ECS/Core/ComponentBuilder.cs b/Svelto.ECS/Core/ComponentBuilder.cs index 5311994..f9a7c8a 100644 --- a/Svelto.ECS/Core/ComponentBuilder.cs +++ b/Svelto.ECS/Core/ComponentBuilder.cs @@ -105,7 +105,7 @@ namespace Svelto.ECS public override int GetHashCode() { return _initializer.GetHashCode(); } - static void Preallocate(ITypeSafeDictionary dictionary, uint size) { dictionary.SetCapacity(size); } + static void Preallocate(ITypeSafeDictionary dictionary, uint size) { dictionary.ResizeTo(size); } readonly T _initializer; diff --git a/Svelto.ECS/Core/EntityReference/EnginesRoot.LocatorMap.cs b/Svelto.ECS/Core/EntityReference/EnginesRoot.LocatorMap.cs index a3cdb8c..147d53c 100644 --- a/Svelto.ECS/Core/EntityReference/EnginesRoot.LocatorMap.cs +++ b/Svelto.ECS/Core/EntityReference/EnginesRoot.LocatorMap.cs @@ -188,7 +188,7 @@ namespace Svelto.ECS { _egidToReferenceMap .GetOrCreate(groupID, () => new SharedSveltoDictionaryNative(size)) - .SetCapacity(size); + .ResizeTo(size); _entityReferenceMap.Resize(size); } diff --git a/Svelto.ECS/DataStructures/ITypeSafeDictionary.cs b/Svelto.ECS/DataStructures/ITypeSafeDictionary.cs index 4cebac4..e43d159 100644 --- a/Svelto.ECS/DataStructures/ITypeSafeDictionary.cs +++ b/Svelto.ECS/DataStructures/ITypeSafeDictionary.cs @@ -33,7 +33,7 @@ namespace Svelto.ECS.Internal void AddEntityToDictionary(EGID fromEntityGid, EGID toEntityID, ITypeSafeDictionary toGroup); void RemoveEntityFromDictionary(EGID fromEntityGid); - void SetCapacity(uint size); + void ResizeTo(uint size); void Trim(); void Clear(); void FastClear(); diff --git a/Svelto.ECS/DataStructures/TypeSafeDictionary.cs b/Svelto.ECS/DataStructures/TypeSafeDictionary.cs index 7415cc3..313178b 100644 --- a/Svelto.ECS/DataStructures/TypeSafeDictionary.cs +++ b/Svelto.ECS/DataStructures/TypeSafeDictionary.cs @@ -364,15 +364,15 @@ namespace Svelto.ECS.Internal } [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void SetCapacity(uint size) + public void ResizeTo(uint size) { if (isUnmanaged) { - implUnmgd.ExpandTo(size); + implUnmgd.ResizeTo(size); } else { - implMgd.ExpandTo(size); + implMgd.ResizeTo(size); } } diff --git a/Svelto.ECS/Svelto.ECS.csproj b/Svelto.ECS/Svelto.ECS.csproj index 4dbdf2c..0644b97 100644 --- a/Svelto.ECS/Svelto.ECS.csproj +++ b/Svelto.ECS/Svelto.ECS.csproj @@ -20,9 +20,9 @@ true - - - - + + + + \ No newline at end of file diff --git a/Svelto.ECS/Svelto.ECS.nuspec b/Svelto.ECS/Svelto.ECS.nuspec index 86b5ed7..24006c2 100644 --- a/Svelto.ECS/Svelto.ECS.nuspec +++ b/Svelto.ECS/Svelto.ECS.nuspec @@ -2,7 +2,7 @@ Svelto.ECS - sebas77 + Sebastiano Mandala $version$ C# Lightweight Data Oriented Entity Component System Framework https://github.com/sebas77/Svelto.ECS diff --git a/Svelto.ECS/package.json b/Svelto.ECS/package.json index 6cf1dec..b5abd7c 100644 --- a/Svelto.ECS/package.json +++ b/Svelto.ECS/package.json @@ -9,7 +9,7 @@ "svelto" ], "name": "com.sebaslab.svelto.ecs", - "version": "3.2.0", + "version": "3.2.1", "type": "library", "unity": "2019.3" } \ No newline at end of file diff --git a/Svelto.ECS/version.json b/Svelto.ECS/version.json index 65166e8..7706f9e 100644 --- a/Svelto.ECS/version.json +++ b/Svelto.ECS/version.json @@ -1,3 +1,3 @@ { - "version": "3.2.0" + "version": "3.2.1" }