From 56611958f75dcbe3caa3c8a23341974555c5d1b6 Mon Sep 17 00:00:00 2001
From: "Eevee (Evelyn Woods)" <eevee.git@veekun.com>
Date: Wed, 10 Mar 2021 20:46:51 -0700
Subject: [PATCH] Draw actor facing directions in the editor (fixes #38)

---
 js/main-editor.js     |  1 +
 js/renderer-canvas.js |  2 ++
 js/tileset.js         | 41 ++++++++++++++++++++++++++++++++++++-----
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/js/main-editor.js b/js/main-editor.js
index d9d4373..c0be38b 100644
--- a/js/main-editor.js
+++ b/js/main-editor.js
@@ -3089,6 +3089,7 @@ export class Editor extends PrimaryView {
         // FIXME don't hardcode size here, convey this to renderer some other way
         this.renderer = new CanvasRenderer(this.conductor.tilesets['ll'], 32);
         this.renderer.perception = 'editor';
+        this.renderer.show_facing = true;
 
         // FIXME need this in load_level which is called even if we haven't been setup yet
         this.connections_g = mk_svg('g');
diff --git a/js/renderer-canvas.js b/js/renderer-canvas.js
index b38c5e1..7ac04b9 100644
--- a/js/renderer-canvas.js
+++ b/js/renderer-canvas.js
@@ -16,6 +16,7 @@ class CanvasRendererDrawPacket extends DrawPacket {
         this.offsety = 0;
         // Compatibility settings
         this.use_cc2_anim_speed = renderer.use_cc2_anim_speed;
+        this.show_facing = renderer.show_facing;
     }
 
     blit(tx, ty, mx = 0, my = 0, mw = 1, mh = mw, mdx = mx, mdy = my) {
@@ -60,6 +61,7 @@ export class CanvasRenderer {
         this.viewport_dirty = false;
         this.show_actor_bboxes = false;
         this.show_actor_order = false;
+        this.show_facing = false;
         this.use_rewind_effect = false;
         this.perception = 'normal';  // normal, xray, editor, palette
         this.hide_logic = false;
diff --git a/js/tileset.js b/js/tileset.js
index f5a08cd..113b3c0 100644
--- a/js/tileset.js
+++ b/js/tileset.js
@@ -15,6 +15,12 @@ export const CC2_TILESET_LAYOUT = {
     '#transparent-color': [0, 0],
     '#supported-versions': new Set(['cc1', 'cc2']),
     '#wire-width': 1/16,
+    '#editor-arrows': {
+        north: [14, 31],
+        east: [14.5, 31],
+        south: [15, 31],
+        west: [15.5, 31],
+    },
 
     door_red: [0, 1],
     door_blue: [1, 1],
@@ -1009,6 +1015,12 @@ export const LL_TILESET_LAYOUT = {
     '#dimensions': [32, 32],
     '#supported-versions': new Set(['cc1', 'cc2', 'll']),
     '#wire-width': 1/16,
+    '#editor-arrows': {
+        north: [6, 1],
+        east: [6.5, 1],
+        south: [6, 1.5],
+        west: [6.5, 1.5],
+    },
 
     // ------------------------------------------------------------------------------------------------
     // Left side: tiles
@@ -2001,6 +2013,7 @@ export class DrawPacket {
         this.clock = clock;
         this.update_progress = update_progress;
         this.update_rate = update_rate;
+        this.show_facing = false;
         // this.x
         // this.y
     }
@@ -2041,6 +2054,29 @@ export class Tileset {
         }
 
         this.draw_drawspec(drawspec, name, tile, packet);
+
+        if (packet.show_facing) {
+            this._draw_facing(name, tile, packet);
+        }
+    }
+
+    // Draw the facing direction of a tile (generally used by the editor)
+    _draw_facing(name, tile, packet) {
+        if (! (tile && tile.direction && TILE_TYPES[name].is_actor))
+            return;
+
+        // These are presumed to be half-size tiles
+        let drawspec = this.layout['#editor-arrows'];
+        if (! drawspec)
+            return;
+
+        let coords = drawspec[tile.direction];
+        let dirinfo = DIRECTIONS[tile.direction];
+
+        packet.blit(
+            ...coords, 0, 0, 0.5, 0.5,
+            0.25 + dirinfo.movement[0] * 0.25,
+            0.25 + dirinfo.movement[1] * 0.25);
     }
 
     // Draw a "standard" drawspec, which is either:
@@ -2080,11 +2116,6 @@ export class Tileset {
         else {
             frames = drawspec.south;
         }
-        // Shortcut: when drawing statically, skip all of this
-        if (! tile || packet.update_progress === 0) {
-            packet.blit(...frames[drawspec.idle_frame_index ?? 0]);
-            return;
-        }
 
         let is_global = drawspec.global ?? true;
         let duration = drawspec.duration;