Compare commits

...

7 commits
1.0.0 ... main

13 changed files with 248 additions and 34 deletions

View file

@ -1,8 +1,8 @@
using System;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
namespace Module.ProjectValidator.Editor
{
internal sealed class Report
@ -64,7 +64,7 @@ namespace Module.ProjectValidator.Editor
public bool TryGetSeverityFor(string guid, out MappingEntry mapping)
{
if (UnityEngine.GUID.TryParse(guid, out var assetGuid) && _assetToSeverityMapping.TryGetValue(assetGuid, out mapping))
if (GUID.TryParse(guid, out var assetGuid) && _assetToSeverityMapping.TryGetValue(assetGuid, out mapping))
return true;
mapping = new MappingEntry();

View file

@ -13,6 +13,7 @@ namespace Module.ProjectValidator.Editor
internal sealed class ProjectValidatorSettings : ScriptableObject
{
public List<string> assemblies = new();
[NonReorderable]
public List<ValidatorEnabled> validators = new();
public const string MenuPath = "Project/Project Validator";
@ -74,13 +75,17 @@ namespace Module.ProjectValidator.Editor
for (var i = 0; i < settings.validators.Count; i++)
{
temp.Add(settings.validators[i].type);
temp.Add(settings.validators[i].assemblyQualifiedName);
}
for (var i = 0; i < list.Count; i++)
{
if (!temp.Contains(list[i]))
settings.validators.Add(new ValidatorEnabled(list[i], true));
if (temp.Contains(list[i]))
continue;
var type = Type.GetType(list[i]);
var name = type != null ? type.Name : "Unknown Type";
settings.validators.Add(new ValidatorEnabled(name, list[i], true));
}
for (var i = temp.Count - 1; i >= 0; i--)
@ -97,19 +102,21 @@ namespace Module.ProjectValidator.Editor
for (var i = 0; i < types.Count; i++)
{
if (!types[i].IsInterface && !types[i].IsAbstract)
typeNames.Add(types[i].FullName);
typeNames.Add(types[i].AssemblyQualifiedName);
}
}
[Serializable]
public sealed class ValidatorEnabled
{
public string type;
public string name;
public string assemblyQualifiedName;
public bool enabled;
public ValidatorEnabled(string type, bool enabled)
public ValidatorEnabled(string name, string assemblyQualifiedName, bool enabled)
{
this.type = type;
this.name = name;
this.assemblyQualifiedName = assemblyQualifiedName;
this.enabled = enabled;
}
}

View file

@ -101,7 +101,7 @@ namespace Module.ProjectValidator.Editor
if (!settings.validators[i].enabled)
continue;
var type = Type.GetType(settings.validators[i].type);
var type = Type.GetType(settings.validators[i].assemblyQualifiedName);
if (type != null)
enabled.Add(type);
@ -179,12 +179,12 @@ namespace Module.ProjectValidator.Editor
for (var i = 0; i < assets.Length; i++)
{
var assetPath = AssetDatabase.GetAssetPath(assets[i]);
var scene = SceneManager.GetSceneByPath(assetPath);
var isLoaded = scene.isLoaded;
try
{
var assetPath = AssetDatabase.GetAssetPath(assets[i]);
var scene = SceneManager.GetSceneByPath(assetPath);
var isLoaded = scene.isLoaded;
if (!isLoaded)
scene = EditorSceneManager.OpenScene(assetPath, OpenSceneMode.Additive);
@ -194,14 +194,16 @@ namespace Module.ProjectValidator.Editor
{
ValidateGameObject(rootObjects[j], string.Empty, report, true);
}
if (!isLoaded)
EditorSceneManager.CloseScene(scene, true);
}
catch (Exception e)
{
Debug.LogException(e);
}
finally
{
if (!isLoaded && scene.isLoaded)
EditorSceneManager.CloseScene(scene, true);
}
}
}
@ -422,7 +424,17 @@ namespace Module.ProjectValidator.Editor
var fieldPath = parentFieldPath;
ProjectValidatorUtility.AppendToFieldPath(e.FieldInfo, ref fieldPath);
if (value is IEnumerable<object> ie)
if (value is Array arr)
{
for (var j = 0; j < arr.Length; j++)
{
var eObj = arr.GetValue(j);
var fieldPathArrElement = fieldPath;
ProjectValidatorUtility.AppendToFieldPath(j, ref fieldPathArrElement);
Validate(assetGuid, relativePath, fieldPathArrElement, eObj, e.Entry, report);
}
}
else if (value is IEnumerable<object> ie)
{
var idx = 0;

View file

@ -28,16 +28,20 @@ namespace Module.ProjectValidator.Editor
var tagSearch = new ShaderTagId("RenderPipeline");
var tagPipeline = new ShaderTagId(pipeline.renderPipelineShaderTag);
var hasKeyword = false;
for (var i = 0; i < shader.passCount; i++)
{
var tagPass = shader.FindPassTagValue(i, tagSearch);
if (tagPass != ShaderTagId.none)
hasKeyword = true;
if (tagPass == tagPipeline)
return true;
}
return false;
return !hasKeyword;
}
}
}

