Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
refactor(Collection): reorganize collections into sub namespaces
The number of differing collections along with their concrete
implementations was making the Collection directory hard to follow so
each of the collection types that has a base and concrete
implementations has now been moved into a sub directory along with a
sub namespace to clean up the Collection directory.
  • Loading branch information
thestonefox committed Apr 15, 2019
1 parent f8259b3 commit e9d6d10
Show file tree
Hide file tree
Showing 97 changed files with 132 additions and 82 deletions.
4 changes: 2 additions & 2 deletions Editor/Data/Collection/ObservableListEditor.cs
Expand Up @@ -3,12 +3,12 @@
using UnityEditor;
using UnityEngine;
using System;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using Malimbe.FodyRunner.UnityIntegration;
using Zinnia.Data.Collection;
using Zinnia.Utility;
using Zinnia.Data.Collection.List;

/// <summary>
/// A custom inspector editor for <see cref="ObservableList{TElement,TEvent}"/> and subclasses of it.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Action/ActionRegistrar.cs
Expand Up @@ -7,7 +7,7 @@
using Malimbe.PropertySerializationAttribute;
using Malimbe.XmlDocumentationAttribute;
using Zinnia.Action.Collection;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows actions to dynamically register listeners to other actions.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Action/Collection/ActionObservableList.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="Zinnia.Action.Action"/>s.
Expand Down
Expand Up @@ -5,7 +5,7 @@
using System;
using System.Collections.Generic;
using Malimbe.BehaviourStateRequirementMethod;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="ActionRegistrar.ActionSource"/>s.
Expand Down
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="GameObjectsAssociation"/>s.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Association/GameObjectsAssociation.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Holds <see cref="GameObject"/>s to (de)activate.
Expand Down
8 changes: 8 additions & 0 deletions Runtime/Data/Collection/Counter.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.Counter
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.Counter
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
3 changes: 2 additions & 1 deletion Runtime/Data/Collection/GameObjectRelations.cs
Expand Up @@ -3,9 +3,10 @@
using UnityEngine;
using UnityEngine.Events;
using System;
using Malimbe.BehaviourStateRequirementMethod;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Malimbe.BehaviourStateRequirementMethod;
using Zinnia.Data.Collection.List;

