aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into contextual-initialise-levels

Browse Source
This commit is contained in:
Dan Balasescu
2023-07-07 18:50:00 +09:00
committed by GitHub
parent 4ce777d4d5 d48d6230f1
commit fc3efca013
7 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Framework.iOS.props
View File

@@ -1,15 +1,20 @@
<Project>
<PropertyGroup>
<CodesignKey>iPhone Developer</CodesignKey>
<!-- Mono Interpreter resolves many AOT issues occuring on runtime,
and will be enabled by default on .NET 8+: https://github.com/dotnet/maui/issues/13019 -->
<UseInterpreter>true</UseInterpreter>
<NullabilityInfoContextSupport>true</NullabilityInfoContextSupport>
<!-- MT7091 occurs when referencing a .framework bundle that consists of a static library.
It only warns about not copying the library to the app bundle to save space,
so there's nothing to be worried about. -->
<NoWarn>$(NoWarn);MT7091</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<!-- On debug configurations, we use Mono interpreter for faster compilation. -->
<UseInterpreter>true</UseInterpreter>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<!-- On release configurations, we use AOT compiler for optimal performance. -->
<UseInterpreter>false</UseInterpreter>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'iPhone'">
<RuntimeIdentifier>ios-arm64</RuntimeIdentifier>
</PropertyGroup>

1
osu.Framework.iOS/GameApplication.cs
View File

@@ -32,6 +32,7 @@ namespace osu.Framework.iOS
game = target;
SDL.PrepareLibraryForIOS();
SDL.SDL_UIKitRunApp(0, IntPtr.Zero, main);
}

2
osu.Framework.iOS/IOSGameHost.cs
View File

@@ -44,8 +44,6 @@ namespace osu.Framework.iOS
defaultOverrides.Add(FrameworkSetting.ExecutionMode, ExecutionMode.SingleThread);
base.SetupConfig(defaultOverrides);
DebugConfig.SetValue(DebugSetting.BypassFrontToBackPass, true);
}
public override bool OnScreenKeyboardOverlapsGameWindow => true;

12
osu.Framework.iOS/IOSWindow.cs
View File

@@ -5,6 +5,7 @@ using System;
using System.Diagnostics;
using System.Drawing;
using ObjCRuntime;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Platform;
using SDL2;
@@ -60,7 +61,16 @@ namespace osu.Framework.iOS
// frame rate with multi-threaded mode turned on, but it is going to give them worse input latency
// and higher power usage.
SDL.SDL_iPhoneSetEventPump(SDL.SDL_bool.SDL_FALSE);
SDL.SDL_iPhoneSetAnimationCallback(SDLWindowHandle, 1, _ => RunFrame(), IntPtr.Zero);
SDL.SDL_iPhoneSetAnimationCallback(SDLWindowHandle, 1, runFrame, ObjectHandle.Handle);
}
[ObjCRuntime.MonoPInvokeCallback(typeof(SDL.SDL_iPhoneAnimationCallback))]
private static void runFrame(IntPtr userdata)
{
var handle = new ObjectHandle<IOSWindow>(userdata);
if (handle.GetTarget(out IOSWindow window))
window.RunFrame();
}
private void updateSafeArea()

6
osu.Framework/Configuration/FrameworkDebugConfig.cs
View File

@@ -1,13 +1,11 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
#nullable disable
namespace osu.Framework.Configuration
{
public class FrameworkDebugConfigManager : IniConfigManager<DebugSetting>
{
protected override string Filename => null;
protected override string Filename => string.Empty;
public FrameworkDebugConfigManager()
: base(null)
@@ -18,7 +16,7 @@ namespace osu.Framework.Configuration
{
base.InitialiseDefaults();
SetDefault(DebugSetting.BypassFrontToBackPass, false);
SetDefault(DebugSetting.BypassFrontToBackPass, true);
}
}

11
osu.Framework/Platform/SDL2Window.cs
View File

@@ -174,11 +174,14 @@ namespace osu.Framework.Platform
[UsedImplicitly]
private SDL.SDL_EventFilter? eventFilterDelegate;
private ObjectHandle<SDL2Window> objectHandle;
/// <summary>
/// Represents a handle to this <see cref="SDL2Window"/> instance, used for unmanaged callbacks.
/// </summary>
protected ObjectHandle<SDL2Window> ObjectHandle { get; private set; }
protected SDL2Window(GraphicsSurfaceType surfaceType)
{
objectHandle = new ObjectHandle<SDL2Window>(this, GCHandleType.Normal);
ObjectHandle = new ObjectHandle<SDL2Window>(this, GCHandleType.Normal);
if (SDL.SDL_Init(SDL.SDL_INIT_VIDEO | SDL.SDL_INIT_GAMECONTROLLER) < 0)
{
@@ -250,7 +253,7 @@ namespace osu.Framework.Platform
/// </summary>
public void Run()
{
SDL.SDL_SetEventFilter(eventFilterDelegate = eventFilter, objectHandle.Handle);
SDL.SDL_SetEventFilter(eventFilterDelegate = eventFilter, ObjectHandle.Handle);
RunMainLoop();
}
@@ -614,7 +617,7 @@ namespace osu.Framework.Platform
Close();
SDL.SDL_Quit();
objectHandle.Dispose();
ObjectHandle.Dispose();
}
}
}

4
osu.Framework/osu.Framework.csproj
View File

@@ -27,7 +27,7 @@
<PackageReference Include="ppy.ManagedBass" Version="2022.1216.0" />
<PackageReference Include="ppy.ManagedBass.Fx" Version="2022.1216.0" />
<PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />
<PackageReference Include="ppy.Veldrid" Version="4.9.3-gf4e09bb395" />
<PackageReference Include="ppy.Veldrid" Version="4.9.3-g9f8aa2931a" />
<PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-g3e4b9f196a" />
<PackageReference Include="SharpFNT" Version="2.0.0" />
<!-- Preview version of ImageSharp causes NU5104. -->
@@ -38,7 +38,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
<PackageReference Include="ppy.osuTK.NS20" Version="1.0.211" />
<PackageReference Include="StbiSharp" Version="1.1.0" />
<PackageReference Include="ppy.SDL2-CS" Version="1.0.669-alpha" />
<PackageReference Include="ppy.SDL2-CS" Version="1.0.671-alpha" />
<PackageReference Include="ppy.osu.Framework.SourceGeneration" Version="2023.619.0" />
<!-- DO NOT use ProjectReference for native packaging project.