View file

@ -16,9 +16,12 @@ namespace Module.ProjectValidator.Editor
for (var i = 0; i < count; i++)
{
var propertyType = obj.shader.GetPropertyType(i);
var propertyFlags = obj.shader.GetPropertyFlags(i);
if (propertyType != ShaderPropertyType.Texture)
continue;
if ((propertyFlags & (ShaderPropertyFlags.PerRendererData | ShaderPropertyFlags.HideInInspector | ShaderPropertyFlags.NonModifiableTextureData)) != 0)
continue;
var propertyName = obj.shader.GetPropertyName(i);
var propertyValue = obj.GetTexture(propertyName);

View file

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Reflection;
using UnityEngine;
using UnityEngine.Pool;
@ -28,7 +30,7 @@ namespace Module.ProjectValidator.Editor
}
else
{
if (count > 1)
if (count > 1 && IsMultipleComponentsAllowed(type))
results.Add(ValidatorResult.Create(EValidatorSeverity.Warning, $"GameObject has duplicate '{type.Name}' ({count}) components"));
type = t;
@ -36,8 +38,13 @@ namespace Module.ProjectValidator.Editor
}
}
if (count > 1)
if (count > 1 && IsMultipleComponentsAllowed(type))
results.Add(ValidatorResult.Create(EValidatorSeverity.Warning, $"GameObject has duplicate '{type.Name}' ({count}) components"));
}
private static bool IsMultipleComponentsAllowed(Type type)
{
return type.GetCustomAttribute<DisallowMultipleComponent>(true) == null;
}
}
}

View file

