Skip to content

Commit d311929

Browse files
committed
End of initial set of compiler changes - things now compile but we still need to update all of the asset files.
1 parent 75aedba commit d311929

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/InteractableEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class InteractableEvent
2323
public string Name;
2424
public UnityEvent Event;
2525
public string ClassName;
26-
public string AssemblyQualfiedName;
26+
public string AssemblyQualifiedName;
2727
public ReceiverBase Receiver;
2828
public List<InspectorPropertySetting> Settings;
2929
public bool HideUnityEvents;

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableType.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypeFinder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static InteractableTypesContainer Find(List<Type> types, TypeRestriction
5151
// Due to other code structure, it's possible that this can still be invoked at runtime, but should
5252
// not return anything (because type information should be read from serialized assembly data, rather
5353
// than using reflection at runtime).
54-
return new InteractableTypeList(new List<InteractableType>());
54+
return new InteractableTypesContainer(new List<InteractableType>());
5555
#endif
5656
}
5757

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/TypeResolution/InteractableTypeFinder.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/InteractableInspector.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,12 +675,14 @@ protected void ChangeEvent(int[] indexArray, SerializedProperty prop = null)
675675
SerializedProperty name = prop.FindPropertyRelative("Name");
676676
SerializedProperty settings = prop.FindPropertyRelative("Settings");
677677
SerializedProperty hideEvents = prop.FindPropertyRelative("HideUnityEvents");
678+
SerializedProperty assemblyQualifiedName = prop.FindPropertyRelative("AssemblyQualifiedName");
678679

679680
if (!String.IsNullOrEmpty(className.stringValue))
680681
{
681-
InteractableEvent.ReceiverData data = eventList[indexArray[0]].AddReceiver(eventTypes[indexArray[1]]);
682+
InteractableEvent.ReceiverData data = eventList[indexArray[0]].AddReceiver(eventOptions.Types[indexArray[1]]);
682683
name.stringValue = data.Name;
683684
hideEvents.boolValue = data.HideUnityEvents;
685+
assemblyQualifiedName.stringValue = eventOptions.AssemblyQualifiedNames[indexArray[1]];
684686

685687
InspectorFieldsUtility.PropertySettingsList(settings, data.Fields);
686688
}

0 commit comments

Comments
 (0)