From e6735fd5266b07bed8cc7ac382ff8874234df82e Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sat, 8 Mar 2025 04:04:41 +0700 Subject: [PATCH 1/2] fix Unity deprecation warnings --- .../FTEditor/Editors/SwfManagerEditor.cs | 2 +- .../Postprocessors/SwfAssetPostprocessor.cs | 2 +- .../Scripts/Editor/FTEditor/SwfEditorUtils.cs | 22 +++++++++++++++++ .../Scripts/FTRuntime/Internal/SwfUtils.cs | 24 +++++++++++++++++++ .../Scripts/FTRuntime/SwfManager.cs | 6 ++--- 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfManagerEditor.cs b/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfManagerEditor.cs index abf0f7f..2777a20 100644 --- a/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfManagerEditor.cs +++ b/Assets/FlashTools/Scripts/Editor/FTEditor/Editors/SwfManagerEditor.cs @@ -98,7 +98,7 @@ namespace FTEditor.Editors { void OnEnable() { _manager = target as SwfManager; - _controllers = FindObjectsOfType().ToList(); + _controllers = SwfEditorUtils.FindObjectsOfType().ToList(); } public override void OnInspectorGUI() { diff --git a/Assets/FlashTools/Scripts/Editor/FTEditor/Postprocessors/SwfAssetPostprocessor.cs b/Assets/FlashTools/Scripts/Editor/FTEditor/Postprocessors/SwfAssetPostprocessor.cs index ab97b12..98dba1f 100644 --- a/Assets/FlashTools/Scripts/Editor/FTEditor/Postprocessors/SwfAssetPostprocessor.cs +++ b/Assets/FlashTools/Scripts/Editor/FTEditor/Postprocessors/SwfAssetPostprocessor.cs @@ -507,7 +507,7 @@ namespace FTEditor.Postprocessors { static void UpdateAssetClips(SwfAsset asset) { var asset_guid = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(asset)); - var scene_clips = GameObject.FindObjectsOfType() + var scene_clips = SwfEditorUtils.FindObjectsOfType() .Where (p => p && p.clip && p.clip.AssetGUID == asset_guid) .ToList(); for ( var i = 0; i < scene_clips.Count; ++i ) { diff --git a/Assets/FlashTools/Scripts/Editor/FTEditor/SwfEditorUtils.cs b/Assets/FlashTools/Scripts/Editor/FTEditor/SwfEditorUtils.cs index e181fbf..eff4278 100644 --- a/Assets/FlashTools/Scripts/Editor/FTEditor/SwfEditorUtils.cs +++ b/Assets/FlashTools/Scripts/Editor/FTEditor/SwfEditorUtils.cs @@ -15,6 +15,28 @@ using FTRuntime; namespace FTEditor { static class SwfEditorUtils { + // --------------------------------------------------------------------- + // + // Compatibility + // + // --------------------------------------------------------------------- + + public static T FindObjectOfType() where T : Object { + #if UNITY_2021_3_OR_NEWER + return Object.FindAnyObjectByType(); + #else + return Object.FindObjectOfType(); + #endif + } + + public static T[] FindObjectsOfType() where T : Object { + #if UNITY_2021_3_OR_NEWER + return Object.FindObjectsByType(FindObjectsSortMode.None); + #else + return Object.FindObjectsOfType(); + #endif + } + // --------------------------------------------------------------------- // // Packing diff --git a/Assets/FlashTools/Scripts/FTRuntime/Internal/SwfUtils.cs b/Assets/FlashTools/Scripts/FTRuntime/Internal/SwfUtils.cs index df65a6e..6704bd2 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/Internal/SwfUtils.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/Internal/SwfUtils.cs @@ -71,6 +71,30 @@ namespace FTRuntime.Internal { return comp; } + // + // FindObjectOfType + // + + public static T FindObjectOfType() where T : Object { + #if UNITY_2021_3_OR_NEWER + return Object.FindAnyObjectByType(); + #else + return Object.FindObjectOfType(); + #endif + } + + // + // FindObjectsOfType + // + + public static T[] FindObjectsOfType() where T : Object { + #if UNITY_2021_3_OR_NEWER + return Object.FindObjectsByType(FindObjectsSortMode.None); + #else + return Object.FindObjectsOfType(); + #endif + } + // // FillGeneratedMesh // diff --git a/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs b/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs index 7de3ed9..7794a19 100644 --- a/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs +++ b/Assets/FlashTools/Scripts/FTRuntime/SwfManager.cs @@ -32,7 +32,7 @@ namespace FTRuntime { /// If set to true allow create public static SwfManager GetInstance(bool allow_create) { if ( !_instance ) { - _instance = FindObjectOfType(); + _instance = SwfUtils.FindObjectOfType(); if ( allow_create && !_instance ) { var go = new GameObject("[SwfManager]"); _instance = go.AddComponent(); @@ -238,7 +238,7 @@ namespace FTRuntime { } void GrabEnabledClips() { - var clips = FindObjectsOfType(); + var clips = SwfUtils.FindObjectsOfType(); for ( int i = 0, e = clips.Length; i < e; ++i ) { var clip = clips[i]; if ( clip.enabled ) { @@ -248,7 +248,7 @@ namespace FTRuntime { } void GrabEnabledControllers() { - var controllers = FindObjectsOfType(); + var controllers = SwfUtils.FindObjectsOfType(); for ( int i = 0, e = controllers.Length; i < e; ++i ) { var controller = controllers[i]; if ( controller.enabled ) { From ba0b96f7e57c90585a0b8fd13507fe0d11547971 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sat, 8 Mar 2025 04:16:00 +0700 Subject: [PATCH 2/2] update changelog --- Assets/FlashTools/Docs/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Assets/FlashTools/Docs/CHANGELOG.md b/Assets/FlashTools/Docs/CHANGELOG.md index 0b28fa3..e479228 100644 --- a/Assets/FlashTools/Docs/CHANGELOG.md +++ b/Assets/FlashTools/Docs/CHANGELOG.md @@ -1,3 +1,9 @@ +### Version 1.4.1 + +* Fix camera settings for the builtin deferred rendering +* Fix Unity deprecation warnings + + ### Version 1.4.0 * It's free and Open Source now!