Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better cities and towns labels in 3D view #635

Merged
merged 18 commits into from
Jul 17, 2021
Merged

Better cities and towns labels in 3D view #635

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5cc2454
Better cities and towns labels in 3D view
Jun 21, 2021
91c1de4
Small changes (let -> const)
Jun 21, 2021
6ceb949
Lower city labels
Jun 21, 2021
280c71b
Change the way the label faces the camera
Jun 21, 2021
ca77e10
Use font from svg instead of hardcoded
Jun 21, 2021
5238326
Use color from svg
Jun 22, 2021
6b9210e
Optionalize 3d labels
Jun 22, 2021
c51f3c6
Use pack.burgs instead of svg + Icon use style from svg
Jun 22, 2021
d874f9a
Replace jQuery with d3
Jun 22, 2021
ab61c30
Labels adapts to height scale
Jun 22, 2021
b871b63
Fix bug: options are not applied when changing layer
Jun 24, 2021
30ab121
Add states labels + Replace canvas by svg
Jun 24, 2021
58ad13c
Fix: States labels adapts to height scale
Jun 25, 2021
143e1df
Requested fixes
Jun 30, 2021
bd4deaa
All fonts working properly + Big memory optimization + Minor fixes
Jul 2, 2021
ba10da7
Fix rotating animation + More optimization
Jul 2, 2021
011c58c
use Raycaster for positioning the labels
Jul 5, 2021
28f3481
Use canvas to render burg labels + Some tweaks
Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3341,6 +3341,11 @@
<input id="options3dSunZ" type="number" min=-1500 max=1500 step=100 style="width:4.7em">
</div>

<div data-tip="Toggle 3d labels" style="margin: .6em 0 .3em -.2em">
<input id="options3dMeshLabels3d" class="checkbox" type="checkbox">
<label for="options3dMeshLabels3d" class="checkbox-label"><i>Show 3d labels</i></label>
</div>

<div data-tip="Toggle sky mode" style="margin: .6em 0 .3em -.2em">
<input id="options3dMeshSkyMode" class="checkbox" type="checkbox">
<label for="options3dMeshSkyMode" class="checkbox-label"><i>Show sky and extend water</i></label>
Expand Down
11 changes: 8 additions & 3 deletions modules/save.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ async function saveJPEG() {
}

// parse map svg to object url
async function getMapURL(type, subtype) {
async function getMapURL(type, options=[]) {
const cloneEl = document.getElementById("map").cloneNode(true); // clone svg
cloneEl.id = "fantasyMap";
document.body.appendChild(cloneEl);
Expand All @@ -83,8 +83,13 @@ async function getMapURL(type, subtype) {

const isFirefox = navigator.userAgent.toLowerCase().indexOf("firefox") > -1;
if (isFirefox && type === "mesh") clone.select("#oceanPattern").remove();
if (subtype === "globe") clone.select("#scaleBar").remove();
if (subtype === "noWater") {
if (options.includes("globe")) clone.select("#scaleBar").remove();
if (options.includes("noLabels")) {
clone.select("#labels #states").remove();
clone.select("#labels #burgLabels").remove();
clone.select("#icons #burgIcons").remove();
}
if (options.includes("noWater")) {
clone.select("#oceanBase").attr("opacity", 0);
clone.select("#oceanPattern").attr("opacity", 0);
}
Expand Down
Loading