Skip to content

Commit 379cf05

Browse files
author
Unity Technologies
committed
Unity 2018.2.0b8 C# reference source code
1 parent 2529e30 commit 379cf05

43 files changed

Lines changed: 345 additions & 151 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Editor/Mono/AssetDatabase/AssetDatabaseSearching.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,9 @@ private static IEnumerator<T> FindInFolders<T>(SearchFilter searchFilter, Func<H
5656
folders.AddRange(searchFilter.folders);
5757
if (folders.Remove(PackageManager.Folders.GetPackagesMountPoint()))
5858
{
59-
var packages = PackageManager.Packages.GetAll();
59+
var packages = PackageManagerUtilityInternal.GetAllVisiblePackages();
6060
foreach (var package in packages)
6161
{
62-
if (package.source == PackageManager.PackageSource.BuiltIn)
63-
continue;
64-
6562
if (!folders.Contains(package.assetPath))
6663
folders.Add(package.assetPath);
6764
}
@@ -109,12 +106,9 @@ private static IEnumerator<T> FindEverywhere<T>(SearchFilter searchFilter, Func<
109106
if (searchFilter.searchArea == SearchFilter.SearchArea.AllAssets ||
110107
searchFilter.searchArea == SearchFilter.SearchArea.InPackagesOnly)
111108
{
112-
var packages = PackageManager.Packages.GetAll();
109+
var packages = PackageManagerUtilityInternal.GetAllVisiblePackages();
113110
foreach (var package in packages)
114111
{
115-
if (package.source == PackageManager.PackageSource.BuiltIn)
116-
continue;
117-
118112
rootPaths.Add(package.assetPath);
119113
}
120114
}

‎Editor/Mono/AssetPipeline/MovieImporter.bindings.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
namespace UnityEditor
99
{
1010
// AssetImporter for importing MovieTextures
11+
[System.Obsolete("MovieImporter is deprecated. Use VideoClipImporter instead.", false)]
1112
[NativeHeader("Editor/Src/AssetPipeline/MovieImporter.h")]
1213
public partial class MovieImporter : AssetImporter
1314
{

‎Editor/Mono/AssetPipeline/VideoImporter.bindings.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@ internal extern static string defaultTargetName
216216
public extern int pixelAspectRatioDenominator { get; }
217217

218218
public extern bool transcodeSkipped { get; }
219+
220+
[NativeMethod("operator==")]
221+
extern public bool Equals(VideoClipImporter rhs);
219222
}
220223

221224
}

‎Editor/Mono/BuildPlayerWindowBuildMethods.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ static bool PickBuildLocation(BuildTargetGroup targetGroup, BuildTarget target,
342342
if (isWindowsStandalone)
343343
{
344344
extension = realExtension;
345-
path = Path.Combine(path, Path.GetFileName(path) + '.' + extension);
345+
path = Path.Combine(path, PlayerSettings.productName + '.' + extension);
346346
}
347347

348348
if (!IsBuildPathValid(path))

‎Editor/Mono/ImportSettings/MovieImporterInspector.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace UnityEditor
1010
{
11+
[System.Obsolete("MovieImporter is deprecated. Use VideoClipImporter instead.", false)]
1112
[CustomEditor(typeof(MovieImporter))]
1213
internal class MovieImporterInspector : AssetImporterEditor
1314
{

‎Editor/Mono/ImportSettings/VideoClipImporterInspector.cs‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -745,9 +745,11 @@ public override void OnInspectorGUI()
745745

746746
if (m_UseLegacyImporter.boolValue)
747747
{
748+
#pragma warning disable 0618
748749
EditorGUILayout.PropertyField(
749750
m_IsColorLinear, MovieImporterInspector.linearTextureContent);
750751
EditorGUILayout.Slider(m_Quality, 0.0f, 1.0f);
752+
#pragma warning restore 0618
751753
}
752754
else
753755
{
@@ -786,6 +788,14 @@ public override bool HasModified()
786788

787789
protected override void Apply()
788790
{
791+
foreach (var t in targets)
792+
{
793+
var importer = (VideoClipImporter)t;
794+
if (importer.isPlayingPreview)
795+
importer.StopPreview();
796+
}
797+
m_IsPlaying = false;
798+
789799
base.Apply();
790800
WriteSettingsToBackend();
791801

@@ -804,17 +814,13 @@ public override bool HasPreviewGUI()
804814

805815
public override GUIContent GetPreviewTitle()
806816
{
807-
if (m_PreviewTitle != null)
808-
return m_PreviewTitle;
809-
810-
m_PreviewTitle = new GUIContent();
817+
if (m_PreviewTitle == null)
818+
m_PreviewTitle = new GUIContent();
811819

812820
if (targets.Length == 1)
813-
{
814-
AssetImporter importer = (AssetImporter)target;
815-
m_PreviewTitle.text = Path.GetFileName(importer.assetPath);
816-
}
817-
else
821+
// Asset name can change over time so we have to re-evaluate constantly.
822+
m_PreviewTitle.text = Path.GetFileName(((AssetImporter)target).assetPath);
823+
else if (string.IsNullOrEmpty(m_PreviewTitle.text))
818824
m_PreviewTitle.text = targets.Length + " Video Clips";
819825

820826
return m_PreviewTitle;

‎Editor/Mono/Inspector/ClothInspector.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,22 +94,22 @@ private static class Styles
9494
public static readonly GUIContent editSelfInterCollisionLabel = EditorGUIUtility.TrTextContent("Edit Collision Particles");
9595
public static readonly GUIContent selfInterCollisionParticleColor = EditorGUIUtility.TrTextContent("Visualization Color");
9696
public static readonly GUIContent selfInterCollisionBrushColor = EditorGUIUtility.TrTextContent("Brush Color");
97-
public static readonly GUIContent clothSelfCollisionAndInterCollision = EditorGUIUtility.TrTextContent("Cloth Self-Collision And Inter-Collision");
97+
public static readonly GUIContent clothSelfCollisionAndInterCollision = EditorGUIUtility.TrTextContent("Cloth Self-Collision and Inter-Collision");
9898
public static readonly GUIContent paintCollisionParticles = EditorGUIUtility.TrTextContent("Paint Collision Particles");
9999
public static readonly GUIContent selectCollisionParticles = EditorGUIUtility.TrTextContent("Select Collision Particles");
100100
public static readonly GUIContent brushRadiusString = EditorGUIUtility.TrTextContent("Brush Radius");
101101
public static readonly GUIContent selfAndInterCollisionMode = EditorGUIUtility.TrTextContent("Paint or Select Particles");
102102
public static readonly GUIContent backFaceManipulationMode = EditorGUIUtility.TrTextContent("Back Face Manipulation");
103103
public static readonly GUIContent manipulateBackFaceString = EditorGUIUtility.TrTextContent("Manipulate Backfaces");
104-
public static readonly GUIContent selfCollisionString = EditorGUIUtility.TrTextContent("Self Collision");
104+
public static readonly GUIContent selfCollisionString = EditorGUIUtility.TrTextContent("Self-Collision");
105105
public static readonly GUIContent setSelfAndInterCollisionString = EditorGUIUtility.TrTextContent("Self-Collision and Inter-Collision");
106106

107107
public static readonly int clothEditorWindowWidth = 300;
108108

109109
public static GUIContent[] toolContents =
110110
{
111-
EditorGUIUtility.IconContent("EditCollider"),
112-
EditorGUIUtility.IconContent("EditCollider")
111+
EditorGUIUtility.IconContent("editconstraints_16"),
112+
EditorGUIUtility.IconContent("editCollision_16")
113113
};
114114

115115
public static GUIContent[] toolIcons =
@@ -141,8 +141,8 @@ private static class Styles
141141

142142
public static GUIContent[] collVisModeStrings =
143143
{
144-
EditorGUIUtility.TrTextContent("Self Collision"),
145-
EditorGUIUtility.TrTextContent("Inter Collision"),
144+
EditorGUIUtility.TrTextContent("Self-Collision"),
145+
EditorGUIUtility.TrTextContent("Inter-Collision"),
146146
};
147147

148148
public static GUIContent paintIcon = EditorGUIUtility.TrIconContent("ClothInspector.PaintValue", "Change this vertex coefficient value by painting in the scene view.");
@@ -153,16 +153,16 @@ private static class Styles
153153
EditMode.SceneViewEditMode.ClothSelfAndInterCollisionParticles
154154
};
155155

156-
public static GUIContent selfCollisionDistanceGUIContent = EditorGUIUtility.TrTextContent("Self Collision Distance");
157-
public static GUIContent selfCollisionStiffnessGUIContent = EditorGUIUtility.TrTextContent("Self Collision Stiffness");
156+
public static GUIContent selfCollisionDistanceGUIContent = EditorGUIUtility.TrTextContent("Self-Collision Distance");
157+
public static GUIContent selfCollisionStiffnessGUIContent = EditorGUIUtility.TrTextContent("Self-Collision Stiffness");
158158

159159
static Styles()
160160
{
161161
toolContents[0].tooltip = EditorGUIUtility.TrTextContent("Edit cloth constraints").text;
162-
toolContents[1].tooltip = EditorGUIUtility.TrTextContent("Edit cloth self or inter collision").text;
162+
toolContents[1].tooltip = EditorGUIUtility.TrTextContent("Edit cloth self/inter-collision").text;
163163

164-
toolIcons[0].tooltip = EditorGUIUtility.TrTextContent("Select cloth particles for use in self or inter collision").text;
165-
toolIcons[1].tooltip = EditorGUIUtility.TrTextContent("Paint cloth particles for use in self or inter collision").text;
164+
toolIcons[0].tooltip = EditorGUIUtility.TrTextContent("Select cloth particles for use in self/inter-collision").text;
165+
toolIcons[1].tooltip = EditorGUIUtility.TrTextContent("Paint cloth particles for use in self/inter-collision").text;
166166

167167
collToolModeIcons[0].tooltip = EditorGUIUtility.TrTextContent("Select cloth particles.").text;
168168
collToolModeIcons[1].tooltip = EditorGUIUtility.TrTextContent("Paint cloth particles.").text;

‎Editor/Mono/Inspector/MovieTextureInspector.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace UnityEditor
99
{
10+
[System.Obsolete("MovieTexture is deprecated. Use VideoPlayer instead.", false)]
1011
[CustomEditor(typeof(MovieTexture))]
1112
[CanEditMultipleObjects]
1213
internal class MovieTextureInspector : TextureInspector

‎Editor/Mono/InternalEditorUtility.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using UnityEditor.Scripting.ScriptCompilation;
1313
using UnityEngine.Experimental.UIElements;
1414
using UnityEngine.StyleSheets;
15+
using UnityEngine.Video;
1516

1617
namespace UnityEditorInternal
1718
{
@@ -71,7 +72,7 @@ public static Texture2D FindIconForFile(string fileName)
7172
case "asf": case "asx": case "avi": case "dat": case "divx": case "dvx": case "mlv": case "m2l":
7273
case "m2t": case "m2ts": case "m2v": case "m4e": case "mjp": case "mov": case "movie":
7374
case "mp21": case "mpe": case "mpv2": case "ogm": case "qt": case "rm": case "rmvb": case "wmw": case "xvid":
74-
return AssetDatabase.GetCachedIcon(fileName) as Texture2D ?? EditorGUIUtility.FindTexture(typeof(MovieTexture));
75+
return AssetDatabase.GetCachedIcon(fileName) as Texture2D ?? EditorGUIUtility.FindTexture(typeof(VideoClip));
7576

7677
case "colors": case "gradients":
7778
case "curves": case "curvesnormalized": case "particlecurves": case "particlecurvessigned": case "particledoublecurves": case "particledoublecurvessigned":

‎Editor/Mono/PackageManagerUtilityInternal.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Unity C# reference source
2+
// Copyright (c) Unity Technologies. For terms of use, see
3+
// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
4+
5+
using System;
6+
using System.Linq;
7+
using UnityEditor.PackageManager;
8+
9+
namespace UnityEditor
10+
{
11+
/// <summary>
12+
/// PackageManager helper class.
13+
/// </summary>
14+
internal static class PackageManagerUtilityInternal
15+
{
16+
/// <summary>
17+
/// Returns visibles packages, it excludes modules and non-root dependencies (used in project browser)
18+
/// <returns>an array of package information ordererd by display name.</returns>
19+
/// </summary>
20+
public static PackageManager.PackageInfo[] GetAllVisiblePackages()
21+
{
22+
return Packages.GetAll().Where(info => info.isRootDependency && info.type != "module").
23+
OrderBy(info => string.IsNullOrEmpty(info.displayName) ? info.name : info.displayName,
24+
StringComparer.InvariantCultureIgnoreCase).ToArray();
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)