From f71c8602e02a49b98421c851bb211bab19c467fd Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Wed, 24 Apr 2019 13:46:19 -0400
Subject: [PATCH] added //#resource "file.bin"

---
 .gitattributes                   |   6 ++++++
 doc/notes.txt                    |   1 +
 presets/nes/climbr_title.nam.rle | Bin 0 -> 569 bytes
 presets/nes/climbr_title.pal     |   1 +
 presets/nes/jroatch.chr.lz4      | Bin 0 -> 3075 bytes
 src/platform/nes.ts              |   1 -
 src/project.ts                   |  35 ++++++++++++++++++-------------
 src/util.ts                      |   6 ++++--
 src/views.ts                     |   9 +++++++-
 9 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 presets/nes/climbr_title.nam.rle
 create mode 100644 presets/nes/climbr_title.pal
 create mode 100644 presets/nes/jroatch.chr.lz4

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..09058da5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+*.pal binary
+*.chr binary
+*.rle binary
+*.lz4 binary
+*.bin binary
+*.nam binary
diff --git a/doc/notes.txt b/doc/notes.txt
index 50a154f0..ad8c3ff6 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -102,6 +102,7 @@ TODO:
   - throw errors when bad/no refs
   - per-View keyboard shortcuts
   - parse labels
+  - parse .incbin directives?
 - crt0.s compiled each time?
 - debug highlight doesn't go away when debugging -> running
   - show breakpoint of PC or highest address on stack