/// <summary>
/// Holds a collection of key/value relations between GameObjects and allows searching for a given key in the collection to emit the linked value.
Expand Down
8 changes: 8 additions & 0 deletions Runtime/Data/Collection/List.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine.Events;
using System.Collections.Generic;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine.Events;
using System;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine.Events;
using System;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using Object = UnityEngine.Object;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.List
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
8 changes: 8 additions & 0 deletions Runtime/Data/Collection/Stack.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.Stack
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
@@ -1,4 +1,4 @@
namespace Zinnia.Data.Collection
namespace Zinnia.Data.Collection.Stack
{
using UnityEngine;
using UnityEngine.Events;
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Data/Type/Transformation/CollectionAggregator.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Aggregates the values in a collection based on a specified operation.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Data/Type/Transformation/FloatAdder.cs
Expand Up @@ -2,7 +2,7 @@
{
using UnityEngine.Events;
using System;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Sums up a collection of <see cref="float"/>s.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Data/Type/Transformation/FloatMultiplier.cs
Expand Up @@ -2,7 +2,7 @@
{
using UnityEngine.Events;
using System;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Multiplies a collection of <see cref="float"/>s by multiplying each one to the next entry in the collection.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Data/Type/Transformation/Vector2Multiplier.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine;
using UnityEngine.Events;
using System;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Multiplies a collection of <see cref="Vector2"/>s by multiplying each one to the next entry in the collection.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Data/Type/Transformation/Vector3Multiplier.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine;
using UnityEngine.Events;
using System;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Multiplies a collection of <see cref="Vector3"/>s by multiplying each one to the next entry in the collection.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Data/Type/Transformation/Vector3Subtractor.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine;
using UnityEngine.Events;
using System;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Subtracts a collection of <see cref="Vector3"/>s by subtracting each one from the first entry in the collection.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Event/BehaviourEnabledObserver.cs
Expand Up @@ -6,7 +6,7 @@
using Malimbe.MemberChangeMethod;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Emits an event once a list of <see cref="Behaviour"/>s all are <see cref="Behaviour.isActiveAndEnabled"/>.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Haptics/Collection/HapticProcessObservableList.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="HapticProcess"/>s.
Expand Down
Expand Up @@ -7,7 +7,7 @@
using Malimbe.BehaviourStateRequirementMethod;
using Zinnia.Rule;
using Zinnia.Extension;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

public abstract class GameObjectSourceTargetProcessor : SourceTargetProcessor<GameObject, GameObject>
{
Expand Down
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="MomentProcess"/>s.
Expand Down
4 changes: 2 additions & 2 deletions Runtime/Rule/AnyComponentTypeRule.cs
Expand Up @@ -3,9 +3,9 @@
using UnityEngine;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Type;
using Zinnia.Data.Collection;
using Zinnia.Extension;
using Zinnia.Data.Type;
using Zinnia.Data.Collection.List;

/// <summary>
/// Determines whether a <see cref="GameObject"/> has any component found in a list.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Rule/AnyTagRule.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Determines whether a <see cref="GameObject"/>'s <see cref="GameObject.tag"/> is part of a list.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Rule/Collection/RuleContainerObservableList.cs
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="RuleContainer"/>s.
Expand Down
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="RulesMatcher.Element"/>s.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Rule/ListContainsRule.cs
Expand Up @@ -4,7 +4,7 @@
using Malimbe.XmlDocumentationAttribute;
using Malimbe.BehaviourStateRequirementMethod;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Determines whether an object is part of a list.
Expand Down
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="LinkedAliasAssociationCollection"/>s.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Tracking/Collision/CollisionIgnorer.cs
Expand Up @@ -5,7 +5,7 @@
using Malimbe.MemberChangeMethod;
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Ignores the collisions between the source <see cref="GameObject"/> colliders and the target <see cref="GameObject"/> colliders.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Tracking/Follow/ObjectFollower.cs
Expand Up @@ -8,8 +8,8 @@
using Malimbe.PropertySerializationAttribute;
using Malimbe.BehaviourStateRequirementMethod;
using Zinnia.Extension;
using Zinnia.Data.Collection;
using Zinnia.Process.Component;
using Zinnia.Data.Collection.List;
using Zinnia.Tracking.Follow.Modifier;

/// <summary>
Expand Down
Expand Up @@ -6,7 +6,7 @@
using Malimbe.PropertySerializationAttribute;
using Malimbe.BehaviourStateRequirementMethod;
using Zinnia.Data.Type;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Provides the ability to modify the enabled state of a <see cref="Behaviour"/> or <see cref="Renderer"/> component.
Expand Down
2 changes: 1 addition & 1 deletion Runtime/Tracking/Modification/GameObjectStateSwitcher.cs
Expand Up @@ -4,7 +4,7 @@
using Malimbe.XmlDocumentationAttribute;
using Malimbe.PropertySerializationAttribute;
using Malimbe.BehaviourStateRequirementMethod;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Sets the state of the current target to the specified active state.
Expand Down
Expand Up @@ -3,7 +3,7 @@
using UnityEngine.Events;
using System;
using System.Collections.Generic;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

/// <summary>
/// Allows observing changes to a <see cref="List{T}"/> of <see cref="VelocityTracker"/>s.
Expand Down
2 changes: 1 addition & 1 deletion Tests/Editor/Action/ActionRegistrarTest.cs
@@ -1,6 +1,6 @@
using Zinnia.Action;
using Zinnia.Action.Collection;
using Zinnia.Data.Collection;
using Zinnia.Data.Collection.List;

namespace Test.Zinnia.Action
{
Expand Down

0 comments on commit e9d6d10

Please sign in to comment.