diff --git a/src/add/class.js b/src/add/class.js index 0b86a52a..f9f099fe 100644 --- a/src/add/class.js +++ b/src/add/class.js @@ -106,6 +106,12 @@ self.DataReader = class DataReader { return p; } + readBytes(len) { + let buf = this.view.buffer.slice(this.pos, this.pos + len); + this.pos += len; + return buf; + } + readU8() { return this.view.getUint8(this.pos++); } diff --git a/src/mode/sla/x_cxdlp.js b/src/mode/sla/x_cxdlp.js index 4659ceb7..fcf542f1 100644 --- a/src/mode/sla/x_cxdlp.js +++ b/src/mode/sla/x_cxdlp.js @@ -64,9 +64,12 @@ res_y: read.readU16(), height: read.readU32(), skip: read.skip(60), - thumb: read.skip(26914), - preview1: read.skip(168202), - preview2: read.skip(168202), + thumb: read.readBytes(26912), + skip: read.skip(2), // 0xd0a term + preview1: read.readBytes(168200), + skip: read.skip(2), // 0xd0a term + preview2: read.readBytes(168200), + skip: read.skip(2), // 0xd0a term dim_x: read_string(true), dim_y: read_string(true), layer: read_string(true), diff --git a/web/kiri/cxdlp.html b/web/kiri/cxdlp.html index 0e5dd1f9..42792e6b 100644 --- a/web/kiri/cxdlp.html +++ b/web/kiri/cxdlp.html @@ -8,13 +8,24 @@ div { display: flex; flex-direction: row; + justify-content: flex-start; + align-items: flex-start; } th { text-align: left; } + canvas, #params, #ctrl { + margin: 1px; + padding: 3px; + border: 1px solid black; + border-radius: 3px; + } #slider { flex-grow: 1; } + #params { + flex-grow: 1; + } .over { background-color: rgba(0,255,0,0.1); } @@ -58,16 +69,41 @@ function row(key,value) { return `