Working on the core part.
This commit is contained in:
@@ -23,6 +23,7 @@
|
|||||||
<PackageVersion Include="Microsoft.Maui.Graphics" Version="10.0.11" />
|
<PackageVersion Include="Microsoft.Maui.Graphics" Version="10.0.11" />
|
||||||
<PackageVersion Include="Microsoft.Maui.Graphics.Skia" Version="10.0.11" />
|
<PackageVersion Include="Microsoft.Maui.Graphics.Skia" Version="10.0.11" />
|
||||||
<PackageVersion Include="PanAndZoom" Version="11.3.6" />
|
<PackageVersion Include="PanAndZoom" Version="11.3.6" />
|
||||||
|
<PackageVersion Include="SkiaSharp" Version="3.116.1" />
|
||||||
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.116.1" />
|
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.116.1" />
|
||||||
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.15" />
|
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.15" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
27
Progrart.Core/Graphics/VisualRoot.cs
Normal file
27
Progrart.Core/Graphics/VisualRoot.cs
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
using Jint.Native;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace Progrart.Core.Graphics
|
||||||
|
{
|
||||||
|
public class BaseElement
|
||||||
|
{
|
||||||
|
public JsObject? __object = null;
|
||||||
|
public virtual void Add(BaseElement element) { }
|
||||||
|
public virtual void Remove(BaseElement element) { }
|
||||||
|
public virtual void Render(RenderContext context)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
public virtual void SetProperty(string key, string value)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public class ImageRoot : BaseElement
|
||||||
|
{
|
||||||
|
}
|
||||||
|
public class VisualRoot : BaseElement
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
69
Progrart.Core/JSExecution/ProgrartExecutor.cs
Normal file
69
Progrart.Core/JSExecution/ProgrartExecutor.cs
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
using Jint;
|
||||||
|
using Jint.Native;
|
||||||
|
using Jint.Native.Function;
|
||||||
|
using Progrart.Core.Graphics;
|
||||||
|
|
||||||
|
namespace Progrart.Core.JSExecution
|
||||||
|
{
|
||||||
|
public class ProgrartExecutor
|
||||||
|
{
|
||||||
|
public ExecutionEngine engine;
|
||||||
|
public Dictionary<string, BaseElement> ObjectPool = new();
|
||||||
|
public ProgrartExecutor()
|
||||||
|
{
|
||||||
|
engine = new ExecutionEngine();
|
||||||
|
engine.Engine.SetValue("visual_root", new Func<JsObject>(() =>
|
||||||
|
{
|
||||||
|
return ProgrartFunctions.CreateVisualRoot(this);
|
||||||
|
}
|
||||||
|
));
|
||||||
|
engine.Engine.SetValue("color4", new Func<JsNumber, JsNumber, JsNumber, JsNumber, JsObject>((r, g, b, a) =>
|
||||||
|
{
|
||||||
|
return ProgrartFunctions.color(this
|
||||||
|
, r.AsNumber()
|
||||||
|
, g.AsNumber()
|
||||||
|
, b.AsNumber()
|
||||||
|
, a.AsNumber()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
));
|
||||||
|
engine.Engine.SetValue("color3", new Func<JsNumber, JsNumber, JsNumber, JsObject>((r, g, b) =>
|
||||||
|
{
|
||||||
|
return ProgrartFunctions.color(this
|
||||||
|
, r.AsNumber()
|
||||||
|
, g.AsNumber()
|
||||||
|
, b.AsNumber()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
));
|
||||||
|
}
|
||||||
|
public RenderContext RenderImage(int Scale, string script, Dictionary<string, string> arguments)
|
||||||
|
{
|
||||||
|
int width = 1;
|
||||||
|
int height = 1;
|
||||||
|
foreach (var item in arguments)
|
||||||
|
{
|
||||||
|
engine.Engine.SetValue(item.Key, item.Value);
|
||||||
|
}
|
||||||
|
if (engine.Engine.GetValue("Width") is JsNumber js_width)
|
||||||
|
{
|
||||||
|
width = (int)(js_width.AsNumber());
|
||||||
|
}
|
||||||
|
if (engine.Engine.GetValue("Height") is JsNumber js_height)
|
||||||
|
{
|
||||||
|
height = (int)(js_height.AsNumber());
|
||||||
|
}
|
||||||
|
RenderContext renderContext = new RenderContext(width * Scale, width * Scale);
|
||||||
|
ImageRoot imageRoot = new ImageRoot();
|
||||||
|
engine.Execute(script);
|
||||||
|
var img = engine.Engine.Call("main");
|
||||||
|
imageRoot.Add(ObjectPool[$"{img.Get("id")}"]);
|
||||||
|
imageRoot.Render(renderContext);
|
||||||
|
return renderContext;
|
||||||
|
}
|
||||||
|
public int RegisterObject(object obj)
|
||||||
|
{
|
||||||
|
return obj.GetHashCode();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
45
Progrart.Core/JSExecution/ProgrartFunctions.cs
Normal file
45
Progrart.Core/JSExecution/ProgrartFunctions.cs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
using Jint.Native;
|
||||||
|
using Progrart.Core.Graphics;
|
||||||
|
|
||||||
|
namespace Progrart.Core.JSExecution
|
||||||
|
{
|
||||||
|
public static class ProgrartFunctions
|
||||||
|
{
|
||||||
|
public static JsObject WrapObject(ProgrartExecutor executor, int Handle)
|
||||||
|
{
|
||||||
|
var obj = new JsObject(executor.engine.Engine);
|
||||||
|
string handle_str = $"{Handle}";
|
||||||
|
obj.Set("id", handle_str);
|
||||||
|
obj.Set("add", JsValue.FromObject(executor.engine.Engine, new Action<JsObject>((obj) =>
|
||||||
|
{
|
||||||
|
executor.ObjectPool[handle_str].Add(executor.ObjectPool[$"{obj.Get("id")}"]);
|
||||||
|
})));
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
public static JsObject color(ProgrartExecutor executor, double r, double g, double b, double a)
|
||||||
|
{
|
||||||
|
var obj = new JsObject(executor.engine.Engine);
|
||||||
|
obj.Set("r", r);
|
||||||
|
obj.Set("g", g);
|
||||||
|
obj.Set("b", b);
|
||||||
|
obj.Set("a", a);
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
public static JsObject color(ProgrartExecutor executor, double r, double g, double b)
|
||||||
|
{
|
||||||
|
var obj = new JsObject(executor.engine.Engine);
|
||||||
|
obj.Set("r", r);
|
||||||
|
obj.Set("g", g);
|
||||||
|
obj.Set("b", b);
|
||||||
|
obj.Set("a", 1);
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
public static JsObject CreateVisualRoot(ProgrartExecutor executor)
|
||||||
|
{
|
||||||
|
VisualRoot root = new();
|
||||||
|
var obj = WrapObject(executor, executor.RegisterObject(root));
|
||||||
|
root.__object = obj;
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,8 +8,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Jint" />
|
<PackageReference Include="Jint" />
|
||||||
<PackageReference Include="Microsoft.Maui.Graphics" />
|
<PackageReference Include="SkiaSharp" />
|
||||||
<PackageReference Include="Microsoft.Maui.Graphics.Skia" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,16 +1,43 @@
|
|||||||
using Microsoft.Maui.Graphics.Skia;
|
using SkiaSharp;
|
||||||
|
|
||||||
namespace Progrart.Core
|
namespace Progrart.Core
|
||||||
{
|
{
|
||||||
public class RenderContext
|
public class RenderContext
|
||||||
{
|
{
|
||||||
SkiaBitmapExportContext context;
|
public PrimitiveDrawingCore DrawingCore { get; }
|
||||||
|
|
||||||
public void Init()
|
public SKCanvas canvas { get => DrawingCore.canvas; }
|
||||||
|
public RenderContext(PrimitiveDrawingCore core)
|
||||||
{
|
{
|
||||||
|
this.DrawingCore = core;
|
||||||
|
}
|
||||||
|
|
||||||
|
public RenderContext(int W, int H)
|
||||||
|
{
|
||||||
|
DrawingCore = new PrimitiveDrawingCore(W, H);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public class PrimitiveDrawingCore : IDisposable
|
||||||
|
{
|
||||||
|
internal bool isDisposed = false;
|
||||||
|
SKSurface surface;
|
||||||
|
SKImageInfo info;
|
||||||
|
public SKCanvas canvas { get; }
|
||||||
|
public PrimitiveDrawingCore(int W, int H)
|
||||||
|
{
|
||||||
|
info = new SKImageInfo(W, H);
|
||||||
|
surface = SKSurface.Create(info);
|
||||||
|
canvas = surface.Canvas;
|
||||||
|
}
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (isDisposed) return;
|
||||||
|
//GC.SuppressFinalize(this);
|
||||||
|
isDisposed = true;
|
||||||
|
surface.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public class RenderConfig
|
public class RenderConfig
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Markup.Xaml;
|
using Avalonia.Markup.Xaml;
|
||||||
|
using Avalonia.Media;
|
||||||
|
using Avalonia.Media.Imaging;
|
||||||
using Progrart.Controls.TabSystem;
|
using Progrart.Controls.TabSystem;
|
||||||
|
using SkiaSharp;
|
||||||
|
|
||||||
namespace Progrart.Pages;
|
namespace Progrart.Pages;
|
||||||
|
|
||||||
@@ -10,6 +13,7 @@ public partial class AboutPage : UserControl,ITabPage
|
|||||||
public AboutPage()
|
public AboutPage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void BindButton(TabButton button)
|
public void BindButton(TabButton button)
|
||||||
|
|||||||
@@ -11,12 +11,6 @@
|
|||||||
x:Class="Progrart.Views.MainView">
|
x:Class="Progrart.Views.MainView">
|
||||||
|
|
||||||
<dialogHost:DialogHost Name="MainDialogHost">
|
<dialogHost:DialogHost Name="MainDialogHost">
|
||||||
<dialogHost:DialogHost.DialogContent>
|
|
||||||
<!-- put your dialog content here-->
|
|
||||||
<Grid>
|
|
||||||
<TextBlock Text="AS"/>
|
|
||||||
</Grid>
|
|
||||||
</dialogHost:DialogHost.DialogContent>
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user