Browse Source

better class names

tags/Rel25b
sebas77 6 years ago
parent
commit
4233f20e6f
8 changed files with 20 additions and 20 deletions
  1. +1
    -1
      Svelto.ECS/EGID.cs
  2. +1
    -1
      Svelto.ECS/EnginesRoot.Engines.cs
  3. +4
    -4
      Svelto.ECS/EnginesRoot.GenericEntityFactory.cs
  4. +2
    -2
      Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs
  5. +2
    -2
      Svelto.ECS/EntitiesDB.cs
  6. +4
    -4
      Svelto.ECS/ExclusiveGroups.cs
  7. +3
    -3
      Svelto.ECS/IEntityFactory.cs
  8. +3
    -3
      Svelto.ECS/IEntityFunctions.cs

+ 1
- 1
Svelto.ECS/EGID.cs View File

@@ -28,7 +28,7 @@ namespace Svelto.ECS
public EGID(int entityID) : this()
{
_GID = MAKE_GLOBAL_ID(entityID, ExclusiveGroups.StandardEntity);
_GID = MAKE_GLOBAL_ID(entityID, ExclusiveGroup.StandardEntitiesGroup);
}

static long MAKE_GLOBAL_ID(int entityId, int groupId)


+ 1
- 1
Svelto.ECS/EnginesRoot.Engines.cs View File

@@ -39,7 +39,7 @@ namespace Svelto.ECS
_otherEngines = new FasterList<IEngine>();

_groupEntityDB = new Dictionary<int, Dictionary<Type, ITypeSafeDictionary>>();
_groupEntityDB[ExclusiveGroups.StandardEntity] = new Dictionary<Type, ITypeSafeDictionary>();
_groupEntityDB[ExclusiveGroup.StandardEntitiesGroup] = new Dictionary<Type, ITypeSafeDictionary>();
_groupedEntityToAdd = new DoubleBufferedEntityViews<Dictionary<int, Dictionary<Type, ITypeSafeDictionary>>>();



+ 4
- 4
Svelto.ECS/EnginesRoot.GenericEntityFactory.cs View File

@@ -20,7 +20,7 @@ namespace Svelto.ECS
return _weakEngine.Target.BuildEntity<T>(new EGID(entityID), implementors);
}

public EntityStructInitializer BuildEntity<T>(int entityID, ExclusiveGroups groupID, object[] implementors) where T : IEntityDescriptor, new()
public EntityStructInitializer BuildEntity<T>(int entityID, ExclusiveGroup groupID, object[] implementors) where T : IEntityDescriptor, new()
{
return _weakEngine.Target.BuildEntity<T>(new EGID(entityID, (int)groupID), implementors);
}
@@ -40,17 +40,17 @@ namespace Svelto.ECS
return _weakEngine.Target.BuildEntity(egid, entityToBuild, implementors);
}

public EntityStructInitializer BuildEntity(int entityID, ExclusiveGroups groupID, IEntityBuilder[] entityToBuild, object[] implementors)
public EntityStructInitializer BuildEntity(int entityID, ExclusiveGroup groupID, IEntityBuilder[] entityToBuild, object[] implementors)
{
return _weakEngine.Target.BuildEntity(new EGID(entityID, (int)groupID), entityToBuild, implementors);
}
public void PreallocateEntitySpace<T>(int size) where T : IEntityDescriptor, new()
{
_weakEngine.Target.Preallocate<T>(ExclusiveGroups.StandardEntity, size);
_weakEngine.Target.Preallocate<T>(ExclusiveGroup.StandardEntitiesGroup, size);
}
public void PreallocateEntitySpace<T>(ExclusiveGroups groupID, int size) where T : IEntityDescriptor, new()
public void PreallocateEntitySpace<T>(ExclusiveGroup groupID, int size) where T : IEntityDescriptor, new()
{
_weakEngine.Target.Preallocate<T>((int)groupID, size);
}


+ 2
- 2
Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs View File

@@ -42,14 +42,14 @@ namespace Svelto.ECS
_weakReference.Target.SwapEntityGroup(entityID, fromGroupID, toGroupID);
}

public void SwapEntityGroup(EGID id, int toGroupID = ExclusiveGroups.StandardEntity)
public void SwapEntityGroup(EGID id, int toGroupID = ExclusiveGroup.StandardEntitiesGroup)
{
_weakReference.Target.SwapEntityGroup(id.entityID, id.groupID, toGroupID);
}

public void SwapEntityGroup(int entityID, int toGroupID)
{
_weakReference.Target.SwapEntityGroup(entityID, ExclusiveGroups.StandardEntity, toGroupID);
_weakReference.Target.SwapEntityGroup(entityID, ExclusiveGroup.StandardEntitiesGroup, toGroupID);
}

