Skip to content

set custom prefix of generated field #4

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

Merged
merged 1 commit into from
Mar 14, 2021
Merged

set custom prefix of generated field #4

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions Assets/Sample/MyMonoBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ public class MyMonoBehavior : MonoBehaviour
{
[GenericSerializeReference]
public IMyInterface<int> Value { get; set; }

[GenericSerializeReference("_serialized")]
public IMyInterface<int> Foo { get; set; }
private int __Foo;
}
38 changes: 21 additions & 17 deletions Assets/Sample/Test.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3a000e60ca5341d5a1f7805ac73274e1, type: 3}
m_Name:
m_EditorClassIdentifier:
_IntFloat:
__IntFloat:
id: 0
_FloatInt:
__FloatInt:
id: 1
_IntInt:
__IntInt:
id: 2
_Int:
__Int:
id: 3
_Double:
__Double:
id: 4
_IntObject:
__IntObject:
id: 5
_IntIntObject:
__IntIntObject:
id: 6
references:
version: 1
Expand All @@ -174,23 +174,22 @@ MonoBehaviour:
data:
V: 0
00000001:
type: {class: TestMonoBehavior/<FloatInt>__generic_serialize_reference/NonGeneric, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
type: {class: TestMonoBehavior/<FloatInt>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
data:
ValueT: 0
ValueU: 0
ValueDouble: 0
SubValueT: []
SubValueU:
00000002:
type: {class: TestMonoBehavior/<IntInt>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
type: {class: TestMonoBehavior/<IntInt>__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
data:
ValueT: 0
ValueU: 0
SubValueT:
SubValueU:
ValueDouble: 0
00000003:
type: {class: TestMonoBehavior/<Int>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
type: {class: TestMonoBehavior/<Int>__generic_serialize_reference/Object, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
data:
Value: 0
SubValue:
00000004:
type: {class: TestMonoBehavior/<Double>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
data:
Expand All @@ -202,11 +201,12 @@ MonoBehaviour:
Value: 0
SubValue:
00000006:
type: {class: TestMonoBehavior/<IntIntObject>__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
type: {class: TestMonoBehavior/<IntIntObject>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
data:
ValueT: 0
ValueU: 0
ValueDouble: 0
SubValueT:
SubValueU:
--- !u!4 &366887100
Transform:
m_ObjectHideFlags: 0
Expand All @@ -233,9 +233,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 810f573826344204a49b76ad339a67e3, type: 3}
m_Name:
m_EditorClassIdentifier:
_Value:
__Value:
id: 0
_serializedFoo:
id: 1
references:
version: 1
00000000:
type: {class: MyMonoBehavior/<Value>__generic_serialize_reference/MyIntObject, ns: , asm: GenericSerializeReference.Sample}
00000001:
type: {class: MyMonoBehavior/<Foo>__generic_serialize_reference/MyIntObject, ns: , asm: GenericSerializeReference.Sample}
2 changes: 1 addition & 1 deletion Assets/Sample/TestSO.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 12c1653695b84d9489cbf7948c3d8d27, type: 3}
m_Name: TestSO
m_EditorClassIdentifier:
_IntFloat:
__IntFloat:
id: 0
references:
version: 1
Expand Down
7 changes: 4 additions & 3 deletions Packages/generic-serialize-reference/Editor/GenericSerializeReferencePostProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ from attribute in GetAttributesOf<GenericSerializeReferenceAttribute>(property)

var serializedFieldInterface = CreateWrapperClass(property);
logger.Info($"generate nested class with interface {serializedFieldInterface.FullName}");
var serializedField = CreateSerializeReferenceField(property, serializedFieldInterface);
var fieldNamePrefix = (string)attribute.ConstructorArguments[0].Value;
var serializedField = CreateSerializeReferenceField(property, serializedFieldInterface, fieldNamePrefix);
InjectGetter(property, serializedField);
InjectSetter(property, serializedField);
modified = true;
Expand Down Expand Up @@ -135,13 +136,13 @@ void InjectSetter(PropertyDefinition property, FieldDefinition serializedField)
instructions.Insert(retIndex + 2, Instruction.Create(OpCodes.Stfld, serializedField));
}

FieldDefinition CreateSerializeReferenceField(PropertyDefinition property, TypeReference @interface)
FieldDefinition CreateSerializeReferenceField(PropertyDefinition property, TypeReference @interface, string namePrefix)
{
//.field private class GenericSerializeReference.Tests.TestMonoBehavior/__generic_serialize_reference_GenericInterface__/IBase _GenericInterface
// .custom instance void [UnityEngine.CoreModule]UnityEngine.SerializeReference::.ctor()
// = (01 00 00 00 )
var serializedField = new FieldDefinition(
$"_{property.Name}"
$"{namePrefix}{property.Name}"
, FieldAttributes.Private
, @interface
);
Expand Down
4 changes: 3 additions & 1 deletion Packages/generic-serialize-reference/Runtime/GenericSerializeReferenceAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ namespace GenericSerializeReference
[AttributeUsage(AttributeTargets.Property)]
public class GenericSerializeReferenceAttribute : Attribute
{
public string SerializedFieldPrefix = "_";
public string SerializedFieldPrefix { get; }
public GenericSerializeReferenceAttribute(string serializedFieldPrefix = "__") =>
SerializedFieldPrefix = serializedFieldPrefix;
}
}
2 changes: 1 addition & 1 deletion Packages/generic-serialize-reference/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.quabug.generic-serialize-reference",
"description": "Automatically alter generic field of SerializeReference into its non-generic form",
"version": "1.0.1",
"version": "1.1.0",
"unity": "2020.2",
"displayName": "GenericSerializeReference",
"samples": [
Expand Down