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

v. 0.55994b

Browse source
This commit is contained in:
Azgaar 2018-04-22 13:09:31 +03:00
parent 05db880f20
commit a18d7e91ff
3 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.css
View file

@ -1130,7 +1130,7 @@ input[type="checkbox"] {
} }
.checkbox:checked + .checkbox-label:before { .checkbox:checked + .checkbox-label:before {
background: #8e6d7e; background: #b19aa6;
transition: .1s; transition: .1s;
box-shadow: inset 0px 0px 0px 2px #ece6ea; box-shadow: inset 0px 0px 0px 2px #ece6ea;
} }

6
index.html
View file

@ -31,8 +31,8 @@
<script src="libs/polylabel.min.js"></script> <script src="libs/polylabel.min.js"></script>
<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>
<link rel="stylesheet" type="text/css" href="index.css?version=0.55993b"/> <link rel="stylesheet" type="text/css" href="index.css?version=0.55994b"/>
<link rel="stylesheet" type="text/css" href="icons.css?version=0.55993b"/> <link rel="stylesheet" type="text/css" href="icons.css?version=0.55994b"/>
<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 class="fullscreen"> <body class="fullscreen">
@ -782,5 +782,5 @@
<input type="file" accept=".txt" id="templateToLoad"> <input type="file" accept=".txt" id="templateToLoad">
</div> </div>
<script src="script.js?version=0.55993b"></script> <script src="script.js?version=0.55994b"></script>
</body> </body>

39
script.js
View file

