Skip to content

Commit 32fe5e4

Browse files
committed
changes for the new ES6 module
- it can create a set of .iset .fset .fset3 files
1 parent f18f3a7 commit 32fe5e4

File tree

6 files changed

+33
-54
lines changed

6 files changed

+33
-54
lines changed

tools/NFT_Marker_Creator/index.html

+3-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h2 class="title has-text-centered" id="title" href="#confidenceLevel">NFT Marke
1010
<div class="section">
1111
<input class="input is-hidden" type="file" id="imageLoader" name="imageLoader"/>
1212
<button class="button is-primary is-outlined is-fullwidth" id="uploadBt" onclick="document.getElementById('imageLoader').click();">Upload Image</button>
13-
<button class="button is-fullwidth" id="generateBt" onclick="generate()" disabled>Generate</button>
13+
<button class="button is-fullwidth" id="generateBt" onclick="window.generate()" disabled>Generate</button>
1414
</div>
1515
<div class="tile is-ancestor" id="wrapper">
1616
<canvas class="tile" id="imageCanvas" style="width: auto; height: 120rem"></canvas>
@@ -50,13 +50,9 @@ <h2 class="title has-text-centered" id="title" href="#confidenceLevel">NFT Marke
5050
<p id="modalTxt">Inform the number of channels(nc):<br>(black and white images have NC=1, colored images have NC=3)</p>
5151
<input id="modalInput" type="number" value="3">
5252
<button id="cancelBt" class="button" onclick="closeModal()">Cancel</button>
53-
<button id="confirmBt" class="button" onclick="setValueFromModal()">Confirm</button>
53+
<button id="confirmBt" class="button" onclick="window.setValueFromModal()">Confirm</button>
5454
</div>
5555
</div>
5656

5757
<script src="exif.js"></script>
58-
<script type='text/javascript'>
59-
var artoolkit_wasm_url = './wasm/NftMarkerCreator_wasm.wasm';
60-
</script>
61-
<script async type="text/javascript" src="./wasm/NftMarkerCreator_wasm.js"></script>
62-
<script src="index.js"></script>
58+
<script type="module" src="index.js"></script>

tools/NFT_Marker_Creator/index.js

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import NftMC from './wasm/NftMarkerCreator_ES6_wasm.js'
2+
3+
const nftMC = await NftMC();
4+
15
var imageLoader = document.getElementById('imageLoader');
26
imageLoader.addEventListener('change', handleImage, false);
37
var canvas = document.getElementById('imageCanvas');
@@ -62,35 +66,29 @@ function generate() {
6266

6367
let paramStr = cmdArr.join(' ');
6468
console.log(paramStr)
65-
let StrBuffer = Module._malloc(paramStr.length + 1);
66-
Module.writeStringToMemory(paramStr, StrBuffer);
67-
68-
let heapSpace = Module._malloc(globalObj.arr.length * globalObj.arr.BYTES_PER_ELEMENT); // 1
69-
Module.HEAPU8.set(globalObj.arr, heapSpace); // 2
7069

71-
Module._createImageSet(heapSpace, globalObj.dpi, globalObj.w, globalObj.h, globalObj.nc, StrBuffer);
72-
73-
Module._free(heapSpace);
74-
Module._free(StrBuffer);
70+
nftMC.createNftDataSet(globalObj.arr, globalObj.dpi, globalObj.w, globalObj.h, globalObj.nc, paramStr);
7571

7672
downloadIset();
7773
}, 500);
7874
}
7975

76+
window.generate = generate;
77+
8078
function downloadIset() {
8179
let mime = "application/octet-stream";
8280

83-
let filenameIset = "asa.iset";
84-
let filenameFset = "asa.fset";
85-
let filenameFset3 = "asa.fset3";
81+
let filenameIset = "tempFilename.iset";
82+
let filenameFset = "tempFilename.fset";
83+
let filenameFset3 = "tempFilename.fset3";
8684

8785
let ext = ".iset";
8886
let ext2 = ".fset";
8987
let ext3 = ".fset3";
9088

91-
let content = Module.FS.readFile(filenameIset);
92-
let contentFset = Module.FS.readFile(filenameFset);
93-
let contentFset3 = Module.FS.readFile(filenameFset3);
89+
let content = nftMC.FS.readFile(filenameIset, {flags: 'r+'});
90+
let contentFset = nftMC.FS.readFile(filenameFset, {flags: 'r+'});
91+
let contentFset3 = nftMC.FS.readFile(filenameFset3, {flags: 'r+'});
9492

9593
var a = document.createElement('a');
9694
a.download = name + ext;
@@ -152,6 +150,7 @@ function setValueFromModal() {
152150
globalObj.nc = parseInt(input);
153151
closeModal();
154152
}
153+
window.setValueFromModal = setValueFromModal;
155154

156155
function detectColorSpace(arr) {
157156
let target = parseInt(arr.length / 4);

tools/NFT_Marker_Creator/wasm/NftMarkerCreator.min.js

-31
This file was deleted.

tools/NFT_Marker_Creator/wasm/NftMarkerCreator_ES6_wasm.js

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/NFT_Marker_Creator/wasm/NftMarkerCreator_wasm.js

-1
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)