Added Reset()s and Initialize()s made public in Factories + Fix & Upgrades
This commit is contained in:
parent
785f6be5b9
commit
c54605a967
|
@ -6,7 +6,7 @@ namespace Syntriax.Modules.Movement.Config
|
||||||
{
|
{
|
||||||
public class MovementDefinitionFactory : MonoBehaviour
|
public class MovementDefinitionFactory : MonoBehaviour
|
||||||
{
|
{
|
||||||
private const string Name = "Movement Definer Factory";
|
private const string Name = "Movement Definition Factory";
|
||||||
private const int InitialCapacity = 64;
|
private const int InitialCapacity = 64;
|
||||||
private const string ResourceDirectoryToDefinitions = "Modules/Syntriax/Movement/Definitions/";
|
private const string ResourceDirectoryToDefinitions = "Modules/Syntriax/Movement/Definitions/";
|
||||||
|
|
||||||
|
@ -42,27 +42,32 @@ namespace Syntriax.Modules.Movement.Config
|
||||||
Destroy(this);
|
Destroy(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
_definitions = new Dictionary<string, MovementDefinition>(InitialCapacity);
|
if (_definitions == null)
|
||||||
|
_definitions = new Dictionary<string, MovementDefinition>(InitialCapacity);
|
||||||
|
|
||||||
|
Reset();
|
||||||
|
|
||||||
foreach (TextAsset definitionTextAsset in UnityEngine.Resources.LoadAll<TextAsset>(ResourceDirectoryToDefinitions))
|
foreach (TextAsset definitionTextAsset in UnityEngine.Resources.LoadAll<TextAsset>(ResourceDirectoryToDefinitions))
|
||||||
{
|
{
|
||||||
MovementDefinition movementDefinition = JsonUtility.FromJson<MovementDefinition>(definitionTextAsset.text);
|
MovementDefinition movementDefinition = JsonUtility.FromJson<MovementDefinition>(definitionTextAsset.text);
|
||||||
AddDefinerToFactory(movementDefinition);
|
AddDefinitionToFactory(movementDefinition);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddDefinersToFactory(List<MovementDefinition> movementDefinitions)
|
public void Reset() => _definitions?.Clear();
|
||||||
|
|
||||||
|
public void AddDefinitionsToFactory(List<MovementDefinition> movementDefinitions)
|
||||||
{
|
{
|
||||||
foreach (MovementDefinition movementDefinition in movementDefinitions)
|
foreach (MovementDefinition movementDefinition in movementDefinitions)
|
||||||
AddDefinerToFactory(movementDefinition);
|
AddDefinitionToFactory(movementDefinition);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddDefinerToFactory(MovementDefinition movementDefinition)
|
public void AddDefinitionToFactory(MovementDefinition movementDefinition)
|
||||||
{
|
{
|
||||||
if (Definitions.ContainsKey(movementDefinition.Name))
|
if (Definitions.ContainsKey(movementDefinition.Name))
|
||||||
throw new System.ArgumentException($"{ movementDefinition.Name } is already in the Movement Definer Factory");
|
throw new System.ArgumentException($"{ movementDefinition.Name } is already in the Movement Definition Factory");
|
||||||
|
|
||||||
Definitions.Add(movementDefinition.Name, movementDefinition);
|
Definitions.Add(movementDefinition.Name, movementDefinition);
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,14 +45,19 @@ namespace Syntriax.Modules.Movement.Config
|
||||||
Destroy(this);
|
Destroy(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
_types = new Dictionary<string, Type>(InitialCapacity);
|
if (_types == null)
|
||||||
|
_types = new Dictionary<string, Type>(InitialCapacity);
|
||||||
|
|
||||||
|
Reset();
|
||||||
|
|
||||||
foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
|
foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
|
||||||
AddAssemblyToFactory(assembly);
|
AddAssemblyToFactory(assembly);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Reset() => _types?.Clear();
|
||||||
|
|
||||||
public void AddAssemblyToFactory(Assembly assembly)
|
public void AddAssemblyToFactory(Assembly assembly)
|
||||||
{
|
{
|
||||||
foreach (Type type in assembly.GetTypes().Where(predicate))
|
foreach (Type type in assembly.GetTypes().Where(predicate))
|
||||||
|
|
|
@ -45,9 +45,12 @@ namespace Syntriax.Modules.Movement.Config
|
||||||
Destroy(this);
|
Destroy(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Initialize()
|
public void Initialize()
|
||||||
{
|
{
|
||||||
_collections = new Dictionary<string, VMCollection>(InitialCapacity);
|
if (_collections == null)
|
||||||
|
_collections = new Dictionary<string, VMCollection>(InitialCapacity);
|
||||||
|
|
||||||
|
Reset();
|
||||||
|
|
||||||
foreach (TextAsset definitionTextAsset in UnityEngine.Resources.LoadAll<TextAsset>(ResourceDirectoryToCollections))
|
foreach (TextAsset definitionTextAsset in UnityEngine.Resources.LoadAll<TextAsset>(ResourceDirectoryToCollections))
|
||||||
{
|
{
|
||||||
|
@ -56,6 +59,8 @@ namespace Syntriax.Modules.Movement.Config
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Reset() => _collections?.Clear();
|
||||||
|
|
||||||
public void AddCollectionsToFactory(List<VMCollection> collections)
|
public void AddCollectionsToFactory(List<VMCollection> collections)
|
||||||
{
|
{
|
||||||
foreach (VMCollection collection in collections)
|
foreach (VMCollection collection in collections)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "Movement",
|
"name": "Syntriax.Modules.Movement",
|
||||||
"rootNamespace": "",
|
"rootNamespace": "",
|
||||||
"references": [
|
"references": [
|
||||||
"GUID:75469ad4d38634e559750d17036d5f7c"
|
"GUID:75469ad4d38634e559750d17036d5f7c"
|
Loading…
Reference in New Issue