Big Update: Graphics (Part 2)

Author: CocoBox84

Junk/Files.txt

@@ -1,4 +1,4 @@
-
+Sprite Plan.txt
 
 Ok so let's build the definition of a sprite before we acually build a sprite.
 
@@ -13,7 +13,7 @@ should be a items folder. When opening a sprite in the editor this is what the e
 the root of the items folder in the sprite folder, no longer the "items" folder in the root of
 the project.
 
-So when a sprite is exported, it's just a zip file containing everthing (*.pSprite).
+So when a sprite is exported, it's just a zip file containing everything (*.pSprite).
 
 Just to be clear, what I mean by opening a sprite is selecting a sprite in the sprite manager area.
 When you do that, the explorer and editor should then show, and the workspace directory will change

Junk/JunkTextFile.txt

@@ -1,60 +1,88 @@
 using System;
 using System.Collections.Generic;
+using Avalonia;
+using Avalonia.Media.Imaging;
+using Avalonia.Platform;
 using PaintPower.Tools;
 using PaintPower.Tools.Graphics;
+using Point = PaintPower.Tools.Point;
 
 namespace PaintPower.Display.DisplayIntegration;
 
 // DIPlay or Diplay. You know, like Dip-lay, like "Display" with out the 's'. (Inspired by a typo while learning CSS)
 public class DIPlay
 {
+    // The off-screen rendering surface (your custom pixel renderer)
     public GfxPane gfxPane;
-    public static Point stageSize = new(PaintPower_Engine.App._project?.Metadata?.StageWidth, PaintPower_Engine.App._project?.Metadata?.StageHeight);
 
+    // Stage size based on project metadata
+    public static Point stageSize = new(
+        PaintPower_Engine.App._project?.Metadata?.StageWidth,
+        PaintPower_Engine.App._project?.Metadata?.StageHeight
+    );
+
+    // All renderable items (sprites, UI elements, etc.)
     public List<DIItem> items = new();
 
-    public DIPlay()
-    {
-        setStageSize();
-        gfxPane = new(stageSize.x, stageSize.y);
-    }
+    // Reference to the Stage UserControl so we can push rendered frames into it
+    private readonly VMPanel.Stage _stage;
+
+    // Animation timer (must persist across frames)
+    private int _t = 0;
 
-    public void setStageSize()
+    public DIPlay(int width, int height, VMPanel.Stage stage)
     {
-        stageSize = new(PaintPower_Engine.App._project?.Metadata?.StageWidth, PaintPower_Engine.App._project?.Metadata?.StageHeight);
+        _stage = stage;
+
+        // Create the pixel buffer with the given size
+        gfxPane = new GfxPane(width, height);
     }
 
+    // Starts the 60 FPS render loop
     public void Start()
     {
         var timer = new System.Timers.Timer(1000.0 / 60.0);
         timer.Elapsed += async (_, __) => Tick();
         timer.Start();
     }
 
+    // Main render loop — runs every frame
     public async void Tick()
     {
         var pane = gfxPane;
-        int t = 0;
 
-        await PaintPower_Engine.App.vm.Tick();
+        if (PaintPower_Engine.App.vm != null)
+        {
+
+            // Update VM logic before rendering
+            await PaintPower_Engine.App.vm.Tick();
 
+        }
+
+        // Build a list of draw commands for batching
         List<DrawCommand> batch = new();
 
         foreach (DIItem item in items)
         {
+            // Skip invisible items
             if (!item.IsVisible)
                 continue;
 
+            // Ask the item what graphic it wants to draw
             var g = item.DrawAs();
 
+            // Handle animated graphics
             if (g is GraphicAnimation anim)
             {
-                int frame = ResolveAnimationFrame(anim, t * 16);
+                // Pick the correct animation frame based on time
+                int frame = ResolveAnimationFrame(anim, _t * 16);
                 Graphic frameGraphic = anim.Frames[frame];
 
+                // Skip if off-screen
                 if (IsCulled(frameGraphic, (float)item.x, (float)item.y, item.ScaleX, item.ScaleY))
                     continue;
 
+                // Add to batch
                 batch.Add(new DrawCommand(
                     frameGraphic,
                     (float)item.x,
@@ -64,8 +92,8 @@ public async void Tick()
                     item.ScaleY,
                     item.Z
                 ));
-
             }
+            // Handle static images
             else if (g is Graphic img)
             {
                 if (IsCulled(img, (float)item.x, (float)item.y, item.ScaleX, item.ScaleY))
@@ -83,17 +111,27 @@ public async void Tick()
             }
         }
 
-        // Sort for Z-Layering
+        // Sort by Z so items draw in the correct order
         batch.Sort((a, b) => a.Z.CompareTo(b.Z));
 
+        // Clear the frame buffer
         pane.Renderer.Clear(0xFF202020);
+
+        // Draw all items in one batch
         pane.Renderer.DrawBatch(batch);
 
-        Avalonia.Threading.Dispatcher.UIThread.Post(pane.Present);
+        // Push the rendered bitmap into the Stage UI
+        Avalonia.Threading.Dispatcher.UIThread.Post(() =>
+        {
+            var bmp = CreateBitmapFromPane();
+            _stage.SetBitmap(bmp);
+        });
 
-        t++;
+        // Advance animation timer
+        _t++;
     }
 
+    // Determines whether a sprite is off-screen and can be skipped
     private bool IsCulled(Graphic g, float x, float y, float scaleX, float scaleY)
     {
         float halfW = g.Width * scaleX / 2f;
@@ -110,6 +148,7 @@ private bool IsCulled(Graphic g, float x, float y, float scaleX, float scaleY)
                top > stageSize.y;
     }
 
+    // Chooses the correct animation frame based on time
     private int ResolveAnimationFrame(GraphicAnimation anim, int timeMs)
     {
         int total = 0;
@@ -123,4 +162,17 @@ private int ResolveAnimationFrame(GraphicAnimation anim, int timeMs)
 
         return 0;
     }
-}
+
+    // Converts the raw BGRA pixel buffer into an Avalonia Bitmap
+    private Bitmap CreateBitmapFromPane()
+    {
+        return new Bitmap(
+            PixelFormat.Bgra8888,
+            AlphaFormat.Premul,
+            gfxPane.BufferPtr,   // pointer to raw BGRA data
+            new PixelSize((int)gfxPane.Width, (int)gfxPane.Height),
+            new Vector(96, 96),  // DPI
+            gfxPane.Stride
+        );
+    }
+}