@ -423,7 +423,7 @@ function fantasyMap() {
d3.event.on("end", function() { d3.event.on("end", function() {
if (opisometer || planimeter) { if (opisometer || planimeter) {
$("#addOpisometer, #addPlanimeter").removeClass("pressed"); $("#addOpisometer, #addPlanimeter").removeClass("pressed");
viewbox.style("cursor", "default").on(".drag", null); restoreDefaultDrag();
if (opisometer) { if (opisometer) {
var dist = rn(curve.node().getTotalLength()); var dist = rn(curve.node().getTotalLength());
var c = curve.node().getPointAtLength(dist / 2); var c = curve.node().getPointAtLength(dist / 2);
@ -450,6 +450,11 @@ function fantasyMap() {
}); });
} }
// restore default drag (map panning) and cursor
function restoreDefaultDrag() {
viewbox.style("cursor", "default").on(".drag", null);
}
// remove parent element (usually if child is clicked) // remove parent element (usually if child is clicked)
function removeParent() { function removeParent() {
$(this.parentNode).remove(); $(this.parentNode).remove();
@ -4119,7 +4124,7 @@ function fantasyMap() {
$("div[data-sortby='expansion'], .statePower, .icon-resize-full").addClass("hidden"); $("div[data-sortby='expansion'], .statePower, .icon-resize-full").addClass("hidden");
$("div[data-sortby='cells'], .stateCells, .icon-check-empty").removeClass("hidden"); $("div[data-sortby='cells'], .stateCells, .icon-check-empty").removeClass("hidden");
customization = 0; customization = 0;
viewbox.style("cursor", "default").on(".drag", null); restoreDefaultDrag();
} }
if (id === "countriesApply") {$("#countriesManuallyCancel").click();} if (id === "countriesApply") {$("#countriesManuallyCancel").click();}
if (id === "countriesRandomize") { if (id === "countriesRandomize") {
@ -4313,7 +4318,7 @@ function fantasyMap() {
} }
if (id === "addOpisometer" || id === "addPlanimeter") { if (id === "addOpisometer" || id === "addPlanimeter") {
if ($(this).hasClass("pressed")) { if ($(this).hasClass("pressed")) {
viewbox.style("cursor", "default").on(".drag", null); restoreDefaultDrag();
$(this).removeClass("pressed"); $(this).removeClass("pressed");
} else { } else {
$(this).addClass("pressed"); $(this).addClass("pressed");
@ -4379,10 +4384,12 @@ function fantasyMap() {
if (customization === 1) { if (customization === 1) {
if (id === "paintBrushes") { if (id === "paintBrushes") {
if ($("#brushesPanel").is(":visible")) {return;} if ($("#brushesPanel").is(":visible")) {return;}
viewbox.style("cursor", "crosshair").call(drag);
$("#brushesPanel").dialog({ $("#brushesPanel").dialog({
title: "Paint Brushes", title: "Paint Brushes",
minHeight: 40, width: "auto", maxWidth: 200, resizable: false, minHeight: 40, width: "auto", maxWidth: 200, resizable: false,
position: {my: "right top", at: "right-10 top+10", of: "svg"}}); position: {my: "right top", at: "right-10 top+10", of: "svg"}})
.on('dialogclose', restoreDefaultDrag);
} }
if (id === "rescaleExecute") { if (id === "rescaleExecute") {
var subject = rescaleLower.value + "-" + rescaleHigher.value; var subject = rescaleLower.value + "-" + rescaleHigher.value;
@ -4470,7 +4477,7 @@ function fantasyMap() {
if ($(this).hasClass('radio') && (parent === "addFeature" || parent === "brushesButtons")) { if ($(this).hasClass('radio') && (parent === "addFeature" || parent === "brushesButtons")) {
if ($(this).hasClass('pressed')) { if ($(this).hasClass('pressed')) {
$(this).removeClass('pressed'); $(this).removeClass('pressed');
viewbox.style("cursor", "default").on(".drag", null);; restoreDefaultDrag();
$("#brushRadiusLabel, #brushRadius").attr("disabled", true).addClass("disabled"); $("#brushRadiusLabel, #brushRadius").attr("disabled", true).addClass("disabled");
$("#burgAdd").removeClass('pressed'); $("#burgAdd").removeClass('pressed');
} else { } else {
@ -4980,8 +4987,11 @@ function fantasyMap() {
// Image to Heightmap Converter dialog // Image to Heightmap Converter dialog
function convertImage() { function convertImage() {
canvas.width = mapWidth;
canvas.height = mapHeight;
// turn off paint brushes drag and cursor
$(".pressed").removeClass('pressed'); $(".pressed").removeClass('pressed');
viewbox.style("cursor", "default"); restoreDefaultDrag();
var div = d3.select("#colorScheme"); var div = d3.select("#colorScheme");
if (div.selectAll("*").size() === 0) { if (div.selectAll("*").size() === 0) {
for (var i = 0; i <= 100; i++) { for (var i = 0; i <= 100; i++) {
@ -5005,7 +5015,7 @@ function fantasyMap() {
$("#convertImageLoad").on("click", function() {imageToLoad.click();}); $("#convertImageLoad").on("click", function() {imageToLoad.click();});
$("#imageToLoad").change(function() { $("#imageToLoad").change(function() {
console.time("loadImage"); console.time("loadImage");
// reset style // set style
viewbox.attr("transform", null); viewbox.attr("transform", null);
grid.attr("stroke-width", .3); grid.attr("stroke-width", .3);
// load image // load image
@ -5045,7 +5055,9 @@ function fantasyMap() {
var rgb = "rgb(" + nearest[0] + ", " + nearest[1] + ", " + nearest[2] + ")"; var rgb = "rgb(" + nearest[0] + ", " + nearest[1] + ", " + nearest[2] + ")";
var hex = toHEX(rgb); var hex = toHEX(rgb);
if (palette.indexOf(hex) === -1) {palette.push(hex);} if (palette.indexOf(hex) === -1) {palette.push(hex);}
landmass.append("path").attr("d", "M" + i.join("L") + "Z").attr("data-i", d).attr("fill", hex).attr("stroke", hex); landmass.append("path")
.attr("d", "M" + i.join("L") + "Z").attr("data-i", d)
.attr("fill", hex).attr("stroke", hex);
}); });
landmass.selectAll("path").on("click", landmassClicked); landmass.selectAll("path").on("click", landmassClicked);
palette.sort(function(a, b) {return d3.lab(a).b - d3.lab(b).b;}).map(function(i) { palette.sort(function(a, b) {return d3.lab(a).b - d3.lab(b).b;}).map(function(i) {
@ -5170,7 +5182,12 @@ function fantasyMap() {
function completeConvertion() { function completeConvertion() {
mockHeightmap(); mockHeightmap();
$(".color-div").remove();
$("#colorsAssigned, #colorsUnassigned").fadeOut();
grid.attr("stroke-width", .1);
canvas.style.opacity = convertOverlay.value = convertOverlayValue.innerHTML = 0; canvas.style.opacity = convertOverlay.value = convertOverlayValue.innerHTML = 0;
// turn on paint brushes drag and cursor
viewbox.style("cursor", "crosshair").call(drag);
$("#imageConverter").dialog('close'); $("#imageConverter").dialog('close');
} }
@ -5203,11 +5220,9 @@ function fantasyMap() {
$("#landmass").empty(); $("#landmass").empty();
$('#grid').empty().fadeOut(); $('#grid').empty().fadeOut();
$('#toggleGrid').addClass("buttonoff"); $('#toggleGrid').addClass("buttonoff");
viewbox.style("cursor", "default").on(".drag", null); restoreDefaultDrag();
if (!$("#toggleHeight").hasClass("buttonoff")) {toggleHeight();} if (!$("#toggleHeight").hasClass("buttonoff")) {toggleHeight();}
if ($("#imageConverter").is(":visible")) {$("#imageConverter").dialog('close');} closeAllDialogs();
if ($("#brushesPanel").is(":visible")) {$("#brushesPanel").dialog('close');}
if ($("#templateEditor").is(":visible")) {$("#templateEditor").dialog('close');}
history = []; history = [];
historyStage = -1; historyStage = -1;
} }