AlicizaX/DragonECS-AutoInjections
1
0
Fork 0
mirror of https://github.com/DCFApixels/DragonECS-AutoInjections.git synced 2025-09-19 14:24:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Mikhail 2023-06-04 19:42:46 +08:00
parent f4ef2fc284
commit 7d55cf82e4
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Attributes/QueryAttributes.cs → src/Attributes/SubjectAttributes.cs
View File

@ -11,7 +11,6 @@ namespace DCFApixels.DragonECS
[AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)] [AttributeUsage(AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
public sealed class OptAttribute : InjectAttribute { } public sealed class OptAttribute : InjectAttribute { }
public abstract class ImplicitInjectAttribute : Attribute { } public abstract class ImplicitInjectAttribute : Attribute { }
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Class, Inherited = false, AllowMultiple = true)] [AttributeUsage(AttributeTargets.Field | AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
public sealed class IncImplicitAttribute : ImplicitInjectAttribute public sealed class IncImplicitAttribute : ImplicitInjectAttribute
@ -21,16 +20,8 @@ namespace DCFApixels.DragonECS
public IncImplicitAttribute(Type type) public IncImplicitAttribute(Type type)
{ {
if (type.IsValueType && !type.IsPrimitive)
{
isPool = false;
this.type = type; this.type = type;
return; isPool = type.GetInterfaces().Any(o => o == typeof(IEcsPoolImplementation));
}
if (!type.GetInterfaces().Any(o => o == typeof(IEcsPoolImplementation)))
throw new ArgumentException("Можно использовать только пулы наследованные от IEcsPoolImplementation<T>");
this.type = type;
isPool = true;
} }
} }
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Class, Inherited = false, AllowMultiple = true)] [AttributeUsage(AttributeTargets.Field | AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
@ -40,16 +31,8 @@ namespace DCFApixels.DragonECS
public readonly bool isPool; public readonly bool isPool;
public ExcImplicitAttribute(Type type) public ExcImplicitAttribute(Type type)
{ {
if (type.IsValueType && !type.IsPrimitive)
{
isPool = false;
this.type = type; this.type = type;
return; isPool = type.GetInterfaces().Any(o => o == typeof(IEcsPoolImplementation));
}
if (!type.GetInterfaces().Any(o => o == typeof(IEcsPoolImplementation)))
throw new ArgumentException("Можно использовать только пулы наследованные от IEcsPoolImplementation<T>");
this.type = type;
isPool = true;
} }
} }
} }

2
src/Subject/EcsSubjectDI.cs
View File

@ -20,9 +20,9 @@ namespace DCFApixels.DragonECS
Type builderType = b.GetType(); Type builderType = b.GetType();
MethodInfo incluedMethod = builderType.GetMethod("Include", BindingFlags.Instance | BindingFlags.Public); MethodInfo incluedMethod = builderType.GetMethod("Include", BindingFlags.Instance | BindingFlags.Public);
MethodInfo excludeMethod = builderType.GetMethod("Exclude", BindingFlags.Instance | BindingFlags.Public); MethodInfo excludeMethod = builderType.GetMethod("Exclude", BindingFlags.Instance | BindingFlags.Public);
MethodInfo optionalMethod = builderType.GetMethod("Optional", BindingFlags.Instance | BindingFlags.Public);
MethodInfo includeImplicitMethod = builderType.GetMethod("IncludeImplicit", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); MethodInfo includeImplicitMethod = builderType.GetMethod("IncludeImplicit", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
MethodInfo excludeImplicitMethod = builderType.GetMethod("ExcludeImplicit", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); MethodInfo excludeImplicitMethod = builderType.GetMethod("ExcludeImplicit", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
MethodInfo optionalMethod = builderType.GetMethod("Optional", BindingFlags.Instance | BindingFlags.Public);
Type subjectType = s.GetType(); Type subjectType = s.GetType();