Skip to content

Commit cbda574

Browse files
committed
Interactivity: fixed no-script-found for export plugin on builds
1 parent 77f6268 commit cbda574

18 files changed

+125
-70
lines changed

Editor/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
using System.Runtime.CompilerServices;
22
[assembly: InternalsVisibleTo("UnityGLTF.Interactivity.VisualScriptingInstall")]
3+
[assembly: InternalsVisibleTo("UnityGLTF.Interactivity.VisualScripting.Inspector")]

Editor/Scripts/Interactivity/VisualScriptingExport/Helpers/InteractivityUnitAnalyzer.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Unity.VisualScripting;
55
using UnityEditor;
66
using UnityGLTF.Interactivity.VisualScripting.Export;
7+
using UnityGLTF.Plugins;
78

89
namespace UnityGLTF.Interactivity.VisualScripting
910
{
@@ -15,7 +16,7 @@ namespace UnityGLTF.Interactivity.VisualScripting
1516
public class InteractivityUnitAnalyzer: UnitAnalyser<IUnit>
1617
{
1718
private GLTFSettings gltfSettings;
18-
private VisualScriptingExportPlugin interactivityPlugin;
19+
private GLTFExportPlugin interactivityPlugin;
1920

2021
public InteractivityUnitAnalyzer(GraphReference reference, IUnit target) : base(reference, target)
2122
{
@@ -32,9 +33,9 @@ private bool InteractivityPluginEnabled()
3233

3334
if (!interactivityPlugin)
3435
{
35-
var plugin = gltfSettings.ExportPlugins.FirstOrDefault(p => p is VisualScriptingExportPlugin);
36+
var plugin = gltfSettings.ExportPlugins.FirstOrDefault(p => p.DisplayName.GetType().Name.Contains("VisualScriptingExportPlugin"));
3637
if (plugin != null)
37-
interactivityPlugin = plugin as VisualScriptingExportPlugin;
38+
interactivityPlugin = plugin;
3839
}
3940

4041
if (interactivityPlugin)

Editor/Scripts/Interactivity/VisualScriptingExport/InstallVSPlugin.meta renamed to Editor/Scripts/Interactivity/VisualScriptingExport/Inspector.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Scripts/Interactivity/VisualScriptingExport/InteractivitySettingsEditor.cs renamed to Editor/Scripts/Interactivity/VisualScriptingExport/Inspector/InteractivitySettingsEditor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace UnityGLTF.Interactivity.VisualScripting
55
{
6+
#if HAVE_VISUAL_SCRIPTING
67
[CustomEditor(typeof(VisualScriptingExportPlugin))]
78
public class InteractivitySettingsEditor : GLTFPluginEditor
89
{
@@ -16,4 +17,5 @@ public override void OnInspectorGUI()
1617
SupportedUnitExports.LogSupportedUnits();
1718
}
1819
}
20+
#endif
1921
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "UnityGLTF.Interactivity.VisualScripting.Inspector",
3+
"rootNamespace": "",
4+
"references": [
5+
"GUID:5144c6d6404c34f70b2d82609133a096",
6+
"GUID:1a0324566af4ed544918d6837a1f4e11",
7+
"GUID:d4cf44f888f7eac4e8981a7d5efb492d",
8+
"GUID:9e01efaa56ea4c94db37ab745cb8dae8",
9+
"GUID:78eed79366eb2824c853b25847bba69b"
10+
],
11+
"includePlatforms": [
12+
"Editor"
13+
],
14+
"excludePlatforms": [],
15+
"allowUnsafeCode": false,
16+
"overrideReferences": false,
17+
"precompiledReferences": [],
18+
"autoReferenced": true,
19+
"defineConstraints": [],
20+
"versionDefines": [
21+
{
22+
"name": "com.unity.visualscripting",
23+
"expression": "1.9",
24+
"define": "HAVE_VISUAL_SCRIPTING"
25+
}
26+
],
27+
"noEngineReferences": false
28+
}
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#if !HAVE_VISUAL_SCRIPTING
2+
namespace UnityGLTF.Interactivity.VisualScripting
3+
{
4+
using UnityGLTF;
5+
using UnityGLTF.Plugins;
6+
using UnityEditor;
7+
8+
[CustomEditor(typeof(VisualScriptingExportPlugin))]
9+
internal class VisualScriptingExportEditor : PackageInstallEditor
10+
{
11+
protected override string PackageName => "com.unity.visualscripting";
12+
}
13+
}
14+
#endif

Editor/Scripts/Interactivity/VisualScriptingExport/InstallVSPlugin/VisualScriptingExportPlugin.cs

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)