forks/multipaint-js: mpui.js comparison

comparison mpui.js @ 188:6fba2c255319

More work on the MP.JS launcher.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 23 Aug 2018 16:32:10 +0300
parents	28caa87348d3
children	283b2b657574

comparison

equal deleted inserted replaced

-:28caa87348d3
+:6fba2c255319
 /*
 * Multipaint.JS - Javascript launcher
 * (C) Copyright 2018 Matti 'ccr' Hämäläinen <ccr@tnsp.org>
 */
-var mpMachine = 0, mpUIScale, mpForcedWidth, mpForcedHeight;
+var mpMachine = 0, mpUIScale, mpUIForcedWidth, mpUIForcedHeight;
 var mpURL;
 var mpMachines =
 [
 [   0, "C64 hires"          , true ],
 [  21, "C64 FLI multicolor" , false ],
 */
 ];
-var mpResolutions =
+var mpUIDimensions =
 [
 [ -1, -1 ],
-[ 1200, 980 ],
+[ 1200, 800 ],
 [ 1600, 1200 ],
 ];
+var mpUIScales =
+[
+2, 3, 1
+];
 var mpSources =
 [
 "buffers.pde",
 "preview.pde",
 {
 stAddEventOb(obname, stGE(obname), evtype, evcallback, evparam);
 }
-function mpShowMachineSelector()
+function stGetSelValue(velem, vdef)
+{
+if (velem)
+return velem.selectedIndex >= 0 ? velem.options[velem.selectedIndex].value : vdef;
+else
+return vdef;
+}
+function stCreateSelect(vid, vlist, vcallback)
+{
+var vobj = stCE("select", vid);
+for (var n = 0; n < vlist.length; n++)
+{
+var mp = vlist[n];
+var opt = stCE("option");
+vcallback(n, opt, mp);
+vobj.appendChild(opt);
+}
+return vobj;
+}
+function mpShowLauncher()
 {
 var mpCanvas = stGE("mpCanvas");
 mpCanvas.style.display = "none";
 var mpUI = stGE("mpUI");
 mobj = stCE("p");
 mobj.textContent = "Choose your target machine:";
 mdiv.appendChild(mobj);
-mobj = stCE("select", "machineID");
-for (var n = 0; n < mpMachines.length; n++)
+mdiv.appendChild(stCreateSelect("machineID", mpMachines,
-{
+function (vn, vopt, val) { vopt.value = val[0]; vopt.textContent = val[1]; }));
-var mp = mpMachines[n];
-var opt = stCE("option");
-opt.value = mp[0];
-opt.textContent = mp[1];
-mobj.appendChild(opt);
-}
-mdiv.appendChild(mobj);
 mobj = stCE("button", "selectID");
 mobj.textContent = "RUN";
-stAddEventOb(mobj.name, mobj, "click", mpMachineSelected);
+stAddEventOb(mobj.name, mobj, "click", mpLauncherDone);
 mdiv.appendChild(mobj);
-mdiv = stCE("div", "mresolution");
+mdiv = stCE("div", "mdimensions");
 mpUI.appendChild(mdiv);
 mobj = stCE("p");
-mobj.textContent = "Choose optional resolution:";
+mobj.textContent = "Choose optional UI size:";
 mdiv.appendChild(mobj);
-mobj = stCE("select", "resolutionID");
+mdiv.appendChild(stCreateSelect("dimensionsID", mpUIDimensions,
-for (var n = 0; n < mpResolutions.length; n++)
+function (vn, vopt, val) { vopt.value = vn; vopt.textContent = (vn == 0) ? "DEFAULT" : val[0] +" x "+ val[1]; }));
-{
-var mp = mpResolutions[n];
+mdiv.appendChild(stCreateSelect("scalesID", mpUIScales,
-var opt = stCE("option");
+function (vn, vopt, val) { vopt.value = val; vopt.textContent = " x "+ val; }));
-opt.value = n;
-if (n == 0)
-opt.textContent = "DEFAULT";
-else
-opt.textContent = mp[0] +" x " +mp[1];
-mobj.appendChild(opt);
-}
-mdiv.appendChild(mobj);
 mobj = stCE("div");
 mobj.innerHTML =
 "<p><b>Things of note:</b></p>"+
 mobj = stCE("hr");
 mpUI.appendChild(mobj);
 }
-function mpMachineSelected()
+function mpLauncherDone()
 {
+// Get selected values from DOM elements
 var mpUI = stGE("mpUI");
-var id = stGE("machineID");
+mpMachine = stGetSelValue(stGE("machineID"), 0);
-mpMachine = id.selectedIndex >= 0 ? id.options[id.selectedIndex].value : 0;
+var index = stGetSelValue(stGE("dimensionsID"), -1);
-id = stGE("resolutionID");
-var index = id.selectedIndex >= 0 ? id.options[id.selectedIndex].value : 0;
 if (index > 0)
 {
-mpForcedWidth = mpResolutions[index][0];
+mpUIForcedWidth = mpDimensions[index][0];
-mpForcedHeight = mpResolutions[index][1];
+mpUIForcedHeight = mpDimensions[index][1];
 }
+else
+mpUIForcedWidth = mpUIForcedHeight = 0;
+mpUIScale = stGetSelValue(stGE("scalesID"), -1);
 stClearChildren(mpUI);
+// Initialize the canvas etc.
 var mpCanvas = stGE("mpCanvas");
 mpCanvas.style.display = "block";
-window.location.href = mpURL +"?"+ mpMachine.toString() +":"+ mpForcedWidth +":"+ mpForcedHeight;
+window.location.href = mpURL +"?"+ mpMachine.toString() +":"+ mpUIForcedWidth +":"+ mpUIForcedHeight +":"+ mpUIScale;
 mpRunSketch(mpCanvas);
 }
 {
 stGE("mpNote").innerHTML =
 "<a href=\"http://multipaint.kameli.net/\">Multipaint</a> (C) 2016-2018 <b>Tero 'Dr. TerrorZ' Heikkinen</b>, "+
 "ProcessingJS port and modifications by <b>Matti 'ccr' Hämäläinen</b> (2018)";
+// Check for URL parameters
 var slink = window.location.href;
 var spos, found = false;
 if ((spos = slink.indexOf("?")) >= 0)
 {
 var sargs = unescape(slink.substr(spos + 1)).split(":");
 mpURL = slink.substr(0, spos);
+mpMachine = parseInt(sargs[0]);
-var tmp = parseInt(sargs[0]);
+found = true;
-for (var n = 0; n < mpMachines.length; n++)
-{
-var mp = mpMachines[n];
-if (mp[0] == tmp)
-{
-mpMachine = mp[0];
-found = true;
-break;
-}
-}
 if (sargs.length >= 3)
 {
-mpForcedWidth = parseInt(sargs[1]);
+mpUIForcedWidth = parseInt(sargs[1]);
-mpForcedHeight = parseInt(sargs[2]);
+mpUIForcedHeight = parseInt(sargs[2]);
 }
 if (sargs.length >= 4)
 mpUIScale = parseInt(sargs[3]);
 }
 else
 mpURL = slink;
+// Either run sketch or show the launcher
 if (found)
 {
 mpRunSketch(stGE("mpCanvas"));
 }
 else
 {
-stAddEventOb("DOM", document, "DOMContentLoaded", mpShowMachineSelector);
+stAddEventOb("DOM", document, "DOMContentLoaded", mpShowLauncher);
 }
 }