shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-22 18:02:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dithering revamp

Browse source
This commit is contained in:
Michael 2017-05-12 20:32:28 -04:00
parent bded9d1250
commit c18c0fbc32
6 changed files with 123 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShiftOS.WinForms/Applications/Shifter.cs
View file

@ -139,10 +139,7 @@ namespace ShiftOS.WinForms.Applications
pnldesktoppreview.BackColor = Color.FromArgb(LoadedSkin.DesktopColor.R, LoadedSkin.DesktopColor.G, LoadedSkin.DesktopColor.B);
//Not doing this will cause an ArgumentException.
DitheringEngine.DitherImage(SkinEngine.GetImage("desktopbackground"), new Action<Image>((img) =>
{
pnldesktoppreview.BackgroundImage = img;
}));
pnldesktoppreview.BackgroundImage = SkinEngine.GetImage("desktopbackground");
pnldesktoppreview.BackgroundImageLayout = GetImageLayout("desktopbackground");
desktoppanel.BackColor = LoadedSkin.DesktopPanelColor;

1
ShiftOS.WinForms/Program.cs
View file

@ -49,6 +49,7 @@ namespace ShiftOS.WinForms
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
//if ANYONE puts code before those two winforms config lines they will be declared a drunky. - Michael
SkinEngine.SetPostProcessor(new DitheringSkinPostProcessor());
SaveSystem.PreDigitalSocietyConnection += () =>
{
Action completed = null;

195
ShiftOS.WinForms/Tools/DitheringEngine.cs
View file

@ -33,6 +33,7 @@ using System.Drawing;
using System.Threading;
using ShiftOS.Engine;
using System.Runtime.InteropServices;
using System.IO;
namespace ShiftOS.WinForms.Tools
{
@ -101,7 +102,7 @@ namespace ShiftOS.WinForms.Tools
}
}
public static void DitherColor(Color source, int width, int height, Action<Image> result)
public static Image DitherColor(Color source, int width, int height)
{
var bmp = new Bitmap(width + 1, height + 1);
var data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
@ -115,7 +116,7 @@ namespace ShiftOS.WinForms.Tools
}
Marshal.Copy(rgb, 0, data.Scan0, rgb.Length);
bmp.UnlockBits(data);
DitherImage(bmp, result);
return DitherImage(bmp);
}
@ -226,15 +227,8 @@ namespace ShiftOS.WinForms.Tools
#endif
#if FLOYDSTEINBERG
public static void DitherImage(Image source, Action<Image> result)
public static Image DitherImage(Image source)
{
if (source == null)
{
result?.Invoke(source);
return;
}
var bmp = new Bitmap(source.Width, source.Height);
var sourceBmp = (Bitmap)source;
var sourceLck = sourceBmp.LockBits(new Rectangle(0, 0, sourceBmp.Width, sourceBmp.Height), System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
@ -267,121 +261,80 @@ namespace ShiftOS.WinForms.Tools
bool color_depth_floydsteinberg = Shiftorium.UpgradeInstalled("color_depth_floyd-steinberg_dithering");
bool dithering = Shiftorium.UpgradeInstalled("color_depth_dithering");
for (int y = 0; y < (destLck.Height); y++)
if (!sixteenBits)
{
for (int x = 0; x < (Math.Abs(destLck.Stride)); x += 3)
if (dithering == true)
{
int i = getIndexFromXY(x, y, width);
byte red = sourceArr[i];
byte green = sourceArr[i + 1];
byte blue = sourceArr[i + 2];
Color oldc = Color.FromArgb(red, green, blue);
Color newc;
if (sixteenBits)
if (false == true)
{
newc = GetColor(oldc);
}
else
{
int gray = ((oldc.R + oldc.G + oldc.B) / 3);
byte newgray = 0;
if (dithering && !color_depth_floydsteinberg)
gray += error_r;
if (eightBits)
int error = 0;
for (int i = 0; i < destArr.Length; i += 3)
{
newgray = (byte)gray;
error_r = 0;
}
else if(sixBits)
{
newgray = (byte)(linear(gray, 0, 0xFF, 0, 0x3F) * 3);
error_r = newgray - gray;
}
else if (fourBits)
{
newgray = (byte)(linear(gray, 0, 0xFF, 0, 0xF) * 0xF);
error_r = newgray - gray;
}
else if (twoBits)
{
if (gray >= 191)
newgray = 0xFF;
else if (gray >= 127)
newgray = Color.LightGray.R;
else if (gray >= 64)
newgray = Color.DarkGray.R;
else
newgray = 0x00;
error_r = newgray - gray;
}
else
{
if (gray >= 127)
newgray = 0xFF;
else
newgray = 0x00;
error_r = newgray - gray;
}
newc = Color.FromArgb(newgray, newgray, newgray);
}
byte r = sourceArr[i];
byte g = sourceArr[i + 1];
byte b = sourceArr[i + 2];
int nextIndex = getIndexFromXY(x + 3, y, width);
int nextRow = getIndexFromXY(x, y + 1, width);
int nextIndexOnNextRow = getIndexFromXY(x + 3, y + 1, width);
int prevIndexOnNextRow = getIndexFromXY(x - 3, y + 1, width);
grays[i] = newc.R;
grays[i + 1] = newc.G;
grays[i + 2] = newc.B;
if (dithering)
{
if (color_depth_floydsteinberg)
{
if (x + 3 < width)
int gray = (((r + g + b) / 3) + error);
int newgray = gray;
if (!eightBits)
{
sourceArr[nextIndex] += (byte)((error_r * 7) / 16);
sourceArr[nextIndex + 1] += (byte)((error_r * 7) / 16);
sourceArr[nextIndex + 2] += (byte)((error_r * 7) / 16);
if (sixBits)
{
newgray = gray >> 2;
}
else
{
if (fourBits)
{
newgray = (int)linear(gray, 0, 255, 0, 63) * 4;
}
else
{
if (twoBits)
{
if (gray > 127 + 63)
{
newgray = 255;
}
else if (gray > 127)
newgray = 127 + 63;
else if (gray > 63)
{
newgray = 127;
}
else if (gray > 0)
newgray = 63;
else
newgray = 0;
}
else
{
if (gray > 127)
newgray = 255;
else
newgray = 0;
}
}
}
}
if (y + 1 < height)
{
sourceArr[nextRow] += (byte)((error_r) / 16);
sourceArr[nextRow + 1] += (byte)((error_r) / 16);
sourceArr[nextRow + 2] += (byte)((error_r) / 16);
}
if (x + 3 < width && y + 1 < height)
{
sourceArr[nextIndexOnNextRow] += (byte)((error_r * 3) / 16);
sourceArr[nextIndexOnNextRow + 1] += (byte)((error_r * 3) / 16);
sourceArr[nextIndexOnNextRow + 2] += (byte)((error_r * 3) / 16);
if (newgray > 255)
newgray = 255;
if (newgray < 0)
newgray = 0;
error = gray - newgray;
destArr[i] = (byte)newgray;
destArr[i+1] = (byte)newgray;
destArr[i+2] = (byte)newgray;
}
if (x - 3 > 0 && y + 1 < height)
{
sourceArr[prevIndexOnNextRow] += (byte)((error_r * 5) / 16);
sourceArr[prevIndexOnNextRow + 1] += (byte)((error_r * 5) / 16);
sourceArr[prevIndexOnNextRow + 2] += (byte)((error_r * 5) / 16);
}
}
}
}
}
for (int i = 0; i < destArr.Length - 3; i++)
{
destArr[i] = grays[i];
}
Marshal.Copy(destArr, 0, destPtr, destBytes);
@ -389,8 +342,7 @@ namespace ShiftOS.WinForms.Tools
Desktop.InvokeOnWorkerThread(new Action(() => { result?.Invoke(bmp); }));
return bmp;
}
#endif
@ -399,4 +351,25 @@ namespace ShiftOS.WinForms.Tools
return (width * y) + x;
}
}
public class DitheringSkinPostProcessor : ISkinPostProcessor
{
public byte[] ProcessImage(byte[] original)
{
try
{
var img = SkinEngine.ImageFromBinary(original);
var dithered = DitheringEngine.DitherImage(img);
using (var mstr = new MemoryStream())
{
dithered.Save(mstr, System.Drawing.Imaging.ImageFormat.Bmp);
return mstr.ToArray();
}
}
catch
{
return original;
}
}
}
}

