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

v. 0.57.03b

Browse source
This commit is contained in:
Azgaar 2018-06-18 22:58:16 +03:00
parent f8ce1023d6
commit 56bcce42ec
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
index.html
View file

@ -32,8 +32,8 @@
<script src="libs/quantize.min.js" defer></script> <script src="libs/quantize.min.js" defer></script>
<script src="libs/d3-hexbin.v0.2.min.js" defer></script> <script src="libs/d3-hexbin.v0.2.min.js" defer></script>
<script src="libs/jquery.ui.touch-punch.min.js" defer></script> <script src="libs/jquery.ui.touch-punch.min.js" defer></script>
<link rel="stylesheet" type="text/css" href="index.css?version=0.57.02b"/> <link rel="stylesheet" type="text/css" href="index.css?version=0.57.03b"/>
<link rel="stylesheet" type="text/css" href="icons.css?version=0.57.02b"/> <link rel="stylesheet" type="text/css" href="icons.css?version=0.57.03b"/>
<link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/> <link rel="stylesheet" type="text/css" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"/>
</head> </head>
<body> <body>
@ -575,9 +575,11 @@
<div id="routeEditor" class="dialog" style="display: none"> <div id="routeEditor" class="dialog" style="display: none">
<button id="routeGroups" onmouseover="tip('Change path group')" class="icon-map-signs" onclick="$('#routeEditor').children().not(this).toggle()"></button> <button id="routeGroups" onmouseover="tip('Change path group')" class="icon-map-signs" onclick="$('#routeEditor').children().not(this).toggle()"></button>
<div id="routeGroupsSelection" style="display: none"> <div id="routeGroupsSelection" style="display: none">
<select id="routeGroup" onmouseover="tip('Select a group for this route')"></select> <select id="routeGroup" onmouseover="tip('Select a group for this route')">
<option value="roads" selected>roads</option>
</select>
</div> </div>
<button id="routeLength"></button> <button id="routeLength">0</button>
<button id="routeSplit" onmouseover="tip('Click on a control point to split the route')" class="icon-unlink" onclick="$(this).toggleClass('pressed')"></button> <button id="routeSplit" onmouseover="tip('Click on a control point to split the route')" class="icon-unlink" onclick="$(this).toggleClass('pressed')"></button>
<button id="routeNew" onmouseover="tip('Create new route clicking on map')" class="icon-map-pin"></button> <button id="routeNew" onmouseover="tip('Create new route clicking on map')" class="icon-map-pin"></button>
<button id="routeRemove" onmouseover="tip('Remove route')" class="icon-trash"></button> <button id="routeRemove" onmouseover="tip('Remove route')" class="icon-trash"></button>

30
script.js
View file

