ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-21 15:27:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Libs.

Browse source
This commit is contained in:
Ottermandias 2026-01-25 00:06:30 +01:00
parent 514a8e9182
commit 753876cb9b
6 changed files with 24 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
.gitmodules vendored
View file

@ -1,20 +1,16 @@
[submodule "OtterGui"] [submodule "Penumbra.Api"]
path = OtterGui path = Penumbra.Api
url = https://github.com/Ottermandias/OtterGui.git url = https://github.com/Ottermandias/Penumbra.Api.git
branch = main
[submodule "Penumbra.String"]
path = Penumbra.String
url = https://github.com/Ottermandias/Penumbra.String.git
branch = main
[submodule "Penumbra.GameData"]
path = Penumbra.GameData
url = https://github.com/Ottermandias/Penumbra.GameData.git
branch = main
[submodule "Luna"]
path = Luna
url = git@github.com:Ottermandias/Luna.git
branch = main branch = main
[submodule "Penumbra.Api"]
path = Penumbra.Api
url = https://github.com/Ottermandias/Penumbra.Api.git
branch = main
[submodule "Penumbra.String"]
path = Penumbra.String
url = https://github.com/Ottermandias/Penumbra.String.git
branch = main
[submodule "Penumbra.GameData"]
path = Penumbra.GameData
url = https://github.com/Ottermandias/Penumbra.GameData.git
branch = main
[submodule "Luna"]
path = Luna
url = git@github.com:Ottermandias/Luna.git
branch = main

2
Luna

@ -1 +1 @@
Subproject commit 2487453cfa4e95b9dbc661ed6e7298655df3b055 Subproject commit 384b437a8cf16b4b1a51da43a4837d8fcc2116bd

1
OtterGui

@ -1 +0,0 @@
Subproject commit ff1e6543845e3b8c53a5f8b240bc38faffb1b3bf

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit be7792ea33ae0b91109fcb95360cf4f382e9bc99 Subproject commit d13caf68759521f2b89e74eae79698a5fa346ad5

6
Penumbra/Import/Textures/TextureDrawer.cs
View file

@ -2,9 +2,7 @@ using ImSharp;
using Lumina.Data.Files; using Lumina.Data.Files;
using Luna; using Luna;
using OtterTex; using OtterTex;
using Penumbra.UI;
using Penumbra.UI.Classes; using Penumbra.UI.Classes;
using VectorExtensions = Luna.VectorExtensions;
namespace Penumbra.Import.Textures; namespace Penumbra.Import.Textures;
@ -14,9 +12,9 @@ public static class TextureDrawer
{ {
if (texture.TextureWrap != null) if (texture.TextureWrap != null)
{ {
size = VectorExtensions.Contain(texture.TextureWrap.Size, size); size = texture.TextureWrap.Size.Contain(size);
Im.Image.Draw(texture.TextureWrap.Id(), size); Im.Image.Draw(texture.TextureWrap.Id, size);
DrawData(texture); DrawData(texture);
} }
else if (texture.LoadError != null) else if (texture.LoadError != null)

10
Penumbra/UI/Classes/ChangedItemDrawer.cs
View file

@ -110,11 +110,11 @@ public class ChangedItemDrawer : IDisposable, IUiService
return; return;
} }
Im.Image.Draw(icon.Id(), new Vector2(height)); Im.Image.Draw(icon.Id, new Vector2(height));
if (Im.Item.Hovered()) if (Im.Item.Hovered())
{ {
using var tt = Im.Tooltip.Begin(); using var tt = Im.Tooltip.Begin();
Im.Image.Draw(icon.Id(), new Vector2(_smallestIconWidth)); Im.Image.Draw(icon.Id, new Vector2(_smallestIconWidth));
Im.Line.Same(); Im.Line.Same();
ImEx.TextFramed(iconFlagType.ToDescription(), new Vector2(0, _smallestIconWidth), 0); ImEx.TextFramed(iconFlagType.ToDescription(), new Vector2(0, _smallestIconWidth), 0);
} }
@ -198,7 +198,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
} }
Im.Cursor.X = Im.ContentRegion.Maximum.X - size.X; Im.Cursor.X = Im.ContentRegion.Maximum.X - size.X;
Im.Image.Draw(_icons[ChangedItemFlagExtensions.AllFlags].Id(), size, Vector2.Zero, Vector2.One, Im.Image.Draw(_icons[ChangedItemFlagExtensions.AllFlags].Id, size, Vector2.Zero, Vector2.One,
typeFilter switch typeFilter switch
{ {
0 => new Vector4(0.6f, 0.3f, 0.3f, 1f), 0 => new Vector4(0.6f, 0.3f, 0.3f, 1f),
@ -218,7 +218,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
var localRet = false; var localRet = false;
var icon = _icons[type]; var icon = _icons[type];
var flag = filter.HasFlag(type); var flag = filter.HasFlag(type);
Im.Image.Draw(icon.Id(), size, Vector2.Zero, Vector2.One, flag ? Vector4.One : new Vector4(0.6f, 0.3f, 0.3f, 1f)); Im.Image.Draw(icon.Id, size, Vector2.Zero, Vector2.One, flag ? Vector4.One : new Vector4(0.6f, 0.3f, 0.3f, 1f));
if (Im.Item.Clicked()) if (Im.Item.Clicked())
{ {
filter = flag ? filter & ~type : filter | type; filter = flag ? filter & ~type : filter | type;
@ -237,7 +237,7 @@ public class ChangedItemDrawer : IDisposable, IUiService
if (Im.Item.Hovered()) if (Im.Item.Hovered())
{ {
using var tt = Im.Tooltip.Begin(); using var tt = Im.Tooltip.Begin();
Im.Image.Draw(icon.Id(), new Vector2(_smallestIconWidth)); Im.Image.Draw(icon.Id, new Vector2(_smallestIconWidth));
Im.Line.Same(); Im.Line.Same();
ImEx.TextFramed(type.ToDescription(), new Vector2(0, _smallestIconWidth), 0); ImEx.TextFramed(type.ToDescription(), new Vector2(0, _smallestIconWidth), 0);
} }