5
ShiftOS.WinForms/WinformsDesktop.cs
View file

@ -390,10 +390,7 @@ namespace ShiftOS.WinForms
this.BackColor = Color.FromArgb(LoadedSkin.DesktopColor.R, LoadedSkin.DesktopColor.G, LoadedSkin.DesktopColor.B);
//Not doing this will cause an ArgumentException.
DitheringEngine.DitherImage(SkinEngine.GetImage("desktopbackground"), new Action<Image>((img) =>
{
this.BackgroundImage = img;
}));
this.BackgroundImage = SkinEngine.GetImage("desktopbackground");
this.BackgroundImageLayout = GetImageLayout("desktopbackground");
desktoppanel.BackColor = LoadedSkin.DesktopPanelColor;

17
ShiftOS_TheReturn/Commands.cs
View file

@ -233,6 +233,23 @@ namespace ShiftOS.Engine
[Namespace("dev")]
public static class ShiftOSDevCommands
{
[Command("buy")]
public static bool UnlockUpgrade(Dictionary<string, object> args)
{
string upg = args["id"].ToString();
try
{
SaveSystem.CurrentSave.Upgrades[upg] = true;
Shiftorium.InvokeUpgradeInstalled();
SaveSystem.SaveGame();
}
catch
{
Console.WriteLine("Upgrade not found.");
}
return true;
}
[Command("rock", description = "A little surprise for unstable builds...")]
public static bool ThrowASandwichingRock()
{

19
ShiftOS_TheReturn/Skinning.cs
View file

@ -66,6 +66,13 @@ namespace ShiftOS.Engine
public static class SkinEngine
{
private static ISkinPostProcessor processor = null;
public static void SetPostProcessor(ISkinPostProcessor _processor)
{
processor = _processor;
}
public static ImageLayout GetImageLayout(string img)
{
if (LoadedSkin.SkinImageLayouts.ContainsKey(img))
@ -93,6 +100,8 @@ namespace ShiftOS.Engine
if (iattr.Name == img)
{
byte[] image = (byte[])field.GetValue(LoadedSkin);
if (processor != null)
image = processor.ProcessImage(image);
return ImageFromBinary(image);
}
}
@ -1323,6 +1332,16 @@ namespace ShiftOS.Engine
public string Category { get; set; }
}
public interface ISkinPostProcessor
{
/// <summary>
/// Perform algorithmic operations at the bit level on a ShiftOS skin image.
/// </summary>
/// <param name="original">The image, as loaded by the engine, as a 32-bit ARGB byte array.</param>
/// <returns>The processed image.</returns>
byte[] ProcessImage(byte[] original);
}
public class ShifterMetaAttribute : Attribute
{