ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix NET14 Spans defaulting to ReadOnlySpan

Browse source
This commit is contained in:
MidoriKami 2025-11-30 12:48:49 -08:00
parent c9276b1771
commit d47a41b295
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.DragScalar.cs
View file

@ -238,7 +238,7 @@ public static unsafe partial class ImGui
ImGuiSliderFlags flags = ImGuiSliderFlags.None) => DragScalar( ImGuiSliderFlags flags = ImGuiSliderFlags.None) => DragScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector2, float>(new(ref v)), MemoryMarshal.Cast<Vector2, float>(new Span<Vector2>(ref v)),
vSpeed, vSpeed,
vMin, vMin,
vMax, vMax,
@ -251,7 +251,7 @@ public static unsafe partial class ImGui
ImGuiSliderFlags flags = ImGuiSliderFlags.None) => DragScalar( ImGuiSliderFlags flags = ImGuiSliderFlags.None) => DragScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector3, float>(new(ref v)), MemoryMarshal.Cast<Vector3, float>(new Span<Vector3>(ref v)),
vSpeed, vSpeed,
vMin, vMin,
vMax, vMax,
@ -264,7 +264,7 @@ public static unsafe partial class ImGui
ImGuiSliderFlags flags = ImGuiSliderFlags.None) => DragScalar( ImGuiSliderFlags flags = ImGuiSliderFlags.None) => DragScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector4, float>(new(ref v)), MemoryMarshal.Cast<Vector4, float>(new Span<Vector4>(ref v)),
vSpeed, vSpeed,
vMin, vMin,
vMax, vMax,

6
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.InputScalar.cs
View file

@ -205,7 +205,7 @@ public static unsafe partial class ImGui
InputScalar( InputScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector2, float>(new(ref data)), MemoryMarshal.Cast<Vector2, float>(new Span<Vector2>(ref data)),
step, step,
stepFast, stepFast,
format.MoveOrDefault("%.3f"u8), format.MoveOrDefault("%.3f"u8),
@ -219,7 +219,7 @@ public static unsafe partial class ImGui
InputScalar( InputScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector3, float>(new(ref data)), MemoryMarshal.Cast<Vector3, float>(new Span<Vector3>(ref data)),
step, step,
stepFast, stepFast,
format.MoveOrDefault("%.3f"u8), format.MoveOrDefault("%.3f"u8),
@ -233,7 +233,7 @@ public static unsafe partial class ImGui
InputScalar( InputScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector4, float>(new(ref data)), MemoryMarshal.Cast<Vector4, float>(new Span<Vector4>(ref data)),
step, step,
stepFast, stepFast,
format.MoveOrDefault("%.3f"u8), format.MoveOrDefault("%.3f"u8),

6
imgui/Dalamud.Bindings.ImGui/Custom/ImGui.SliderScalar.cs
View file

@ -210,7 +210,7 @@ public static unsafe partial class ImGui
ImU8String format = default, ImGuiSliderFlags flags = ImGuiSliderFlags.None) => SliderScalar( ImU8String format = default, ImGuiSliderFlags flags = ImGuiSliderFlags.None) => SliderScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector2, float>(new(ref v)), MemoryMarshal.Cast<Vector2, float>(new Span<Vector2>(ref v)),
vMin, vMin,
vMax, vMax,
format.MoveOrDefault("%.3f"u8), format.MoveOrDefault("%.3f"u8),
@ -222,7 +222,7 @@ public static unsafe partial class ImGui
SliderScalar( SliderScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector3, float>(new(ref v)), MemoryMarshal.Cast<Vector3, float>(new Span<Vector3>(ref v)),
vMin, vMin,
vMax, vMax,
format.MoveOrDefault("%.3f"u8), format.MoveOrDefault("%.3f"u8),
@ -236,7 +236,7 @@ public static unsafe partial class ImGui
SliderScalar( SliderScalar(
label, label,
ImGuiDataType.Float, ImGuiDataType.Float,
MemoryMarshal.Cast<Vector4, float>(new(ref v)), MemoryMarshal.Cast<Vector4, float>(new Span<Vector4>(ref v)),
vMin, vMin,
vMax, vMax,
format.MoveOrDefault("%.3f"u8), format.MoveOrDefault("%.3f"u8),

4
imgui/Dalamud.Bindings.ImGui/ImU8String.cs
View file

@ -156,7 +156,7 @@ public ref struct ImU8String
return this.rentedBuffer is { } buf return this.rentedBuffer is { } buf
? buf.AsSpan() ? buf.AsSpan()
: MemoryMarshal.Cast<FixedBufferContainer, byte>(new(ref Unsafe.AsRef(ref this.fixedBuffer))); : MemoryMarshal.Cast<FixedBufferContainer, byte>(new Span<FixedBufferContainer>(ref Unsafe.AsRef(ref this.fixedBuffer)));
} }
} }
@ -165,7 +165,7 @@ public ref struct ImU8String
private ref byte FixedBufferByteRef => ref this.FixedBufferSpan[0]; private ref byte FixedBufferByteRef => ref this.FixedBufferSpan[0];
private Span<byte> FixedBufferSpan => private Span<byte> FixedBufferSpan =>
MemoryMarshal.Cast<FixedBufferContainer, byte>(new(ref Unsafe.AsRef(ref this.fixedBuffer))); MemoryMarshal.Cast<FixedBufferContainer, byte>(new Span<FixedBufferContainer>(ref Unsafe.AsRef(ref this.fixedBuffer)));
public static implicit operator ImU8String(ReadOnlySpan<byte> text) => new(text); public static implicit operator ImU8String(ReadOnlySpan<byte> text) => new(text);
public static implicit operator ImU8String(ReadOnlyMemory<byte> text) => new(text); public static implicit operator ImU8String(ReadOnlyMemory<byte> text) => new(text);