Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ trim_trailing_whitespace = true
[*.cs]
indent_size = 4
max_line_length = 160
csharp_style_namespace_declarations = block_scoped:suggestion

#### Project C# Conventions ####

Expand All @@ -33,9 +34,8 @@ csharp_style_expression_bodied_indexers = when_on_single_line:suggestion
csharp_style_expression_bodied_accessors = false:suggestion
csharp_style_expression_bodied_local_functions = when_on_single_line:suggestion

# Preserve compact control flow and Unity-compatible namespace syntax.
# Preserve compact control flow
csharp_prefer_braces = when_multiline:suggestion
csharp_style_namespace_declarations = block_scoped:suggestion

#### Project Naming Conventions ####

Expand Down
2 changes: 2 additions & 0 deletions Alchemy.SourceGenerator.Tests/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[*.cs]
csharp_style_namespace_declarations = file_scoped:suggestion
2 changes: 2 additions & 0 deletions Alchemy.SourceGenerator/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[*.cs]
csharp_style_namespace_declarations = file_scoped:suggestion
2 changes: 1 addition & 1 deletion Alchemy/Assets/Alchemy/Editor/BuiltinGroupDrawers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public override VisualElement CreateRootElement(string label)
paddingLeft = 3f,
}
};
rootElement.Remove(rootElement.Q<Label>());
rootElement.Q<Label>()?.RemoveFromHierarchy();

var tabGUIElement = new IMGUIContainer(() =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public InlineEditorObjectField(SerializedProperty property, Type type)

foldout.BindProperty(property);

inspectorContainer = new VisualElement();

field = new ObjectField()
{
label = ObjectNames.NicifyVariableName(property.displayName),
Expand All @@ -52,6 +54,7 @@ public InlineEditorObjectField(SerializedProperty property, Type type)
}

readonly Foldout foldout;
readonly VisualElement inspectorContainer;
readonly ObjectField field;
bool isNull;

Expand Down Expand Up @@ -89,6 +92,8 @@ void OnPropertyChanged(SerializedProperty property)

void Build(SerializedProperty property)
{
inspectorContainer.Unbind();
inspectorContainer.Clear();
foldout.Clear();
var toggle = foldout.Q<Toggle>();

Expand All @@ -98,12 +103,9 @@ void Build(SerializedProperty property)
{
foldout.Add(new VisualElement() { style = { height = EditorGUIUtility.standardVerticalSpacing } });
var so = new SerializedObject(property.objectReferenceValue);
InspectorHelper.BuildElements(so, foldout, so.targetObject, name => so.FindProperty(name));
this.Bind(so);
}
else
{
this.Unbind();
InspectorHelper.BuildElements(so, inspectorContainer, so.targetObject, name => so.FindProperty(name));
inspectorContainer.Bind(so);
foldout.Add(inspectorContainer);
}
}
}
Expand Down
12 changes: 0 additions & 12 deletions Alchemy/Assets/Tests/ButtonTest.cs

This file was deleted.

2 changes: 0 additions & 2 deletions Alchemy/Assets/Tests/ButtonTest.cs.meta

This file was deleted.

24 changes: 0 additions & 24 deletions Alchemy/Assets/Tests/DepthTest.cs

This file was deleted.

9 changes: 0 additions & 9 deletions Alchemy/Assets/Tests/InheritedSerializeTest.cs

This file was deleted.

12 changes: 0 additions & 12 deletions Alchemy/Assets/Tests/InheritedSerializeTestBase.cs

This file was deleted.

52 changes: 0 additions & 52 deletions Alchemy/Assets/Tests/OnListViewChangedTest.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Alchemy/Assets/Tests/PreviewTest.cs

This file was deleted.

2 changes: 0 additions & 2 deletions Alchemy/Assets/Tests/PreviewTest.cs.meta

This file was deleted.

10 changes: 0 additions & 10 deletions Alchemy/Assets/Tests/StringListTest.cs

This file was deleted.

17 changes: 0 additions & 17 deletions Alchemy/Assets/Tests/UnsignedTest.cs

This file was deleted.

3 changes: 0 additions & 3 deletions Alchemy/Assets/Tests/UnsignedTest.cs.meta

This file was deleted.

8 changes: 7 additions & 1 deletion Alchemy/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"dependencies": {
"com.annulusgames.alchemy.editor-ui-test": "file:../../tests/Alchemy.Tests/Assets/Alchemy.Tests.EditorUI",
"com.annulusgames.alchemy.test": "file:../../tests/Alchemy.Tests/Assets/Alchemy.Tests",
"com.unity.collab-proxy": "2.12.4",
"com.unity.feature.development": "1.0.2",
"com.unity.ide.visualstudio": "2.0.27",
Expand Down Expand Up @@ -43,5 +45,9 @@
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.pipeline": "0.4.0-exp.1"
}
},
"testables": [
"com.annulusgames.alchemy.editor-ui-test",
"com.annulusgames.alchemy.test"
]
}
16 changes: 16 additions & 0 deletions Alchemy/Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
{
"dependencies": {
"com.annulusgames.alchemy.editor-ui-test": {
"version": "file:../../tests/Alchemy.Tests/Assets/Alchemy.Tests.EditorUI",
"depth": 0,
"source": "local",
"dependencies": {
"com.unity.test-framework": "1.1.31"
}
},
"com.annulusgames.alchemy.test": {
"version": "file:../../tests/Alchemy.Tests/Assets/Alchemy.Tests",
"depth": 0,
"source": "local",
"dependencies": {
"com.unity.test-framework": "1.1.31"
}
},
"com.unity.burst": {
"version": "1.8.29",
"depth": 1,
Expand Down
1 change: 0 additions & 1 deletion Alchemy/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ PlayerSettings:
shaderPrecisionModel: 0
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
templatePackageId: com.unity.template.3d@8.1.1
templateDefaultScene: Assets/Scenes/SampleScene.unity
useCustomMainManifest: 0
useCustomLauncherManifest: 0
useCustomMainGradleTemplate: 0
Expand Down
3 changes: 3 additions & 0 deletions tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/captures/
*InitTestScene*unity
*InitTestScene*unity.meta
78 changes: 78 additions & 0 deletions tests/Alchemy.Tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# Visual Studio Code
.vscode

## DS_Store
*.DS_Store
File renamed without changes.
Loading