Junk/Sprite plan.txt

@@ -68,8 +68,9 @@
 				<GridSplitter Grid.Row="1" Height="5" Background="#505050" ResizeDirection="Rows" ResizeBehavior="PreviousAndNext" />
 				<!-- SPRITE PROPERTIES -->
 				<Border Grid.Row="2" Background="#252525">
-					<TextBlock Text="Sprite Properties" Foreground="White" Margin="8" />
-					<!-- TODO: Replace with your SpriteProperties control -->
+					<Border Grid.Row="2" Background="#252525">
+						<sprite:SpritePropertiesView x:Name="SpriteProperties" />
+					</Border>
 				</Border>
 			</Grid>
 			<!-- SPLITTER between LEFT and CENTER -->

src/Display/DisplayIntergration/DIPlay.cs

@@ -26,7 +26,7 @@ public partial class EditorPart : EditorBase
 
     MainWindow window;
 
-    #pragma warning enable
+#pragma warning enable
 
     public EditorPart() : base()
     {
@@ -36,6 +36,12 @@ public EditorPart() : base()
 
         // Display PaintPower version:
         VersionInfoTextBlock.Text = PaintPower_Engine.version;
+
+        SpriteManager.SpriteSelected += sprite =>
+        {
+            SpriteProperties.LoadSprite(sprite);
+        };
+
     }
 
     public EditorPart attachPaintPower(PaintPower_Engine paintPower_Engine)
@@ -131,7 +137,7 @@ private async void OnLogout(object? sender, RoutedEventArgs e)
     private void OnMakeConnection(object? sender, RoutedEventArgs e)
     {
         SoundEffects.Click.Play();
-        #pragma warning disable
+#pragma warning disable
         // Enable connection to the server
         App.server.checkConnection();
     }

