diff --git a/Svelto.ECS/CheckEntityUtilities.cs b/Svelto.ECS/CheckEntityUtilities.cs index 60e727f..f61b424 100644 --- a/Svelto.ECS/CheckEntityUtilities.cs +++ b/Svelto.ECS/CheckEntityUtilities.cs @@ -28,7 +28,7 @@ namespace Svelto.ECS } else { - Utilities.Console.LogError("Entity ".FastConcat(" with not found ID is about to be removed: ") + Console.LogError("Entity ".FastConcat(" with not found ID is about to be removed: ") .FastConcat(" id: ") .FastConcat(entityID.entityID) .FastConcat(" groupid: ") @@ -46,7 +46,7 @@ namespace Svelto.ECS { if (entities.Has(entityID.entityID) == false) { - Utilities.Console.LogError("Entity ".FastConcat(name, " with not found ID is about to be removed: ") + Console.LogError("Entity ".FastConcat(name, " with not found ID is about to be removed: ") .FastConcat(entityType) .FastConcat(" id: ") .FastConcat(entityID.entityID) @@ -56,7 +56,7 @@ namespace Svelto.ECS } else { - Utilities.Console.LogError("Entity ".FastConcat(name, " with not found ID is about to be removed: ") + Console.LogError("Entity ".FastConcat(name, " with not found ID is about to be removed: ") .FastConcat(entityType) .FastConcat(" id: ") .FastConcat(entityID.entityID) @@ -93,7 +93,7 @@ namespace Svelto.ECS { if (entities.Has(entityID.entityID) == true) { - Utilities.Console.LogError("Entity ".FastConcat(name, " with used ID is about to be built: ") + Console.LogError("Entity ".FastConcat(name, " with used ID is about to be built: ") .FastConcat(entityType) .FastConcat(" id: ") .FastConcat(entityID.entityID) diff --git a/Svelto.ECS/EnginesRoot.Engines.cs b/Svelto.ECS/EnginesRoot.Engines.cs index 67ef500..e26159f 100644 --- a/Svelto.ECS/EnginesRoot.Engines.cs +++ b/Svelto.ECS/EnginesRoot.Engines.cs @@ -69,7 +69,7 @@ namespace Svelto.ECS #if !DEBUG throw new ECSException("Code crashed while adding engine ".FastConcat(engine.GetType()), e); #else - Utilities.Console.LogException("Code crashed while adding engine ".FastConcat(engine.GetType()), e); + Console.LogException("Code crashed while adding engine ".FastConcat(engine.GetType()), e); #endif } } diff --git a/Svelto.ECS/EnginesRoot.Entities.cs b/Svelto.ECS/EnginesRoot.Entities.cs index 810aa73..2358edb 100644 --- a/Svelto.ECS/EnginesRoot.Entities.cs +++ b/Svelto.ECS/EnginesRoot.Entities.cs @@ -27,7 +27,7 @@ namespace Svelto.ECS } catch (Exception e) { - Utilities.Console.LogException(e); + Console.LogException(e); } } @@ -38,7 +38,7 @@ namespace Svelto.ECS } catch (Exception e) { - Utilities.Console.LogException(e); + Console.LogException(e); } } @@ -47,7 +47,7 @@ namespace Svelto.ECS ~EnginesRoot() { - Utilities.Console.LogWarning("Engines Root has been garbage collected, don't forget to call Dispose()!"); + Console.LogWarning("Engines Root has been garbage collected, don't forget to call Dispose()!"); Dispose(); } @@ -158,16 +158,11 @@ namespace Svelto.ECS #if DEBUG && !PROFILER if (correctEntityDescriptorFound == false) #if RELAXED_ECS - Utilities.Console.LogError(INVALID_DYNAMIC_DESCRIPTOR_ERROR + Console.LogError(INVALID_DYNAMIC_DESCRIPTOR_ERROR .FastConcat(" ID ").FastConcat(entityGID.entityID) .FastConcat(" group ID ").FastConcat(entityGID.groupID).FastConcat( - " descriptor found: ", - entityInfoView - .type - .Name, - " descriptor Excepted ", - originalDescriptorType - .Name)); + " descriptor found: ", entityInfoView.type.Name, + " descriptor Excepted ", originalDescriptorType.Name)); #else throw new ECSException(INVALID_DYNAMIC_DESCRIPTOR_ERROR.FastConcat(" ID ").FastConcat(entityGID.entityID) .FastConcat(" group ID ").FastConcat(entityGID.groupID).FastConcat( diff --git a/Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs b/Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs index 0025a65..a68f575 100644 --- a/Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs +++ b/Svelto.ECS/EnginesRoot.GenericEntityFunctions.cs @@ -100,7 +100,7 @@ namespace Svelto.ECS entitySubmitOperation.trace = Environment.StackTrace; var egid = new EGID(entitySubmitOperation.ID, entitySubmitOperation.fromGroupID); if (_entitiesOperationsDebug.ContainsKey((long)egid) == true) - Utilities.Console.LogError("Only one entity operation per submission is allowed. Entity " + Console.LogError("Only one entity operation per submission is allowed. Entity " .FastConcat(" with not found ID is about to be removed: ") .FastConcat(" id: ") .FastConcat(entitySubmitOperation.ID) diff --git a/Svelto.ECS/EnginesRoot.Submission.cs b/Svelto.ECS/EnginesRoot.Submission.cs index 4d47349..36866af 100644 --- a/Svelto.ECS/EnginesRoot.Submission.cs +++ b/Svelto.ECS/EnginesRoot.Submission.cs @@ -5,7 +5,7 @@ using Svelto.DataStructures; using Svelto.DataStructures.Experimental; using Svelto.ECS.Internal; using Svelto.ECS.Schedulers; -using Console = Svelto.Utilities.Console; +using Console = Svelto.Console; namespace Svelto.ECS { diff --git a/Svelto.ECS/EntityBuilder.CheckFields.cs b/Svelto.ECS/EntityBuilder.CheckFields.cs index 093671a..7f151f2 100644 --- a/Svelto.ECS/EntityBuilder.CheckFields.cs +++ b/Svelto.ECS/EntityBuilder.CheckFields.cs @@ -108,10 +108,6 @@ namespace Svelto.ECS { #if !RELAXED_ECS throw new EntityStructException(message, ENTITY_VIEW_TYPE, type); -#else - Utilities.Console.LogError("Invalid entity view detected - EntityViews must handle only value types and have " + - "no public methods! EntityView ".FastConcat(ENTITY_VIEW_NAME).FastConcat( - " invalid field: ", type.ToString())); #endif } diff --git a/Svelto.ECS/EntityViewUtility.cs b/Svelto.ECS/EntityViewUtility.cs index 71dff37..9d710e8 100644 --- a/Svelto.ECS/EntityViewUtility.cs +++ b/Svelto.ECS/EntityViewUtility.cs @@ -52,7 +52,7 @@ static class EntityViewUtility #if DEBUG && !PROFILER else { - Svelto.Utilities.Console.Log(NULL_IMPLEMENTOR_ERROR.FastConcat(" entityView ", + Svelto.Console.Log(NULL_IMPLEMENTOR_ERROR.FastConcat(" entityView ", entityBuilder.GetEntityType().ToString())); } #endif