Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support batchmode with "quit" flag on #29

Closed
wants to merge 4 commits into from
Closed

Support batchmode with "quit" flag on #29

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95f820a
Fix creating assets during asset import
VMaldecoasago Jul 4, 2024
a2e4e31
Prevent assets postprocessor from resetting packages right before the…
VMaldecoasago Jul 5, 2024
6b9c8f3
Prevent successive OnPostProcess initializing ApplePluginEnvironment …
VMaldecoasago Jul 8, 2024
06244e1
When in batchmode, call OnEditorUpdate from the main thread
VMaldecoasago Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions plug-ins/Apple.Core/Apple.Core_Unity/Assets/Apple.Core/Editor/ApplePlugInEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using UnityEditor.PackageManager;
using UnityEditor.PackageManager.Requests;
using UnityEngine;
using System.Threading;

namespace Apple.Core
{
Expand Down Expand Up @@ -38,9 +39,8 @@ static ApplePlatformID()
}
}

[InitializeOnLoad]
public static class ApplePlugInEnvironment
{
public class ApplePlugInEnvironment : AssetPostprocessor
{
/// <summary>
/// Name of the folder that the Apple Unity Plug-Ins will use for storing permanent data assets and helper objects
/// </summary>
Expand Down Expand Up @@ -106,6 +106,7 @@ public static class ApplePlugInEnvironment
/// </summary>
private enum UpdateState
{
NotInitialized,
Initializing,
Updating
}
Expand All @@ -129,10 +130,14 @@ private enum UpdateState
private static string _trackedApplePlatform;

/// <summary>
/// Static constructor used by Unity for initialization of the ApplePlugInEnvironment.
/// Initialize the ApplePlugInEnvironment after all assets finished processing, so we can alter our own.
/// </summary>
static ApplePlugInEnvironment()
private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths, bool didDomainReload)
{
if (_updateState != UpdateState.NotInitialized) { return; }

_updateState = UpdateState.Initializing;

// Ensure that the necessary Apple Unity Plug-In support folders exist and let user know if any have been created.
string createFolderMessage = "[Apple Unity Plug-ins] Creating support folders:\n";
bool foldersCreated = false;
Expand Down Expand Up @@ -171,12 +176,23 @@ static ApplePlugInEnvironment()
_packageManagerListRequest = Client.List();

// Initialize state tracking
_updateState = UpdateState.Initializing;
_trackedAppleConfig = GetAppleBuildConfig();
_trackedApplePlatform = GetApplePlatformID(EditorUserBuildSettings.activeBuildTarget);

EditorApplication.update += OnEditorUpdate;
Events.registeringPackages += OnPackageManagerRegistrationUpdate;

if (Application.isBatchMode) {
// when in -batchmode -quit, EditorUpdate is not called, so we have to
// lock the main thread until the packages are downloaded
static long nowMilis() => DateTimeOffset.Now.ToUnixTimeMilliseconds();
long start = nowMilis();
const long timeout = 10000;
while (_updateState != UpdateState.Updating && nowMilis() - start < timeout) {
Thread.Sleep(100);
OnEditorUpdate();
}
}
}

/// <summary>
Expand Down