ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Material editor: tweak colorset highlighting

Browse source 
Make the frequency framerate-independent, set it to 1 Hz, and decrease the dynamic range.

Thanks @StoiaCode for feedback!
This commit is contained in:
Exter-N 2023-08-30 01:14:20 +02:00
parent ffb8f0e8d3
commit bb8d9441f4
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.MtrlTab.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
@ -74,7 +75,7 @@ public partial class ModEditWindow
public readonly List<LiveMaterialPreviewer> MaterialPreviewers = new(4); public readonly List<LiveMaterialPreviewer> MaterialPreviewers = new(4);
public readonly List<LiveColorSetPreviewer> ColorSetPreviewers = new(4); public readonly List<LiveColorSetPreviewer> ColorSetPreviewers = new(4);
public int HighlightedColorSetRow = -1; public int HighlightedColorSetRow = -1;
public int HighlightTime = -1; public readonly Stopwatch HighlightTime = new();
public FullPath FindAssociatedShpk( out string defaultPath, out Utf8GamePath defaultGamePath ) public FullPath FindAssociatedShpk( out string defaultPath, out Utf8GamePath defaultGamePath )
{ {
@ -546,8 +547,11 @@ public partial class ModEditWindow
{ {
var oldRowIdx = HighlightedColorSetRow; var oldRowIdx = HighlightedColorSetRow;
HighlightedColorSetRow = rowIdx; if (HighlightedColorSetRow != rowIdx)
HighlightTime = (HighlightTime + 1) % 32; {
HighlightedColorSetRow = rowIdx;
HighlightTime.Restart();
}
if (oldRowIdx >= 0) if (oldRowIdx >= 0)
UpdateColorSetRowPreview(oldRowIdx); UpdateColorSetRowPreview(oldRowIdx);
@ -560,7 +564,7 @@ public partial class ModEditWindow
var rowIdx = HighlightedColorSetRow; var rowIdx = HighlightedColorSetRow;
HighlightedColorSetRow = -1; HighlightedColorSetRow = -1;
HighlightTime = -1; HighlightTime.Reset();
if (rowIdx >= 0) if (rowIdx >= 0)
UpdateColorSetRowPreview(rowIdx); UpdateColorSetRowPreview(rowIdx);
@ -588,7 +592,7 @@ public partial class ModEditWindow
} }
if (HighlightedColorSetRow == rowIdx) if (HighlightedColorSetRow == rowIdx)
ApplyHighlight(ref row, HighlightTime); ApplyHighlight(ref row, (float)HighlightTime.Elapsed.TotalSeconds);
foreach (var previewer in ColorSetPreviewers) foreach (var previewer in ColorSetPreviewers)
{ {
@ -625,7 +629,7 @@ public partial class ModEditWindow
} }
if (HighlightedColorSetRow >= 0) if (HighlightedColorSetRow >= 0)
ApplyHighlight(ref rows[HighlightedColorSetRow], HighlightTime); ApplyHighlight(ref rows[HighlightedColorSetRow], (float)HighlightTime.Elapsed.TotalSeconds);
foreach (var previewer in ColorSetPreviewers) foreach (var previewer in ColorSetPreviewers)
{ {
@ -634,9 +638,9 @@ public partial class ModEditWindow
} }
} }
private static void ApplyHighlight(ref MtrlFile.ColorSet.Row row, int time) private static void ApplyHighlight(ref MtrlFile.ColorSet.Row row, float time)
{ {
var level = Math.Sin(time * Math.PI / 16) * 0.5 + 0.5; var level = Math.Sin(time * 2.0 * Math.PI) * 0.25 + 0.5;
var levelSq = (float)(level * level); var levelSq = (float)(level * level);
row.Diffuse = Vector3.Zero; row.Diffuse = Vector3.Zero;