Unity 2017.4.28f1 C# reference source code

Unity Technologies · Unity Technologies · commit e3286f146431 · 2019-05-30T17:27:14.000Z
diff --git a/Editor/Mono/SettingsWindow/LightingEditor.cs b/Editor/Mono/SettingsWindow/LightingEditor.cs
@@ -122,6 +122,8 @@ private void DrawGUI()
                 InitSettings();
             }
 
+            m_RenderSettings.UpdateIfRequiredOrScript();
+
             Material skyboxMaterial = m_SkyboxMaterial.objectReferenceValue as Material;
 
             m_bShowEnvironment = EditorGUILayout.FoldoutTitlebar(m_bShowEnvironment, Styles.env_top, true);
@@ -235,6 +237,8 @@ private void DrawGUI()
                 EditorGUI.indentLevel--;
                 EditorGUILayout.Space();
             }
+
+            m_RenderSettings.ApplyModifiedProperties();
         }
 
         public override void OnInspectorGUI()
diff --git a/Editor/Src/VR/Mono/Oculus/VRCustomOptionsOculus.cs b/Editor/Src/VR/Mono/Oculus/VRCustomOptionsOculus.cs
@@ -13,9 +13,11 @@ internal class VRCustomOptionsOculus : VRCustomOptions
     {
         static GUIContent s_SharedDepthBufferLabel = EditorGUIUtility.TextContent("Shared Depth Buffer|Enable depth buffer submission to allow for overlay depth occlusion, etc.");
         static GUIContent s_DashSupportLabel = EditorGUIUtility.TextContent("Dash Support|If enabled, pressing the home button brings up Dash, otherwise it brings up the older universal menu.");
+        static GUIContent s_V2SigningLabel = EditorGUIUtility.TextContent("V2 Signing (Quest)|Enable APK v2 signing if building for Oculus Quest. Disable v2 signing if building for Gear VR or Oculus Go.");
 
         SerializedProperty m_SharedDepthBuffer;
         SerializedProperty m_DashSupport;
+        SerializedProperty m_V2Signing;
 
         public override void Initialize(SerializedObject settings)
         {
@@ -27,6 +29,7 @@ public override void Initialize(SerializedObject settings, string propertyName)
             base.Initialize(settings, propertyName);
             m_SharedDepthBuffer = FindPropertyAssert("sharedDepthBuffer");
             m_DashSupport = FindPropertyAssert("dashSupport");
+            m_V2Signing = FindPropertyAssert("v2Signing");
         }
 
         public override Rect Draw(BuildTargetGroup target, Rect rect)
@@ -57,15 +60,25 @@ public override Rect Draw(BuildTargetGroup target, Rect rect)
             EditorGUI.EndProperty();
 
             EditorGUI.EndDisabled();
-
             rect.y += rect.height + EditorGUIUtility.standardVerticalSpacing;
+            EditorGUI.BeginDisabled(target != BuildTargetGroup.Android);
+            rect.height = EditorGUIUtility.singleLineHeight;
+            label = EditorGUI.BeginProperty(rect, s_V2SigningLabel, m_V2Signing);
+            EditorGUI.BeginChangeCheck();
+            boolValue = EditorGUI.Toggle(rect, label, m_V2Signing.boolValue);
+            if (EditorGUI.EndChangeCheck())
+            {
+                m_V2Signing.boolValue = boolValue;
+            }
+            EditorGUI.EndProperty();
+            EditorGUI.EndDisabled();
 
             return rect;
         }
 
         public override float GetHeight()
         {
-            return (EditorGUIUtility.singleLineHeight * 2.0f) + (EditorGUIUtility.standardVerticalSpacing * 3.0f);
+            return (EditorGUIUtility.singleLineHeight * 3.0f) + (EditorGUIUtility.standardVerticalSpacing * 3.0f);
         }
     }
 }
diff --git a/Editor/Src/VR/ScriptBindings/VREditor.bindings.cs b/Editor/Src/VR/ScriptBindings/VREditor.bindings.cs
@@ -61,6 +61,14 @@ public static extern bool dashSupport
             [NativeMethod("SetOculusDashSupportEnabled")]
             set;
         }
+
+        public static extern bool v2Signing
+        {
+            [NativeMethod("GetOculusV2SigningEnabled")]
+            get;
+            [NativeMethod("SetOculusV2SigningEnabled")]
+            set;
+        }
     }
 }
 
@@ -83,6 +91,12 @@ public static bool dashSupport
                 get { return UnityEditorInternal.PlayerSettingsOculus.dashSupport; }
                 set { UnityEditorInternal.PlayerSettingsOculus.dashSupport = value; }
             }
+
+            public static bool v2Signing
+            {
+                get { return UnityEditorInternal.PlayerSettingsOculus.v2Signing; }
+                set { UnityEditorInternal.PlayerSettingsOculus.v2Signing = value; }
+            }
         }
     }
 }
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Unity 2017.4.27f1 C# reference source code
+## Unity 2017.4.28f1 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ private void DrawGUI()`
`122`	`122`	`InitSettings();`
`123`	`123`	`}`
`124`	`124`
	`125`	`+ m_RenderSettings.UpdateIfRequiredOrScript();`
	`126`	`+`
