backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-17 09:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove default texture base64

Browse source
This commit is contained in:
Azgaar 2021-10-09 15:48:03 +03:00
parent 9116d03e76
commit eb76ec8e48
4 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
index.html
View file

@ -430,9 +430,10 @@
<td> <td>
<select id="styleTextureInput"> <select id="styleTextureInput">
<option value="none">None</option> <option value="none">None</option>
<option value="default" selected>Default</option> <option value="https://i2.wp.com/azgaar.files.wordpress.com/2021/10/folded-paper-big.jpg">Folded paper big</option>
<option value="https://i.imgur.com/EWvXSou.jpg">Folded paper</option> <option value="https://i2.wp.com/azgaar.files.wordpress.com/2021/10/folded-paper-small.jpg">Folded paper small</option>
<option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/marble-big.jpg">Marble big</option> <option value="https://i2.wp.com/azgaar.files.wordpress.com/2021/10/marble-big.jpg" selected>Marble big</option>
<option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/marble-small.jpg">Marble small</option>
<option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/marble-blue-small.jpg">Marble Blue</option> <option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/marble-blue-small.jpg">Marble Blue</option>
<option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/marble-blue-big.jpg">Marble Blue big</option> <option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/marble-blue-big.jpg">Marble Blue big</option>
<option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/stone-small.jpg">Stone small</option> <option value="https://i2.wp.com/azgaar.files.wordpress.com/2019/07/stone-small.jpg">Stone small</option>

12
modules/ui/layers.js
View file

@ -1435,8 +1435,8 @@ function toggleTexture(event) {
turnButtonOn("toggleTexture"); turnButtonOn("toggleTexture");
// append default texture image selected by default. Don't append on load to not harm performance // append default texture image selected by default. Don't append on load to not harm performance
if (!texture.selectAll("*").size()) { if (!texture.selectAll("*").size()) {
const x = +styleTextureShiftX.value, const x = +styleTextureShiftX.value;
y = +styleTextureShiftY.value; const y = +styleTextureShiftY.value;
const image = texture const image = texture
.append("image") .append("image")
.attr("id", "textureImage") .attr("id", "textureImage")
@ -1444,18 +1444,14 @@ function toggleTexture(event) {
.attr("y", y) .attr("y", y)
.attr("width", graphWidth - x) .attr("width", graphWidth - x)
.attr("height", graphHeight - y) .attr("height", graphHeight - y)
.attr("xlink:href", getDefaultTexture())
.attr("preserveAspectRatio", "xMidYMid slice"); .attr("preserveAspectRatio", "xMidYMid slice");
if (styleTextureInput.value !== "default") getBase64(styleTextureInput.value, base64 => image.attr("xlink:href", base64)); getBase64(styleTextureInput.value, base64 => image.attr("xlink:href", base64));
} }
$("#texture").fadeIn(); $("#texture").fadeIn();
zoom.scaleBy(svg, 1.00001); // enforce browser re-draw zoom.scaleBy(svg, 1.00001); // enforce browser re-draw
if (event && isCtrlClick(event)) editStyle("texture"); if (event && isCtrlClick(event)) editStyle("texture");
} else { } else {
if (event && isCtrlClick(event)) { if (event && isCtrlClick(event)) return editStyle("texture");
editStyle("texture");
return;
}
$("#texture").fadeOut(); $("#texture").fadeOut();
turnButtonOff("toggleTexture"); turnButtonOff("toggleTexture");
} }

1
modules/ui/style.js
View file

@ -335,7 +335,6 @@ styleFilterInput.addEventListener("change", function () {
styleTextureInput.addEventListener("change", function () { styleTextureInput.addEventListener("change", function () {
if (this.value === "none") texture.select("image").attr("xlink:href", ""); if (this.value === "none") texture.select("image").attr("xlink:href", "");
if (this.value === "default") texture.select("image").attr("xlink:href", getDefaultTexture());
else getBase64(this.value, base64 => texture.select("image").attr("xlink:href", base64)); else getBase64(this.value, base64 => texture.select("image").attr("xlink:href", base64));
}); });

18
modules/utils.js
View file

File diff suppressed because one or more lines are too long