From 0a7f5a5cdd467d0c52a654b8cd73f534ee08f59e Mon Sep 17 00:00:00 2001
From: John Alanbrook <john@pockle.world>
Date: Thu, 25 Jul 2024 10:33:51 -0500
Subject: [PATCH] add sprite sort

---
 scripts/components.js |  1 +
 scripts/engine.js     |  9 +++++----
 scripts/render.js     | 26 ++++++++++++++++++++------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/scripts/components.js b/scripts/components.js
index ae36bff..01cf31d 100644
--- a/scripts/components.js
+++ b/scripts/components.js
@@ -90,6 +90,7 @@ var sprite = {
     this.rect = fullrect;
     
     var anim = SpriteAnim.make(p);
+
     if (!anim) return;
     this.anim = anim;
     this.play();
diff --git a/scripts/engine.js b/scripts/engine.js
index cd8a9c2..6c9ec6f 100644
--- a/scripts/engine.js
+++ b/scripts/engine.js
@@ -388,7 +388,6 @@ function camscreen2world(pos)
 
 camscreen2world.doc = "Convert a view position for a camera to world."
 
-
 function screen2cam(pos)
 {
   var viewport = this.view();
@@ -430,8 +429,12 @@ prosperon.render = function()
 {
   profile.frame("world");
   render.set_camera(camera);
+  profile.frame("sprites");
   render.sprites();
+  profile.endframe();
+  profile.frame("draws");
   prosperon.draw();
+  profile.endframe();
   hudcam.size = camera.size;
   hudcam.transform.pos = [hudcam.size.x/2, hudcam.size.y/2, -100];
   render.set_camera(hudcam);
@@ -519,10 +522,8 @@ function process() {
     profile.endframe();
   }
 
-  profile.frame("window render");
-  prosperon.window_render(window.size);
-  profile.endframe();
   profile.frame("render");
+  prosperon.window_render(window.size);
   prosperon.render();
   profile.endframe();
 
diff --git a/scripts/render.js b/scripts/render.js
index 527cf19..ee9a289 100644
--- a/scripts/render.js
+++ b/scripts/render.js
@@ -492,21 +492,34 @@ render.init = function() {
   }
 }
 
-render.mixin({
-  sprites(gridsize = 1)
+render.sprites = function(gridsize = 1)
 {
+  profile.frame("bucketing");
   var sps = Object.values(allsprites);
   var sprite_buckets = {};
   for (var sprite of sps) {
-    var pp = sprite.gameobject.drawlayer.toString();
+    var pp = sprite.gameobject.drawlayer;
     sprite_buckets[pp] ??= {};
     sprite_buckets[pp][sprite.path] ??= {};
     sprite_buckets[pp][sprite.path][sprite.guid] = sprite;
+    render.sprite_hook?.(sprite);
   }
   
+  profile.endframe();
+  profile.frame("sorting");
+  var buckets = Object.entries(sprite_buckets).sort((a,b) => {
+    var na = Number(a[0]);
+    var ba = Number(b[0]);
+    if (na < ba) return -1;
+    if (na === ba) return 0;
+    return 1;
+  });
+  profile.endframe();
+
+  profile.frame("drawing");
   render.use_shader(spritessboshader);
-  for (var bucket of Object.values(sprite_buckets)){
-    for (var img of Object.values(bucket)) {
+  for (var bucket of buckets) {
+    for (var img of Object.values(bucket[1])) {
        var sparray = Object.values(img);
        if (sparray.length === 0) continue;
        var ss = sparray[0];
@@ -515,7 +528,8 @@ render.mixin({
        render.draw(shape.quad, sprite_ssbo, sparray.length);
     }
   }
-}});
+  profile.endframe();
+}
 
 render.circle = function(pos, radius, color) {
   check_flush();