creeperlv/Progrart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linear gradient is now working.

Browse Source
This commit is contained in:
Creeper Lv
2026-01-24 01:14:58 +11:00
parent 14de38a329
commit 48e7e54db3
18 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Progrart.Core/JSExecution/ProgrartConversion.cs
View File

@@ -42,7 +42,7 @@ namespace Progrart.Core.JSExecution
}
return new SKColorF(r, g, b, a);
}
public static SKShader? ObtainFromJsObject(JsObject jsObject)
public static SKShader? ObtainFromJsObject(RenderContext context, JsObject jsObject)
{
var type_str = jsObject.Get("Type").AsString();
if (Enum.TryParse<ShaderType>(type_str, out var type))
@@ -55,21 +55,16 @@ namespace Progrart.Core.JSExecution
var sy = (float)jsObject.Get("Start").Get("y").AsNumber();
var ex = (float)jsObject.Get("End").Get("x").AsNumber();
var ey = (float)jsObject.Get("End").Get("y").AsNumber();
var s = context.TranslatePoint(sx, sy);
var e = context.TranslatePoint(ex, ey);
SKColor C0 = SKColors.Black;
SKColor C1 = SKColors.White;
float p0 = 0;
float p1 = 1;
if (jsObject.Get("Colors") is JsArray color_array)
{
if (color_array[0] is JsObject c0)
if (color_array[1] is JsObject c1)
{
C0 = (SKColor)ObtainSKColorFFromJsObject(c0);
C1 = (SKColor)ObtainSKColorFFromJsObject(c1);
}
}
if (jsObject.Get("ColorStart") is JsObject colorStart)
C0 = (SKColor)ObtainSKColorFFromJsObject(colorStart);
if (jsObject.Get("ColorEnd") is JsObject colorEnd)
C1 = (SKColor)ObtainSKColorFFromJsObject(colorEnd);
if (jsObject.Get("Positions") is JsArray pos_array)
{
if (pos_array[0] is JsNumber P0)
@@ -81,7 +76,7 @@ namespace Progrart.Core.JSExecution
}
var TileMode_str = jsObject.Get("TileMode").AsString();
if (Enum.TryParse<SKShaderTileMode>(TileMode_str, out var SKShaderTileMode))
return SKShader.CreateLinearGradient(new SKPoint(sx, sy), new SKPoint(ex, ey),
return SKShader.CreateLinearGradient(s, e,
[C0, C1], [p0, p1], SKShaderTileMode);
}
break;
@@ -89,6 +84,7 @@ namespace Progrart.Core.JSExecution
{
var sx = (float)jsObject.Get("Center").Get("x").AsNumber();
var sy = (float)jsObject.Get("Center").Get("y").AsNumber();
var s = context.TranslatePoint(sx, sy);
var radius = (float)jsObject.Get("Radius").AsNumber();
SKColor C0 = SKColors.Black;
SKColor C1 = SKColors.White;
@@ -116,7 +112,7 @@ namespace Progrart.Core.JSExecution
}
var TileMode_str = jsObject.Get("TileMode").AsString();
if (Enum.TryParse<SKShaderTileMode>(TileMode_str, out var SKShaderTileMode))
return SKShader.CreateRadialGradient(new SKPoint(sx, sy), radius,
return SKShader.CreateRadialGradient(s, radius,
[C0, C1], [p0, p1], SKShaderTileMode);
}
break;

1
Progrart.Core/JSExecution/ProgrartExecutor.cs
View File

@@ -65,6 +65,7 @@ namespace Progrart.Core.JSExecution
engine.Engine.SetValue("piximage", piximage);
engine.Engine.SetValue("piximg", piximage);
engine.Engine.SetValue("color3", color3);
engine.Engine.SetValue("color4", color4);
engine.Engine.SetValue("text", text);
engine.Engine.SetValue("color_hex", color_hex);
engine.Engine.SetValue("linear_gradient", linear_gradient);

9
Progrart.Core/JSExecution/ProgrartFunctions.cs
View File

@@ -47,11 +47,10 @@ namespace Progrart.Core.JSExecution
obj.Set("End", point);
}
{
obj.Set("Colors", new JsArray(engine, [
color(engine, 1, 1, 1, 1) ,
color(engine, 1, 1, 1, 1)
]
));
obj.Set("ColorStart", color(engine, 1, 1, 1, 1));
}
{
obj.Set("ColorEnd", color(engine, 1, 1, 1, 1));
}
{
obj.Set("Positions", new JsArray(engine, new[] { new JsNumber(0), new JsNumber(1) }));