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

v1.6.12 - change ocean pattern to image

Browse source
This commit is contained in:
Azgaar 2021-03-06 18:55:39 +03:00
parent 69c44317e3
commit bb260a0b89
12 changed files with 46 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/save-and-load.js
View file

@ -131,11 +131,11 @@ async function getMapURL(type, subtype) {
cloneDefs.querySelector("#defs-emblems")?.remove();
}
// add ocean pattern
// replace ocean pattern href to base64
if (cloneEl.getElementById("oceanicPattern")) {
const patternId = cloneEl.getElementById("oceanicPattern").getAttribute("filter").slice(5,-1);
const pattern = svgDefs.getElementById(patternId);
if (patternId) cloneDefs.appendChild(pattern.cloneNode(true));
const el = cloneEl.getElementById("oceanicPattern");
const url = el.getAttribute("href");
getBase64(url, base64 => el.setAttribute("href", base64));
}
// add relief icons
@ -958,7 +958,7 @@ function parseLoadedData(data) {
if (version < 1.11) {
// v 1.11 added new attributes
terrs.attr("scheme", "bright").attr("terracing", 0).attr("skip", 5).attr("relax", 0).attr("curve", 0);
svg.select("#oceanic > rect").attr("id", "oceanicPattern");
svg.select("#oceanic > *").attr("id", "oceanicPattern");
oceanLayers.attr("layers", "-6,-3,-1");
gridOverlay.attr("type", "pointyHex").attr("size", 10);
@ -1172,6 +1172,10 @@ function parseLoadedData(data) {
turnButtonOn("toggleRulers");
rulers.draw();
} else turnButtonOff("toggleRulers");
// 1.61 changed oceanicPattern from rect to image
const pattern = document.getElementById("oceanic");
pattern.innerHTML = '<image id="oceanicPattern" href="./images/pattern1.png" width="100" height="100" opacity=".2"></image>';
}
}()

6
modules/ui/layers.js
View file

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

36
modules/ui/style.js
View file

File diff suppressed because one or more lines are too long

14
modules/utils.js
View file

File diff suppressed because one or more lines are too long