diff --git a/presets/nes/climbr_title.nam.rle b/presets/nes/climbr_title.nam.rle
new file mode 100644
index 0000000000000000000000000000000000000000..f2444bca73dace5a459073290589a49a865a13e0
GIT binary patch
literal 569
zcmaKpO-{ow5QX2^`5|S4V8f!NQBT1(NEILit&&ungtcecojF3;=L8_ZDYyqm;Efv=
zNKiQ*PyEe$9@zppQE^ZXnJYutJmB)`wtrl;ciqiujqB!q32{WT5E!S?Vxe*jsWdXL
z0<kz!I=#N7;;7<bem;a4iH!R94+T^*PR}wT)flnI77-{)2@ChOsg6||cqoIT<~L*W
zbm9o6HB9T&(q22-o3Bkad61{3S;Rg^B^&z@8{|R%!ptD3W5eSIt~M#nW1yVtGyiPR
z$1Y!rm@ec+&LEQ^E!8m8ws}4bDC87!!~_K&jI(4euD~4YcG-34`lju1VYo2l$GY5p
tvLw$eo&FJKx)Wd1Zdc=r%XYyF%C-w`<rAjm=SJKU!G;efE*GB*z5$sTl)V4|

literal 0
HcmV?d00001

diff --git a/presets/nes/climbr_title.pal b/presets/nes/climbr_title.pal
new file mode 100644
index 00000000..df36a55a
--- /dev/null
+++ b/presets/nes/climbr_title.pal
@@ -0,0 +1 @@
+%5
!0<'8
\ No newline at end of file
diff --git a/presets/nes/jroatch.chr.lz4 b/presets/nes/jroatch.chr.lz4
new file mode 100644
index 0000000000000000000000000000000000000000..0eb2dc650cf7c507db2009055662171749e82f58
GIT binary patch
literal 3075
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

literal 0
HcmV?d00001

diff --git a/src/platform/nes.ts b/src/platform/nes.ts
index 44cae22f..3f5be53f 100644
--- a/src/platform/nes.ts
+++ b/src/platform/nes.ts
@@ -19,7 +19,6 @@ const JSNES_PRESETS = [
   {id:'rletitle.c', name:'Title Screen RLE'},
   {id:'statusbar.c', name:'Split Status Bar'},
   {id:'horizmask.c', name:'Offscreen Scrolling'},
-  {id:'attributes.c', name:'Attribute Table + Pixels'},
   {id:'monobitmap.c', name:'Monochrome Bitmap'},
   {id:'aputest.c', name:'Sound Tester'},
   {id:'music.c', name:'Music Player'},
diff --git a/src/project.ts b/src/project.ts
index 8efd61f4..5d50ee25 100644
--- a/src/project.ts
+++ b/src/project.ts
@@ -73,43 +73,48 @@ export class CodeProject {
   }
 
   parseIncludeDependencies(text:string):string[] {
-    var files = [];
-    var m;
+    let files = [];
+    let m;
     if (this.platform_id.startsWith('verilog')) {
       // include verilog includes
-      var re1 = /^\s*(`include|[.]include)\s+"(.+?)"/gmi;
+      let re1 = /^\s*(`include|[.]include)\s+"(.+?)"/gmi;
       while (m = re1.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
       // include .arch (json) statements
-      var re2 = /^\s*([.]arch)\s+(\w+)/gmi;
+      let re2 = /^\s*([.]arch)\s+(\w+)/gmi;
       while (m = re2.exec(text)) {
         this.pushAllFiles(files, m[2]+".json");
       }
       // include $readmem[bh] (TODO)
-      var re3 = /\b\$readmem[bh]\("(.+?)"/gmi;
+      let re3 = /\b\$readmem[bh]\("(.+?)"/gmi;
       while (m = re3.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
     } else {
       // for .asm -- [.]include "file"
       // for .c -- #include "file"
-      var re2 = /^\s*[.#]?(include|incbin)\s+"(.+?)"/gmi;
+      let re2 = /^\s*[.#]?(include|incbin)\s+"(.+?)"/gmi;
       while (m = re2.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
+      // for .c -- //#link "file" (or ;link or #link)
+      let re3 = /^\s*([;#]|[/][/][#])resource\s+"(.+?)"/gm;
+      while (m = re3.exec(text)) {
+        this.pushAllFiles(files, m[2]);
+      }
     }
     return files;
   }
 
   parseLinkDependencies(text:string):string[] {
-    var files = [];
-    var m;
+    let files = [];
+    let m;
     if (this.platform_id.startsWith('verilog')) {
       //
     } else {
       // for .c -- //#link "file" (or ;link or #link)
-      var re = /^\s*([;#]|[/][/][#])link\s+"(.+?)"/gm;
+      let re = /^\s*([;#]|[/][/][#])link\s+"(.+?)"/gm;
       while (m = re.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
@@ -118,14 +123,16 @@ export class CodeProject {
   }
 
   loadFileDependencies(text:string, callback:LoadFilesCallback) {
-    var includes = this.parseIncludeDependencies(text);
-    var linkfiles = this.parseLinkDependencies(text);
-    var allfiles = includes.concat(linkfiles);
+    let includes = this.parseIncludeDependencies(text);
+    let linkfiles = this.parseLinkDependencies(text);
+    let allfiles = includes.concat(linkfiles);
     this.loadFiles(allfiles, (err:string, result?:Dependency[]) => {
       // set 'link' property on files that are link dependencies (must match filename)
-      if (result)
-        for (var dep of result)
+      if (result) {
+        for (let dep of result) {
           dep.link = linkfiles.indexOf(dep.path) >= 0;
+        }
+      }
       callback(err, result);
     });
   }
diff --git a/src/util.ts b/src/util.ts
index 4dbea967..a7a3a8c2 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -320,8 +320,10 @@ export function isProbablyBinary(path:string, data?:number[] | Uint8Array) : boo
   // check extensions
   if (path) {
     path = path.toUpperCase();
-    if (path.endsWith('.CHR') || path.endsWith('.BIN'))
-      score++;
+    const BINEXTS = ['.CHR','.BIN','.PAL','.NAM','.RLE','.LZ4'];
+    for (var ext of BINEXTS) {
+      if (path.endsWith(ext)) score++;
+    }
   }
   // decode as UTF-8
   for (var i = 0; i < (data?data.length:0);) {
diff --git a/src/views.ts b/src/views.ts
index 2b3f8e12..e2050ea8 100644
--- a/src/views.ts
+++ b/src/views.ts
@@ -1171,13 +1171,20 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext {
     // TODO: check fmt w/h/etc limits
     // TODO: defer editor creation
     // TODO: only refresh when needed
-    if (fileid.endsWith('.chr') && data instanceof Uint8Array) {
+    if (platform_id.startsWith('nes') && fileid.endsWith('.chr') && data instanceof Uint8Array) {
       // is this a NES CHR?
       let node = new pixed.FileDataNode(projectWindows, fileid);
       const neschrfmt = {w:8,h:8,bpp:1,count:(data.length>>4),brev:true,np:2,pofs:8,remap:[0,1,2,4,5,6,7,8,9,10,11,12]}; // TODO
       this.addPixelEditor(this.ensureFileDiv(fileid), node, neschrfmt);
       this.registerAsset("charmap", node, true);
       nassets++;
+    } else if (platform_id.startsWith('nes') && fileid.endsWith('.pal') && data instanceof Uint8Array) {
+      // is this a NES PAL?
+      let node = new pixed.FileDataNode(projectWindows, fileid);
+      const nespalfmt = {pal:"nes",layout:"nes"};
+      this.addPaletteEditor(this.ensureFileDiv(fileid), node, nespalfmt);
+      this.registerAsset("palette", node, false);
+      nassets++;
     } else if (typeof data === 'string') {
       let textfrags = this.scanFileTextForAssets(fileid, data);
       for (let frag of textfrags) {