From 3f356c331c3a23c486985a001a731e25280b212e Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 10 Sep 2014 13:23:34 +0100 Subject: [PATCH] Fixed View prefabs settings overriding --- Assets/Example/Dialogs/ChooseDialog.prefab | Bin 4136 -> 42368 bytes Assets/Example/Dialogs/NarratorDialog.prefab | Bin 4136 -> 19704 bytes Assets/Example/Dialogs/SayDialog.prefab | Bin 4136 -> 20808 bytes Assets/Example/Scenes/Example.unity | Bin 126756 -> 128084 bytes Assets/Fungus/Animation/Commands.meta | 5 +++ .../Animation/{ => Commands}/SetAnimBool.cs | 0 .../{ => Commands}/SetAnimBool.cs.meta | 0 .../Animation/{ => Commands}/SetAnimFloat.cs | 0 .../{ => Commands}/SetAnimFloat.cs.meta | 0 .../{ => Commands}/SetAnimInteger.cs | 0 .../{ => Commands}/SetAnimInteger.cs.meta | 0 .../{ => Commands}/SetAnimTrigger.cs | 0 .../{ => Commands}/SetAnimTrigger.cs.meta | 0 Assets/Fungus/Camera/Editor/ViewEditor.cs | 32 +++++++++++------- .../Fungus/Dialog/Editor/CharacterEditor.cs | 1 - 15 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 Assets/Fungus/Animation/Commands.meta rename Assets/Fungus/Animation/{ => Commands}/SetAnimBool.cs (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimBool.cs.meta (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimFloat.cs (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimFloat.cs.meta (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimInteger.cs (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimInteger.cs.meta (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimTrigger.cs (100%) rename Assets/Fungus/Animation/{ => Commands}/SetAnimTrigger.cs.meta (100%) diff --git a/Assets/Example/Dialogs/ChooseDialog.prefab b/Assets/Example/Dialogs/ChooseDialog.prefab index 5c1d6742a35952affca326413dfcd3a0abf9db63..51d347e72d3f16b42419840b4886c026a7939d23 100644 GIT binary patch literal 42368 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 diff --git a/Assets/Example/Dialogs/NarratorDialog.prefab b/Assets/Example/Dialogs/NarratorDialog.prefab index 5c1d6742a35952affca326413dfcd3a0abf9db63..ae3c139aef0ba36d9c7b0f8714befecb6bd00a73 100644 GIT binary patch literal 19704 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 WF}G9S<6`=ZCj1u5SP0ukLi!KHH0~4t delta 385 zcmX@Hh;fC25(5L9KLdk+1_J{FCy)kG3=AfEW_kumh87I}{{R2axY^A{g-whRD83;5 gJ1a;Yr1&K>2v5G~r$70DpTa06DGVf87=hsl04v*|zW@LL diff --git a/Assets/Example/Scenes/Example.unity b/Assets/Example/Scenes/Example.unity index 472728cca2fcc3e7dc67a77ed0476235e61184f0..b23bba79f38a154a2095e72736230cebc91e6311 100644 GIT binary patch delta 8815 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 XuZl~b(k=Yn&k)@!$MCrOGurZhW&Mf* delta 8383 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 diff --git a/Assets/Fungus/Animation/Commands.meta b/Assets/Fungus/Animation/Commands.meta new file mode 100644 index 00000000..17b1b807 --- /dev/null +++ b/Assets/Fungus/Animation/Commands.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 3e8003ca74cfb4a99983b0084a826c72 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/Animation/SetAnimBool.cs b/Assets/Fungus/Animation/Commands/SetAnimBool.cs similarity index 100% rename from Assets/Fungus/Animation/SetAnimBool.cs rename to Assets/Fungus/Animation/Commands/SetAnimBool.cs diff --git a/Assets/Fungus/Animation/SetAnimBool.cs.meta b/Assets/Fungus/Animation/Commands/SetAnimBool.cs.meta similarity index 100% rename from Assets/Fungus/Animation/SetAnimBool.cs.meta rename to Assets/Fungus/Animation/Commands/SetAnimBool.cs.meta diff --git a/Assets/Fungus/Animation/SetAnimFloat.cs b/Assets/Fungus/Animation/Commands/SetAnimFloat.cs similarity index 100% rename from Assets/Fungus/Animation/SetAnimFloat.cs rename to Assets/Fungus/Animation/Commands/SetAnimFloat.cs diff --git a/Assets/Fungus/Animation/SetAnimFloat.cs.meta b/Assets/Fungus/Animation/Commands/SetAnimFloat.cs.meta similarity index 100% rename from Assets/Fungus/Animation/SetAnimFloat.cs.meta rename to Assets/Fungus/Animation/Commands/SetAnimFloat.cs.meta diff --git a/Assets/Fungus/Animation/SetAnimInteger.cs b/Assets/Fungus/Animation/Commands/SetAnimInteger.cs similarity index 100% rename from Assets/Fungus/Animation/SetAnimInteger.cs rename to Assets/Fungus/Animation/Commands/SetAnimInteger.cs diff --git a/Assets/Fungus/Animation/SetAnimInteger.cs.meta b/Assets/Fungus/Animation/Commands/SetAnimInteger.cs.meta similarity index 100% rename from Assets/Fungus/Animation/SetAnimInteger.cs.meta rename to Assets/Fungus/Animation/Commands/SetAnimInteger.cs.meta diff --git a/Assets/Fungus/Animation/SetAnimTrigger.cs b/Assets/Fungus/Animation/Commands/SetAnimTrigger.cs similarity index 100% rename from Assets/Fungus/Animation/SetAnimTrigger.cs rename to Assets/Fungus/Animation/Commands/SetAnimTrigger.cs diff --git a/Assets/Fungus/Animation/SetAnimTrigger.cs.meta b/Assets/Fungus/Animation/Commands/SetAnimTrigger.cs.meta similarity index 100% rename from Assets/Fungus/Animation/SetAnimTrigger.cs.meta rename to Assets/Fungus/Animation/Commands/SetAnimTrigger.cs.meta diff --git a/Assets/Fungus/Camera/Editor/ViewEditor.cs b/Assets/Fungus/Camera/Editor/ViewEditor.cs index 764bdbb0..49b7c15e 100644 --- a/Assets/Fungus/Camera/Editor/ViewEditor.cs +++ b/Assets/Fungus/Camera/Editor/ViewEditor.cs @@ -10,6 +10,9 @@ public class ViewEditor : Editor { static Color viewColor = Color.yellow; + SerializedProperty primaryAspectRatioProp; + SerializedProperty secondaryAspectRatioProp; + // Draw Views when they're not selected [DrawGizmo(GizmoType.NotSelected | GizmoType.SelectedOrChild)] static void RenderCustomGizmo(Transform objectTransform, GizmoType gizmoType) @@ -53,47 +56,52 @@ public class ViewEditor : Editor } } + void OnEnable() + { + primaryAspectRatioProp = serializedObject.FindProperty ("primaryAspectRatio"); + secondaryAspectRatioProp = serializedObject.FindProperty ("secondaryAspectRatio"); + } + public override void OnInspectorGUI() { - View t = target as View; + serializedObject.Update(); EditorGUI.BeginChangeCheck(); string[] ratios = { "", "Landscape / 4:3", "Landscape / 3:2", "Landscape / 16:10", "Landscape / 17:10", "Landscape / 16:9", "Landscape / 2:1", "Portrait / 3:4", "Portrait / 2:3", "Portrait / 10:16", "Portrait / 10:17", "Portrait / 9:16", "Portrait / 1:2" }; - Vector2 primaryAspectRatio = EditorGUILayout.Vector2Field(new GUIContent("Primary Aspect Ratio", "Width and height values that define the primary aspect ratio (e.g. 4:3)"), t.primaryAspectRatio); + EditorGUILayout.PropertyField(primaryAspectRatioProp, new GUIContent("Primary Aspect Ratio", "Width and height values that define the primary aspect ratio (e.g. 4:3)")); int primaryIndex = EditorGUILayout.Popup("Select Aspect Ratio", 0, ratios); if (primaryIndex > 0) { - primaryAspectRatio = LookupAspectRatio(primaryIndex); + primaryAspectRatioProp.vector2Value = LookupAspectRatio(primaryIndex); } EditorGUILayout.Separator(); - Vector2 secondaryAspectRatio = EditorGUILayout.Vector2Field(new GUIContent("Secondary Aspect Ratio", "Width and height values that define the primary aspect ratio (e.g. 4:3)"), t.secondaryAspectRatio); + EditorGUILayout.PropertyField(secondaryAspectRatioProp, new GUIContent("Secondary Aspect Ratio", "Width and height values that define the primary aspect ratio (e.g. 4:3)")); int secondaryIndex = EditorGUILayout.Popup("Select Aspect Ratio", 0, ratios); if (secondaryIndex > 0) { - secondaryAspectRatio = LookupAspectRatio(secondaryIndex); + secondaryAspectRatioProp.vector2Value = LookupAspectRatio(secondaryIndex); } EditorGUILayout.Separator(); if (EditorGUI.EndChangeCheck()) { // Avoid divide by zero errors - if (primaryAspectRatio.y == 0) + if (primaryAspectRatioProp.vector2Value.y == 0) { - primaryAspectRatio.y = 1; + primaryAspectRatioProp.vector2Value = new Vector2(primaryAspectRatioProp.vector2Value.x, 1f); } - if (secondaryAspectRatio.y == 0) + if (secondaryAspectRatioProp.vector2Value.y == 0) { - secondaryAspectRatio.y = 1; + secondaryAspectRatioProp.vector2Value = new Vector2(secondaryAspectRatioProp.vector2Value.x, 1f); } - t.primaryAspectRatio = primaryAspectRatio; - t.secondaryAspectRatio = secondaryAspectRatio; - SceneView.RepaintAll(); } + + serializedObject.ApplyModifiedProperties(); } void OnSceneGUI () diff --git a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs index 486c4070..9a998105 100644 --- a/Assets/Fungus/Dialog/Editor/CharacterEditor.cs +++ b/Assets/Fungus/Dialog/Editor/CharacterEditor.cs @@ -17,7 +17,6 @@ namespace Fungus.Script void OnEnable() { - // Setup the SerializedProperties nameTextProp = serializedObject.FindProperty ("nameText"); nameColorProp = serializedObject.FindProperty ("nameColor"); profileSpriteProp = serializedObject.FindProperty ("profileSprite");