@ -2200,18 +2200,20 @@ function fantasyMap() {
function newRouteAddPoint() { function newRouteAddPoint() {
const point = d3.mouse(this); const point = d3.mouse(this);
const x = rn(point[0], 2), y = rn(point[1], 2); const x = rn(point[0], 2), y = rn(point[1], 2);
let group = elSelected ? d3.select(elSelected.node().parentNode) : null;
let routeType = routeGroup.value; let routeType = routeGroup.value;
if (!elSelected) { if (!elSelected) {
const index = getIndex(point); const index = getIndex(point);
const height = cells[index].height; const height = cells[index].height;
routeType = height < 0.2 ? "searoutes" : "roads"; if (height < 0.2) routeType = "searoutes";
group = routes.select("#"+routeType); if (routeType === "searoutes" && height >= 0.2) routeType = "roads";
} }
const group = routes.select("#"+routeType);
addRoutePoint({x, y}); addRoutePoint({x, y});
if (!elSelected || elSelected.attr("data-route") !== "new") { if (!elSelected || elSelected.attr("data-route") !== "new") {
const id = routeType + "" + group.selectAll("*").size(); const id = routeType + "" + group.selectAll("*").size();
elSelected = group.append("path").attr("data-route", "new").attr("id", id).on("click", completeNewRoute); elSelected = group.append("path").attr("data-route", "new").attr("id", id).on("click", editRoute);
routeUpdateGroups();
routeType.value = routeType;
$("#routeEditor").dialog({ $("#routeEditor").dialog({
title: "Edit Route", title: "Edit Route",
minHeight: 30, width: "auto", resizable: false, minHeight: 30, width: "auto", resizable: false,
@ -2230,9 +2232,10 @@ function fantasyMap() {
function completeNewRoute() { function completeNewRoute() {
$("#routeNew, #addRoute").removeClass('pressed'); $("#routeNew, #addRoute").removeClass('pressed');
restoreDefaultEvents(); restoreDefaultEvents();
if (!elSelected) return;
if (elSelected.attr("data-route") === "new") { if (elSelected.attr("data-route") === "new") {
routeRedraw(); routeRedraw();
elSelected.attr("data-route", "").on("click", editRoute); elSelected.attr("data-route", "");
const node = elSelected.node(); const node = elSelected.node();
const l = node.getTotalLength(); const l = node.getTotalLength();
let pathCells = []; let pathCells = [];
@ -2252,6 +2255,7 @@ function fantasyMap() {
} }
function routeUpdateGroups() { function routeUpdateGroups() {
const group = d3.select(elSelected.node().parentNode);
const type = group.attr("data-type"); const type = group.attr("data-type");
routeGroup.innerHTML = ""; routeGroup.innerHTML = "";
routes.selectAll("g").each(function(d) { routes.selectAll("g").each(function(d) {
@ -2264,6 +2268,7 @@ function fantasyMap() {
} }
function routeSplitInPoint(clicked) { function routeSplitInPoint(clicked) {
const group = d3.select(this.parentNode);
$("#routeSplit").removeClass('pressed'); $("#routeSplit").removeClass('pressed');
let points1 = [], points2 = []; let points1 = [], points2 = [];
let points = points1; let points = points1;
@ -2284,10 +2289,7 @@ function fantasyMap() {
} }
$("#routeGroup").change(function() { $("#routeGroup").change(function() {
const newGroup = this.value; $(elSelected.node()).detach().appendTo($("#"+this.value));
if (routeType === newGroup) {return;}
$(elSelected.node()).detach().appendTo($("#"+newGroup));
routeType = newGroup;
}); });
$("#routeNew").click(function() { $("#routeNew").click(function() {
@ -5064,16 +5066,18 @@ function fantasyMap() {
$("#labels #capitals, #labels #towns").detach().appendTo($("#burgLabels")); $("#labels #capitals, #labels #towns").detach().appendTo($("#burgLabels"));
$("#icons #capitals, #icons #towns").detach().appendTo($("#burgIcons")); $("#icons #capitals, #icons #towns").detach().appendTo($("#burgIcons"));
labels.select("#burgLabels").selectAll("text").each(function() { labels.select("#burgLabels").selectAll("text").each(function() {
const id = +this.getAttribute("id").replace("manorLabel", ""); let id = this.getAttribute("id");
if (!id) return;
this.removeAttribute("id"); this.removeAttribute("id");
this.setAttribute("data-id", id); this.setAttribute("data-id", +id.replace("manorLabel", ""));
}); });
icons.select("#burgIcons").select("#capitals").attr("font-size", 1).attr("fill-opacity", .7).attr("stroke-opacity", 1); icons.select("#burgIcons").select("#capitals").attr("font-size", 1).attr("fill-opacity", .7).attr("stroke-opacity", 1);
icons.select("#burgIcons").select("#towns").attr("font-size", .5).attr("fill-opacity", .7).attr("stroke-opacity", 1); icons.select("#burgIcons").select("#towns").attr("font-size", .5).attr("fill-opacity", .7).attr("stroke-opacity", 1);
icons.select("#burgIcons").selectAll("circle").each(function() { icons.select("#burgIcons").selectAll("circle").each(function() {
const id = +this.getAttribute("id").replace("manorIcon", ""); let id = this.getAttribute("id");
if (!id) return;
this.removeAttribute("id"); this.removeAttribute("id");
this.setAttribute("data-id", id); this.setAttribute("data-id", +id.replace("manorIcon", ""));
}); });
icons.select("#capital-anchors").raise().attr("font-size", 2).attr("size", null); icons.select("#capital-anchors").raise().attr("font-size", 2).attr("size", null);
icons.select("#town-anchorss").raise().attr("font-size", 1).attr("size", null); icons.select("#town-anchorss").raise().attr("font-size", 1).attr("size", null);