src/EditorPart.axaml

@@ -287,6 +287,8 @@ public virtual async void RefreshSession(bool makeNew = true)
 
         // Set up translation
         setupTranslation();
+
+        vm = new();
     }
 
     public virtual async void Start()
@@ -313,7 +315,8 @@ public virtual async void Start()
 
         // Set up translation
         setupTranslation();
-        //vm = new Vm.Vm();
+
+        vm = new();
     }
 
     /*public void OpenEditor(EditorBase editor)

src/EditorPart.axaml.cs

@@ -190,6 +190,9 @@ public void LoadSprites()
                 SpriteFolder = dir
             };
 
+            // Load sprite skins.
+            sprite.LoadSkins();
+
             Sprites.Add(sprite);
         }
     }

src/PaintPower_Engine.cs

@@ -1,8 +1,12 @@
 using PaintPower.Accessibility.Translation;
+using PaintPower.Display.DisplayIntegration;
 using PaintPower.Logging;
+using PaintPower.Sprites;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace PaintPower.ProjectSystem;
 
@@ -13,12 +17,87 @@ public class PaintSprite
 
     public string JsonPath => Path.Combine(SpriteFolder, "Sprite.json");
     public string AnimationPath => Path.Combine(SpriteFolder, "Sprite.wxa");
+
+    // Thumbnail.
     public string ThumbnailPath => Path.Combine(SpriteFolder, "Sprite.png");
     public string ScriptPath => Path.Combine(SpriteFolder, "Sprite.pss");
+
+    // NEW: Skins.xml, I guess we will link skins to files in the items folder or it's subdirectories.
+    // Please not JSON, i've been waiting for an excuse to use xml!
+    public string SkinsPath => Path.Combine(SpriteFolder, "Skins.xml");
+
+    // Files.
     public string ItemsFolder => Path.Combine(SpriteFolder, "items");
 
     public override string ToString() => Name;
 
+    // Skins //
+    public List<SkinDefinition> Skins { get; private set; } = new();
+
+    public void LoadSkins()
+    {
+        Skins.Clear();
+
+        if (!File.Exists(SkinsPath))
+            return;
+
+        var doc = XDocument.Load(SkinsPath);
+
+        foreach (var node in doc.Root.Elements("Skin"))
+        {
+            Skins.Add(new SkinDefinition
+            {
+                Name = (string)node.Attribute("name") ?? "Unnamed",
+                File = (string)node.Attribute("file") ?? ""
+            });
+        }
+    }
+
+    public void SaveSkins()
+    {
+        var doc = new XDocument(
+            new XElement("Skins",
+                Skins.Select(s =>
+                    new XElement("Skin",
+                        new XAttribute("name", s.Name),
+                        new XAttribute("file", s.File)
+                    )
+                )
+            )
+        );
+
+        doc.Save(SkinsPath);
+    }
+
+    // -----------
+    // The Bridge
+    // (Oh yeah!)
+    // -----------
+
+    public Sprite ToRuntimeSprite()
+    {
+        var runtime = new Sprite();
+
+        // Load skins
+        foreach (var skinDef in Skins)
+        {
+            string fullPath = Path.Combine(SpriteFolder, skinDef.File);
+            runtime.Skins.Add(new Skin(skinDef.Name, fullPath));
+        }
+
+        // Default to first skin
+        if (runtime.Skins.Count > 0)
+            runtime.CurrentSkinIndex = 0;
+
+        // Default position (center stage)
+        runtime.x = DIPlay.stageSize.x / 2;
+        runtime.y = DIPlay.stageSize.y / 2;
+
+        return runtime;
+    }
+
+
+
     // ---------------------------------------------------------
     // STATIC OPERATIONS (SpriteManagerView passes the sprite)
     // ---------------------------------------------------------

src/ProjectSystem/PaintProject.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace PaintPower.ProjectSystem;
+
+public class SkinDefinition
+{
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+    public string Name { get; set; }
+    public string File { get; set; }
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+
+    public override string ToString()
+    {
+        return Name;
+    }
+}