Added Rectangle to the shapes.

Added a shortcurt "Ctrl+Shift+Space" to open menu.
This commit is contained in:
Creeper Lv
2025-12-30 00:51:01 +11:00
parent 25efa1127f
commit 2eb59564b4
12 changed files with 275 additions and 111 deletions

View File

@@ -1,7 +1,87 @@
namespace Progrart.Core.Graphics
using Jint;
using Jint.Native;
using Progrart.Core.JSExecution;
using SkiaSharp;
using System.Diagnostics;
namespace Progrart.Core.Graphics
{
public class Rectangle : BaseElement
{
float StrokeWidth;
SKPoint Start;
SKPoint Size;
SKColorF Color;
SKShader? shader = null;
public override void SetupProperties(Engine engine)
{
base.SetupProperties(engine);
if (__object != null)
{
{
JsObject point = new JsObject(engine);
point.Set("x", 0);
point.Set("y", 0);
__object.Set("Position", point);
}
__object.Set("StrokeWidth", 1);
__object.Set("Color", ProgrartFunctions.color(engine, 1, 1, 1, 1));
{
JsObject point = new JsObject(engine);
point.Set("x", 0);
point.Set("y", 0);
__object.Set("Size", point);
}
}
}
public override void LoadProperties()
{
if (__object is not null)
{
StrokeWidth = (float)__object.Get("StrokeWidth").AsNumber();
{
if (__object.Get("Position") is JsObject Start)
{
this.Start = ProgrartConversion.ObtainSKPointFromJsObject(Start);
}
}
{
if (__object.Get("Size") is JsObject End)
{
this.Size = ProgrartConversion.ObtainSKPointFromJsObject(End);
}
}
{
if (__object.Get("Color") is JsObject Color)
{
this.Color = ProgrartConversion.ObtainSKColorFFromJsObject(Color);
}
}
if (__object.Get("Shader") is JsObject shaderObj)
shader = ProgrartConversion.ObtainFromJsObject(shaderObj);
}
}
public override void Render(RenderContext context)
{
base.Render(context);
LoadProperties();
SKPoint FinalStartPos = context.TranslatePoint(Start);
SKPoint FinalEndPos = context.TranslatePoint(Size);
Trace.WriteLine($"Draw Rectangle from {FinalStartPos} to {FinalEndPos} using {Color} with size of {StrokeWidth}.");
context.DrawingCore.canvas.DrawRect(
FinalStartPos.X, FinalStartPos.Y,
FinalEndPos.X, FinalEndPos.Y,
new SKPaint()
{
ColorF = Color,
StrokeWidth = StrokeWidth,
Shader = shader
}
);
}
}
}

View File

@@ -32,7 +32,6 @@ namespace Progrart.Core.JSExecution
public void Dispose()
{
Engine.Dispose();
}
}
}

View File

@@ -19,7 +19,6 @@ namespace Progrart.Core.JSExecution
}
public void SetupCalls()
{
engine.Engine.SetValue("visual_root", visual_root);
Jint.Native.Json.JsonSerializer serializer = new Jint.Native.Json.JsonSerializer(engine.Engine);
engine.Engine.SetValue("log", new Action<JsValue>((v) =>
{
@@ -30,7 +29,9 @@ namespace Progrart.Core.JSExecution
else
Trace.WriteLine(v);
}));
engine.Engine.SetValue("visual_root", visual_root);
engine.Engine.SetValue("line", line);
engine.Engine.SetValue("rectangle", rectangle);
engine.Engine.SetValue("color4", color4);
engine.Engine.SetValue("color3", color3);
engine.Engine.SetValue("linear_gradient", linear_gradient);
@@ -59,7 +60,13 @@ namespace Progrart.Core.JSExecution
}
public JsObject line()
{
return ProgrartFunctions.CreateLine(this);
//return ProgrartFunctions.CreateLine(this);
return ProgrartFunctions.CreateElement<Line>(this);
}
public JsObject rectangle()
{
//return ProgrartFunctions.CreateLine(this);
return ProgrartFunctions.CreateElement<Rectangle>(this);
}
public RenderContext RenderImage(int Scale, string script, ExecuteArguments arguments)
{

View File

@@ -118,5 +118,13 @@ namespace Progrart.Core.JSExecution
element.SetupProperties(executor.engine.Engine);
return obj;
}
public static JsObject CreateElement<T>(ProgrartExecutor executor) where T: BaseElement
{
T element=Activator.CreateInstance<T>() as T;
var obj = WrapObject(executor, executor.RegisterObject(element));
element.__object = obj;
element.SetupProperties(executor.engine.Engine);
return obj;
}
}
}