`125`	`127`	`Material skyboxMaterial = m_SkyboxMaterial.objectReferenceValue as Material;`
`126`	`128`
`127`	`129`	`m_bShowEnvironment = EditorGUILayout.FoldoutTitlebar(m_bShowEnvironment, Styles.env_top, true);`
`@@ -235,6 +237,8 @@ private void DrawGUI()`
`235`	`237`	`EditorGUI.indentLevel--;`
`236`	`238`	`EditorGUILayout.Space();`
`237`	`239`	`}`
	`240`	`+`
	`241`	`+ m_RenderSettings.ApplyModifiedProperties();`
`238`	`242`	`}`
`239`	`243`
`240`	`244`	`public override void OnInspectorGUI()`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,11 @@ internal class VRCustomOptionsOculus : VRCustomOptions`
`13`	`13`	`{`
`14`	`14`	`static GUIContent s_SharedDepthBufferLabel = EditorGUIUtility.TextContent("Shared Depth Buffer\|Enable depth buffer submission to allow for overlay depth occlusion, etc.");`
`15`	`15`	`static GUIContent s_DashSupportLabel = EditorGUIUtility.TextContent("Dash Support\|If enabled, pressing the home button brings up Dash, otherwise it brings up the older universal menu.");`
	`16`	`+ static GUIContent s_V2SigningLabel = EditorGUIUtility.TextContent("V2 Signing (Quest)\|Enable APK v2 signing if building for Oculus Quest. Disable v2 signing if building for Gear VR or Oculus Go.");`
`16`	`17`
`17`	`18`	`SerializedProperty m_SharedDepthBuffer;`
`18`	`19`	`SerializedProperty m_DashSupport;`
	`20`	`+ SerializedProperty m_V2Signing;`
`19`	`21`
`20`	`22`	`public override void Initialize(SerializedObject settings)`
`21`	`23`	`{`
`@@ -27,6 +29,7 @@ public override void Initialize(SerializedObject settings, string propertyName)`
`27`	`29`	`base.Initialize(settings, propertyName);`
`28`	`30`	`m_SharedDepthBuffer = FindPropertyAssert("sharedDepthBuffer");`
`29`	`31`	`m_DashSupport = FindPropertyAssert("dashSupport");`
	`32`	`+ m_V2Signing = FindPropertyAssert("v2Signing");`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`public override Rect Draw(BuildTargetGroup target, Rect rect)`
`@@ -57,15 +60,25 @@ public override Rect Draw(BuildTargetGroup target, Rect rect)`
`57`	`60`	`EditorGUI.EndProperty();`
`58`	`61`
`59`	`62`	`EditorGUI.EndDisabled();`
`60`		`-`
`61`	`63`	`rect.y += rect.height + EditorGUIUtility.standardVerticalSpacing;`
	`64`	`+ EditorGUI.BeginDisabled(target != BuildTargetGroup.Android);`
	`65`	`+ rect.height = EditorGUIUtility.singleLineHeight;`
	`66`	`+ label = EditorGUI.BeginProperty(rect, s_V2SigningLabel, m_V2Signing);`
	`67`	`+ EditorGUI.BeginChangeCheck();`
	`68`	`+ boolValue = EditorGUI.Toggle(rect, label, m_V2Signing.boolValue);`
	`69`	`+ if (EditorGUI.EndChangeCheck())`
	`70`	`+ {`
	`71`	`+ m_V2Signing.boolValue = boolValue;`
	`72`	`+ }`
	`73`	`+ EditorGUI.EndProperty();`
	`74`	`+ EditorGUI.EndDisabled();`
`62`	`75`
`63`	`76`	`return rect;`
`64`	`77`	`}`
`65`	`78`
`66`	`79`	`public override float GetHeight()`
`67`	`80`	`{`
`68`		`- return (EditorGUIUtility.singleLineHeight * 2.0f) + (EditorGUIUtility.standardVerticalSpacing * 3.0f);`
	`81`	`+ return (EditorGUIUtility.singleLineHeight * 3.0f) + (EditorGUIUtility.standardVerticalSpacing * 3.0f);`
`69`	`82`	`}`
`70`	`83`	`}`
`71`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,14 @@ public static extern bool dashSupport`
`61`	`61`	`[NativeMethod("SetOculusDashSupportEnabled")]`
`62`	`62`	`set;`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+ public static extern bool v2Signing`
	`66`	`+ {`
	`67`	`+ [NativeMethod("GetOculusV2SigningEnabled")]`
	`68`	`+ get;`
	`69`	`+ [NativeMethod("SetOculusV2SigningEnabled")]`
	`70`	`+ set;`
	`71`	`+ }`
`64`	`72`	`}`
`65`	`73`	`}`
`66`	`74`
`@@ -83,6 +91,12 @@ public static bool dashSupport`
`83`	`91`	`get { return UnityEditorInternal.PlayerSettingsOculus.dashSupport; }`
`84`	`92`	`set { UnityEditorInternal.PlayerSettingsOculus.dashSupport = value; }`
`85`	`93`	`}`
	`94`	`+`
	`95`	`+ public static bool v2Signing`
	`96`	`+ {`
	`97`	`+ get { return UnityEditorInternal.PlayerSettingsOculus.v2Signing; }`
	`98`	`+ set { UnityEditorInternal.PlayerSettingsOculus.v2Signing = value; }`
	`99`	`+ }`
`86`	`100`	`}`
`87`	`101`	`}`
`88`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Unity 2017.4.27f1 C# reference source code`
	`1`	`+## Unity 2017.4.28f1 C# reference source code`
`2`	`2`
`3`	`3`	`The C# part of the Unity engine and editor source code.`
`4`	`4`	`May be used for reference purposes only.`