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

Rectangle now have a IsStoke property.

Browse Source 
Added math functions to ExecutionEngine.
This commit is contained in:
Creeper Lv
2026-01-05 03:57:09 +11:00
parent 970b75ab92
commit 733bae29f3
10 changed files with 180 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Progrart.Core/JSExecution/ExecutionEngine.cs
View File

@@ -1,4 +1,5 @@
using Jint;
using Jint.Native;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -6,6 +7,32 @@ using System.Text;
namespace Progrart.Core.JSExecution
{
public class MathFunctions
{
public static double abs(JsNumber v) => Math.Abs(v.AsNumber());
public static double sin(JsNumber v) => Math.Sin(v.AsNumber());
public static double cos(JsNumber v) => Math.Cos(v.AsNumber());
public static double tan(JsNumber v) => Math.Tan(v.AsNumber());
public static double tanh(JsNumber v) => Math.Tanh(v.AsNumber());
public static double asin(JsNumber v) => Math.Asin(v.AsNumber());
public static double acos(JsNumber v) => Math.Acos(v.AsNumber());
public static double atan(JsNumber v) => Math.Atan(v.AsNumber());
public static double atan2(JsNumber v, JsNumber v2) => Math.Atan2(v.AsNumber(), v2.AsNumber());
public static double atanh(JsNumber v) => Math.Atanh(v.AsNumber());
public static double sqrt(JsNumber v) => Math.Sqrt(v.AsNumber());
public static double log(JsNumber v) => Math.Log(v.AsNumber());
public static double log2(JsNumber v) => Math.Log2(v.AsNumber());
public static double log10(JsNumber v) => Math.Log10(v.AsNumber());
public static double exp(JsNumber v) => Math.Exp(v.AsNumber());
public static double ceiling(JsNumber v) => Math.Ceiling(v.AsNumber());
public static double floor(JsNumber v) => Math.Floor(v.AsNumber());
public static double log_base(JsNumber v, JsNumber v2) => Math.Log(v.AsNumber(), v2.AsNumber());
public static double pow(JsNumber v, JsNumber v2) => Math.Pow(v.AsNumber(), v2.AsNumber());
public static double round(JsNumber v) => Math.Round(v.AsNumber());
public static double sinh(JsNumber v) => Math.Sinh(v.AsNumber());
public static double cosh(JsNumber v) => Math.Cosh(v.AsNumber());
public static double cbrt(JsNumber v) => Math.Cbrt(v.AsNumber());
}
public class ExecutionEngine : IDisposable
{
public Engine Engine;
@@ -13,6 +40,28 @@ namespace Progrart.Core.JSExecution
public ExecutionEngine()
{
Engine = new Engine();
Engine.SetValue("abs", MathFunctions.abs);
Engine.SetValue("sin", MathFunctions.sin);
Engine.SetValue("cos", MathFunctions.cos);
Engine.SetValue("tan", MathFunctions.tan);
Engine.SetValue("tanh", MathFunctions.tanh);
Engine.SetValue("asin", MathFunctions.asin);
Engine.SetValue("acos", MathFunctions.acos);
Engine.SetValue("atan", MathFunctions.atan);
Engine.SetValue("atan2", MathFunctions.atan2);
Engine.SetValue("atanh", MathFunctions.atanh);
Engine.SetValue("sqrt", MathFunctions.sqrt);
Engine.SetValue("cbrt", MathFunctions.cbrt);
Engine.SetValue("pow", MathFunctions.pow);
Engine.SetValue("log", MathFunctions.log);
Engine.SetValue("log_base", MathFunctions.log_base);
Engine.SetValue("log2", MathFunctions.log2);
Engine.SetValue("log10", MathFunctions.log10);
Engine.SetValue("exp", MathFunctions.exp);
Engine.SetValue("ceiling", MathFunctions.ceiling);
Engine.SetValue("floor", MathFunctions.floor);
Engine.SetValue("sinh", MathFunctions.sinh);
Engine.SetValue("cosh", MathFunctions.cosh);
}
string formSymbol(Dictionary<string, string> symbols)
{

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

@@ -14,13 +14,13 @@ namespace Progrart.Core.JSExecution
public ExecutionEngine engine;
public Dictionary<string, object> ObjectPool = new();
public IStorageProvider StorageProvider;
public ProgrartExecutor(IStorageProvider storageProvider)
{
engine = new ExecutionEngine();
SetupCalls();
StorageProvider = storageProvider;
}
public void SetupCalls()
public ProgrartExecutor(IStorageProvider storageProvider)
{
engine = new ExecutionEngine();
SetupCalls();
StorageProvider = storageProvider;
}
public void SetupCalls()
{
Jint.Native.Json.JsonSerializer serializer = new Jint.Native.Json.JsonSerializer(engine.Engine);
engine.Engine.SetValue("log", new Action<JsValue>((v) =>
@@ -37,6 +37,7 @@ namespace Progrart.Core.JSExecution
engine.Engine.SetValue("rectangle", rectangle);
engine.Engine.SetValue("color4", color4);
engine.Engine.SetValue("color3", color3);
engine.Engine.SetValue("color_hex", color_hex);
engine.Engine.SetValue("linear_gradient", linear_gradient);
engine.Engine.SetValue("radial_gradient", radial_gradient);
}
@@ -57,6 +58,26 @@ namespace Progrart.Core.JSExecution
, b.AsNumber()
);
}
float colorFloat(byte b) => ((float)b / (float)byte.MaxValue);
public JsObject color_hex(JsString colorString)
{
byte[] bytes = Convert.FromHexString(colorString.AsString());
if (bytes.Length == 4)
return ProgrartFunctions.color(engine.Engine
, colorFloat(bytes[0])
, colorFloat(bytes[1])
, colorFloat(bytes[2])
);
else
if (bytes.Length == 3)
return ProgrartFunctions.color(engine.Engine
, colorFloat(bytes[0])
, colorFloat(bytes[1])
, colorFloat(bytes[2])
, colorFloat(bytes[3])
);
else throw new FormatException($"{colorString.AsString()} is not a recognizable color string!");
}
public JsObject visual_root()
{
return ProgrartFunctions.CreateVisualRoot(this);
@@ -85,13 +106,12 @@ namespace Progrart.Core.JSExecution
{
height = (float)(js_height.AsNumber());
}
RenderContext renderContext = new RenderContext((int)(width * Scale), (int)(width * Scale))
RenderContext renderContext = new((int)(width * Scale), (int)(width * Scale), StorageProvider)
{
LogicalW = width,
LogicalH = height
};
ImageRoot imageRoot = new ImageRoot();
var img = engine.Engine.Call("main");
if (ObjectPool[$"{img.Get("id")}"] is BaseElement element)
imageRoot.Add(element);