This repository has been archived by the owner on Jan 18, 2022. It is now read-only.
Simplify components, step 1 #1290
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
improbable-prow-robot
added
jira/no-ticket
improbable-prow-robot
added
A: core
|
Still needs test project update and a changelog. |
zeroZshadow
force-pushed
the
feature/simplify-components
branch
from
696b294 to
b3fc65d
Compare
improbable-prow-robot
added
size/XXL
Make EntityId readonly Simplify DiffComponentStorage
Fix EventStorage clearing
zeroZshadow
force-pushed
the
feature/simplify-components
branch
from
67c8816 to
5ab60b8
Compare
improbable-prow-robot
removed
the
do-not-merge/work-in-progress
| @@ -9,7 +9,7 @@ namespace Improbable.Gdk.Core | |||
| /// Instances of this type should be treated as transient identifiers that will not be | |||
| /// consistent between different runs of the same simulation. | |||
| /// </remarks> | |||
| public struct EntityId : IEquatable<EntityId> | |||
| public readonly struct EntityId : IEquatable<EntityId> | |||
There was a problem hiding this comment.
Worth noting this in the changelog :)
| public abstract class DiffComponentStorage<TUpdate> : IDiffUpdateStorage<TUpdate>, IDiffComponentAddedStorage<TUpdate>, IDiffAuthorityStorage | ||
| where TUpdate : ISpatialComponentUpdate | ||
| { | ||
| private readonly HashSet<EntityId> entitiesUpdated = new HashSet<EntityId>(); |
There was a problem hiding this comment.
Can you make this protected since I'll need that in #1298 ?
Comment on lines
17
to
18
| .Select(componentCommands => (componentCommands.Key, | ||
| componentCommands.Value.Commands.Select(m => m.SendStorage))); |
There was a problem hiding this comment.
I find splitting the tuple over two lines really hard to grok
Comment on lines
+45
to
+54
| private readonly Dictionary<uint, (int firstIndex, int count)> componentIdStorageRange = | ||
| new Dictionary<uint, (int firstIndex, int count)>(); | ||
|
|
||
| private readonly Dictionary<(uint componentId, uint commandId), IComponentCommandDiffStorage> componentCommandToStorage = | ||
| new Dictionary<(uint componentId, uint commandId), IComponentCommandDiffStorage>(); | ||
|
|
||
| private readonly Dictionary<Type, ICommandDiffStorage> typeToCommandStorage = | ||
| new Dictionary<Type, ICommandDiffStorage>(); | ||
|
|
||
| private readonly List<ICommandDiffStorage> commandStorageList = new List<ICommandDiffStorage>(); | ||
| private readonly List<IComponentCommandDiffStorage> commandStorageList = new List<IComponentCommandDiffStorage>(); |
There was a problem hiding this comment.
A small explanation on this in comments would go a long way :)
There was a problem hiding this comment.
A IComponentCommandDiffStorage implements ICommandDiffStorage
All instances in this list were the former, except for the world command storage that we manually added.
Instead, I now store the generated diff storages only, and the world storage is called manually. (This is only done for clearing afterwards)
There was a problem hiding this comment.
I'm referring more to the range dictionary :)
paulbalaji
reviewed
Feb 19, 2020
workers/unity/Packages/io.improbable.gdk.core/View/DiffComponentStorage.cs
Outdated
Show resolved
Hide resolved
workers/unity/Packages/io.improbable.gdk.core/View/DiffComponentStorage.cs
Outdated
Show resolved
Hide resolved
Comment on lines
17
to
18
| .Select(componentCommands => (componentCommands.Key, | ||
| componentCommands.Value.Commands.Select(m => m.SendStorage))); |
workers/unity/Packages/io.improbable.gdk.core/Worker/ViewDiff.cs
Outdated
Show resolved
Hide resolved
workers/unity/Packages/io.improbable.gdk.core/Worker/ViewDiff.cs
Outdated
Show resolved
Hide resolved
CHANGELOG.md
Outdated
| - Running forced code generation now deletes the `ImprobableCodegen.marker` file. [#1294](https://github.com/spatialos/gdk-for-unity/pull/1294) | ||
| - Added tests coverage for the interaction between unlinking a GameObject and Reader/Writer/CommandSender/CommandReceiver state. [#1295](https://github.com/spatialos/gdk-for-unity/pull/1295) | ||
| - Reduce complexity in ViewDiff and MessagesToSend classes. [#1290](https://github.com/spatialos/gdk-for-unity/pull/1290) | ||
| - De-duplicate code for generated ComponentDiffStorage instances. [#1290](https://github.com/spatialos/gdk-for-unity/pull/1290) |
There was a problem hiding this comment.
Suggested change
| - De-duplicate code for generated ComponentDiffStorage instances. [#1290](https://github.com/spatialos/gdk-for-unity/pull/1290) | |
| - De-duplicate code for generated `ComponentDiffStorage` instances. [#1290](https://github.com/spatialos/gdk-for-unity/pull/1290) |
paulbalaji
reviewed
Feb 19, 2020
Co-Authored-By: Paul Balaji <[email protected]>
paulbalaji
approved these changes
Feb 19, 2020
jamiebrynes7
approved these changes
Feb 20, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
First iteration of simplifications in the Component section of code generation.
Includes an improvement in the ViewDiff and MessagesToSend, reducing a double lookup for storage instances to a single lookup.