Skip to content

Improvements and bug fixes to MonoTempGenerator. #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improvements and bug fixes to MonoTempGenerator. #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 23 additions & 36 deletions AssetsTools.NET.MonoCecil/MonoCecilTempGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Mono.Cecil;
using System.Collections.Generic;
using Mono.Cecil.Rocks;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Mono.Cecil;
using System.IO;

namespace AssetsTools.NET.Extra
{
Expand Down Expand Up @@ -68,7 +67,7 @@ public List<AssetTypeTemplateField> Read(AssemblyDefinition assembly, string nam
return children;
}

private AssemblyDefinition GetAssemblyWithDependencies(string path)
public AssemblyDefinition GetAssemblyWithDependencies(string path)
{
string assemblyName = Path.GetFileName(path);
if (loadedAssemblies.ContainsKey(assemblyName))
Expand Down Expand Up @@ -114,17 +113,18 @@ private void RecursiveTypeLoad(ModuleDefinition module, string nameSpace, string
typeRef = new TypeReference(nameSpace, typeName, module, module);
type = typeRef.Resolve();
}


if (type is null) { return; }

RecursiveTypeLoad(type, attf, availableDepth, true);
}

private void RecursiveTypeLoad(TypeDefWithSelfRef type, List<AssetTypeTemplateField> attf, int availableDepth, bool isRecursiveCall = false)
{
if (!isRecursiveCall)
{
availableDepth--;
}
if (!isRecursiveCall) { availableDepth--; }

if (type.typeDef.BaseType is null) { return; }

string baseName = type.typeDef.BaseType.FullName;
if (baseName != "System.Object" &&
baseName != "UnityEngine.Object" &&
Expand All @@ -151,6 +151,7 @@ private List<AssetTypeTemplateField> ReadTypes(TypeDefWithSelfRef type, int avai

bool isArrayOrList = false;
bool isPrimitive = false;
bool isString = false;
bool derivesFromUEObject = false;
bool isManagedReference = false;

Expand All @@ -172,74 +173,60 @@ private List<AssetTypeTemplateField> ReadTypes(TypeDefWithSelfRef type, int avai
field.Type = CommonMonoTemplateHelper.ConvertBaseToPrimitive(enumType);
}
else if (isPrimitive = fieldTypeDef.typeDef.IsPrimitive)
{
field.Type = CommonMonoTemplateHelper.ConvertBaseToPrimitive(fieldTypeDef.typeDef.FullName);
}

else if (fieldTypeDef.typeDef.FullName == "System.String")
{
isString = true;
field.Type = "string";
}

else if (derivesFromUEObject = DerivesFromUEObject(fieldTypeDef))
{
field.Type = $"PPtr<${fieldTypeDef.typeDef.Name}>";
}

else if (isManagedReference = fieldDef.CustomAttributes.Any(a => a.AttributeType.Name == "SerializeReference"))
{
anyFieldIsManagedReference = true;
field.Type = "managedReference";
}
else
{
field.Type = fieldTypeDef.typeDef.Name;
}

if (isPrimitive)
{
field.Children = new List<AssetTypeTemplateField>();
}

else if (fieldTypeDef.typeDef.FullName == "System.String")
{
field.Children = CommonMonoTemplateHelper.String();
}

else if (CommonMonoTemplateHelper.IsSpecialUnityType(fieldTypeDef.typeDef.FullName))
{
field.Children = SpecialUnity(fieldTypeDef, availableDepth);
}

else if (derivesFromUEObject)
{
field.Children = CommonMonoTemplateHelper.PPtr(unityVersion);
}

else if (isManagedReference)
{
field.Children = CommonMonoTemplateHelper.ManagedReference(unityVersion);
}
else if (fieldTypeDef.typeDef.IsSerializable)
{
field.Children = Serialized(fieldTypeDef, availableDepth);
}

field.ValueType = AssetTypeValueField.GetValueTypeByTypeName(field.Type);
field.IsAligned = CommonMonoTemplateHelper.TypeAligns(field.ValueType);
field.HasValue = field.ValueType != AssetValueType.None;

if (isArrayOrList)
{
if (isPrimitive || derivesFromUEObject)
{
if (isString || isPrimitive || derivesFromUEObject)
field = CommonMonoTemplateHelper.Vector(field);
}

else
{
field = CommonMonoTemplateHelper.VectorWithType(field);
}
}
localChildren.Add(field);
}

if (anyFieldIsManagedReference && DerivesFromUEObject(type))
{
localChildren.Add(CommonMonoTemplateHelper.ManagedReferencesRegistry("references", unityVersion));
}

return localChildren;
}
Expand Down Expand Up @@ -278,7 +265,7 @@ private List<FieldDefinition> GetAcceptableFields(TypeDefWithSelfRef parentType,
}
// unity doesn't serialize a field of the same type as declaring type
// unless it inherits from UnityEngine.Object
else if (parentType.typeDef.FullName == solidifiedFieldType.typeDef.FullName && !DerivesFromUEObject(parentType))
else if (solidifiedFieldType.typeDef != null && parentType.typeDef.FullName == solidifiedFieldType.typeDef.FullName && !DerivesFromUEObject(parentType))
{
continue;
}
Expand Down