public EGID SwapFirstEntityGroup(int fromGroupID, int toGroupID)


+ 2
- 2
Svelto.ECS/EntitiesDB.cs View File

@@ -14,7 +14,7 @@ namespace Svelto.ECS.Internal

public ReadOnlyCollectionStruct<T> QueryEntityViews<T>() where T:class, IEntityStruct
{
return QueryEntityViews<T>(ExclusiveGroups.StandardEntity);
return QueryEntityViews<T>(ExclusiveGroup.StandardEntitiesGroup);
}

public ReadOnlyCollectionStruct<T> QueryEntityViews<T>(int @group) where T:class, IEntityStruct
@@ -33,7 +33,7 @@ namespace Svelto.ECS.Internal

public T[] QueryEntities<T>(out int count) where T : IEntityStruct
{
return QueryEntities<T>(ExclusiveGroups.StandardEntity, out count);
return QueryEntities<T>(ExclusiveGroup.StandardEntitiesGroup, out count);
}
public T[] QueryEntities<T>(int @group, out int count) where T : IEntityStruct


+ 4
- 4
Svelto.ECS/ExclusiveGroups.cs View File

@@ -1,15 +1,15 @@
namespace Svelto.ECS
{
public class ExclusiveGroups
public class ExclusiveGroup
{
internal const int StandardEntity = int.MaxValue;
internal const int StandardEntitiesGroup = int.MaxValue;

public ExclusiveGroups()
public ExclusiveGroup()
{
_id = _globalId++;
}
public static explicit operator int(ExclusiveGroups group) // explicit byte to digit conversion operator
public static explicit operator int(ExclusiveGroup group) // explicit byte to digit conversion operator
{
return group._id;
}


+ 3
- 3
Svelto.ECS/IEntityFactory.cs View File

@@ -23,7 +23,7 @@ namespace Svelto.ECS
/// <typeparam name="T"></typeparam>
/// <param name="size"></param>
void PreallocateEntitySpace<T>(int size) where T : IEntityDescriptor, new();
void PreallocateEntitySpace<T>(ExclusiveGroups groupID, int size) where T : IEntityDescriptor, new();
void PreallocateEntitySpace<T>(ExclusiveGroup groupID, int size) where T : IEntityDescriptor, new();
/// <summary>
/// The EntityDescriptor doesn't need to be ever instantiated. It just describes the Entity
@@ -47,7 +47,7 @@ namespace Svelto.ECS
/// <param name="groupID"></param>
/// <param name="ed"></param>
/// <param name="implementors"></param>
EntityStructInitializer BuildEntity<T>(int entityID, ExclusiveGroups groupID, object[] implementors) where T:IEntityDescriptor, new();
EntityStructInitializer BuildEntity<T>(int entityID, ExclusiveGroup groupID, object[] implementors) where T:IEntityDescriptor, new();
EntityStructInitializer BuildEntity<T>(EGID egid, object[] implementors) where T:IEntityDescriptor, new();

@@ -59,7 +59,7 @@ namespace Svelto.ECS
/// <param name="entityDescriptor"></param>
/// <param name="implementors"></param>
///
EntityStructInitializer BuildEntity(int entityID, ExclusiveGroups groupID, IEntityBuilder[] entityToBuild, object[] implementors);
EntityStructInitializer BuildEntity(int entityID, ExclusiveGroup groupID, IEntityBuilder[] entityToBuild, object[] implementors);
EntityStructInitializer BuildEntity(int entityID, IEntityBuilder[] entityToBuild, object[] implementors);
EntityStructInitializer BuildEntity(EGID egid, IEntityBuilder[] entityToBuild, object[] implementors);
}


+ 3
- 3
Svelto.ECS/IEntityFunctions.cs View File

@@ -13,9 +13,9 @@ namespace Svelto.ECS

void RemoveGroupAndEntities(int groupID);
void SwapEntityGroup(int entityID, int fromGroupID, int toGroupID = ExclusiveGroups.StandardEntity);
void SwapEntityGroup(EGID id, int toGroupID = ExclusiveGroups.StandardEntity);
void SwapEntityGroup(int entityID, int fromGroupID, int toGroupID = ExclusiveGroup.StandardEntitiesGroup);
void SwapEntityGroup(EGID id, int toGroupID = ExclusiveGroup.StandardEntitiesGroup);
void SwapEntityGroup(int entityID, int toGroupID);
EGID SwapFirstEntityGroup(int fromGroupID = ExclusiveGroups.StandardEntity, int toGroupID = ExclusiveGroups.StandardEntity);
EGID SwapFirstEntityGroup(int fromGroupID = ExclusiveGroup.StandardEntitiesGroup, int toGroupID = ExclusiveGroup.StandardEntitiesGroup);
}
}

Loading…
Cancel
Save