@ -8,6 +8,12 @@ namespace Module.ProjectValidator.Editor
{
internal sealed class EditorProjectValidatorWindow : EditorWindow
{
private VisualElement _groupWarnings;
private Label _labelWarnings;
private VisualElement _groupErrors;
private Label _labelErrors;
private MultiColumnTreeView _treeView;
private string _searchFilter;
@ -21,6 +27,15 @@ namespace Module.ProjectValidator.Editor
root.styleSheets.Add(EditorAssetUtility.LoadFirstAsset<StyleSheet>("StyleSheetEditorProjectValidatorWindow"));
root.Add(asset.Instantiate());
_groupWarnings = root.Q<VisualElement>("status-warnings");
_labelWarnings = _groupWarnings.Q<Label>("label-warnings");
_groupErrors = root.Q<VisualElement>("status-errors");
_labelErrors = _groupErrors.Q<Label>("label-errors");
_groupWarnings.style.display = DisplayStyle.None;
_groupErrors.style.display = DisplayStyle.None;
root.Q<ToolbarButton>("button-run").clicked += OnToolbarButtonRunClicked;
root.Q<ToolbarButton>("button-clear").clicked += OnToolbarButtonClearClicked;
root.Q<ToolbarSearchField>().RegisterValueChangedCallback(OnToolbarSearchFieldChanged);
@ -61,11 +76,26 @@ namespace Module.ProjectValidator.Editor
_list.Clear();
for (var i = 0; i < Report.Active.Entries.Count; i++)
var entries = Report.Active.Entries;
var warningCount = 0;
var errorCount = 0;
for (var i = 0; i < entries.Count; i++)
{
_list.Add(new TreeViewItemData<Report.Entry>(i, Report.Active.Entries[i]));
_list.Add(new TreeViewItemData<Report.Entry>(i, entries[i]));
if (entries[i].Severity == EValidatorSeverity.Warning)
warningCount++;
if (entries[i].Severity == EValidatorSeverity.Error)
errorCount++;
}
_groupWarnings.style.display = warningCount > 0 ? DisplayStyle.Flex : DisplayStyle.None;
_labelWarnings.text = warningCount.ToString();
_groupErrors.style.display = errorCount > 0 ? DisplayStyle.Flex : DisplayStyle.None;
_labelErrors.text = errorCount.ToString();
Filter();
}
@ -124,6 +154,8 @@ namespace Module.ProjectValidator.Editor
private void OnToolbarButtonClearClicked()
{
_groupWarnings.style.display = DisplayStyle.None;
_groupErrors.style.display = DisplayStyle.None;
ValidatorRunner.Clear();
}

View file

@ -9,11 +9,11 @@ namespace Module.ProjectValidator.Editor
{
public override VisualElement CreatePropertyGUI(SerializedProperty property)
{
var spType = property.FindPropertyRelative(nameof(ProjectValidatorSettings.ValidatorEnabled.type));
var spType = property.FindPropertyRelative(nameof(ProjectValidatorSettings.ValidatorEnabled.name));
var spEnabled = property.FindPropertyRelative(nameof(ProjectValidatorSettings.ValidatorEnabled.enabled));
var root = new VisualElement { style = { flexDirection = FlexDirection.Row } };
var veType = new PropertyField(spType, string.Empty) { style = { flexGrow = 1f } };
var veType = new PropertyField(spType, string.Empty) { style = { flexGrow = 1f }, enabledSelf = false };
var veEnabled = new PropertyField(spEnabled, string.Empty);
root.Add(veEnabled);
root.Add(veType);

View file

@ -16,8 +16,6 @@
-unity-font-style: bold;
}
.toolbar-button-settings {
width: 24px;
min-width: 24px;
@ -30,3 +28,27 @@
-unity-background-scale-mode: scale-to-fit;
margin-left: 0;
}
.warning-icon {
background-image: url("project://database/Packages/com.module.project-validator/Editor/Icons/editor_project_validator_warning.png?fileID=2800000&guid=5dce0f250980ffb459470fac33dfab59&type=3#editor_project_validator_warning");
width: 16px;
min-width: 16px;
max-width: 16px;
max-height: 16px;
min-height: 16px;
height: 16px;
-unity-background-scale-mode: scale-to-fit;
margin-left: 4px;
}
.error-icon {
background-image: url("project://database/Packages/com.module.project-validator/Editor/Icons/editor_project_validator_error.png?fileID=2800000&guid=7b6c61a2cf824b74c87cb49759531c79&type=3#editor_project_validator_error");
width: 16px;
min-width: 16px;
max-width: 16px;
max-height: 16px;
min-height: 16px;
height: 16px;
-unity-background-scale-mode: scale-to-fit;
margin-left: 4px;
}

View file

@ -2,7 +2,16 @@
<uie:Toolbar name="toolbar">
<uie:ToolbarButton text="Run" name="button-run" style="margin-left: 2px;"/>
<uie:ToolbarButton text="Clear" name="button-clear"/>
<uie:ToolbarSpacer style="flex-grow: 1;"/>
<uie:ToolbarSpacer name="spacing" style="flex-grow: 1;"/>
<ui:VisualElement name="status-errors" style="flex-grow: 0; flex-direction: row; align-self: center; margin-left: 4px;">
<ui:Label text="9999" name="label-errors" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" style="flex-grow: 1; -unity-text-align: middle-center;"/>
<ui:VisualElement name="icon" class="error-icon" style="flex-grow: 1;"/>
</ui:VisualElement>
<ui:VisualElement name="status-warnings" style="flex-grow: 0; flex-direction: row; align-self: center; margin-right: 4px;">
<ui:Label text="9999" name="label-warnings" double-click-selects-word="false" triple-click-selects-line="false" display-tooltip-when-elided="false" style="flex-grow: 1; -unity-text-align: middle-center;"/>
<ui:VisualElement name="icon" class="warning-icon" style="flex-grow: 1;"/>
</ui:VisualElement>
<uie:ToolbarSpacer name="spacing" style="flex-grow: 1;"/>
<uie:ToolbarSearchField name="search-field"/>
<uie:ToolbarButton text="" name="button-settings" class="toolbar-button-settings"/>
</uie:Toolbar>
@ -17,4 +26,5 @@
</ui:Columns>
<ui:SortColumnDescriptions/>
</ui:MultiColumnTreeView>
<ui:Image/>
</ui:UXML>

View file

@ -1,6 +1,6 @@
{
"name": "com.module.project-validator",
"version": "1.0.0",
"version": "1.0.3",
"displayName": "Module.ProjectValidator",
"description": "",
"unity": "6000.3",

View file

@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: 094f9567dcf756b468ea41cd471b65d7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

Before After
Before After