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

fix: 3d view - don't allow download obj for globe

Browse source
This commit is contained in:
Azgaar 2022-09-17 14:58:00 +03:00
parent 60758a1532
commit 75ae52e953
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
index.html
View file

@ -5575,19 +5575,19 @@
<div data-tip="Set map rotation speed. Set to 0 is you want to toggle off the rotation"> <div data-tip="Set map rotation speed. Set to 0 is you want to toggle off the rotation">
<div>Rotation:</div> <div>Rotation:</div>
<input id="options3dMeshRotationRange" type="range" min="0" max="10" step=".1" /> <input id="options3dMeshRotationRange" type="range" min="0" max="10" step=".1" />
<input id="options3dMeshRotationNumber" type="number" min="0" max="10" step=".1" style="width: 3em" /> <input id="options3dMeshRotationNumber" type="number" min="0" max="10" step=".1" style="width: 4em" />
</div> </div>
<div data-tip="Set height scale"> <div data-tip="Set height scale">
<div>Height scale:</div> <div>Height scale:</div>
<input id="options3dScaleRange" type="range" min="0" max="100" /> <input id="options3dScaleRange" type="range" min="0" max="100" />
<input id="options3dScaleNumber" type="number" min="0" max="1000" style="width: 3em" /> <input id="options3dScaleNumber" type="number" min="0" max="1000" style="width: 4em" />
</div> </div>
<div data-tip="Set scene lightness"> <div data-tip="Set scene lightness">
<div>Lightness:</div> <div>Lightness:</div>
<input id="options3dLightnessRange" type="range" min="0" max="100" /> <input id="options3dLightnessRange" type="range" min="0" max="100" />
<input id="options3dLightnessNumber" type="number" min="0" max="500" style="width: 3em" /> <input id="options3dLightnessNumber" type="number" min="0" max="500" style="width: 4em" />
</div> </div>
<div data-tip="Set sun position (x, y, z) to define shadows"> <div data-tip="Set sun position (x, y, z) to define shadows">
@ -5627,7 +5627,7 @@
<div data-tip="Set globe rotation speed. Set to 0 is you want to toggle off the rotation"> <div data-tip="Set globe rotation speed. Set to 0 is you want to toggle off the rotation">
<div>Rotation:</div> <div>Rotation:</div>
<input id="options3dGlobeRotationRange" type="range" min="0" max="10" step=".1" /> <input id="options3dGlobeRotationRange" type="range" min="0" max="10" step=".1" />
<input id="options3dGlobeRotationNumber" type="number" min="0" max="10" step=".1" style="width: 3em" /> <input id="options3dGlobeRotationNumber" type="number" min="0" max="10" step=".1" style="width: 4em" />
</div> </div>
<div data-tip="Set globe texture resolution"> <div data-tip="Set globe texture resolution">
@ -7822,7 +7822,7 @@
<script src="modules/ui/stylePresets.js"></script> <script src="modules/ui/stylePresets.js"></script>
<script src="modules/ui/general.js?v=1.87.00"></script> <script src="modules/ui/general.js?v=1.87.00"></script>
<script src="modules/ui/options.js?v=1.87.09"></script> <script src="modules/ui/options.js?v=1.87.11"></script>
<script src="main.js"></script> <script src="main.js"></script>
<script defer src="modules/relief-icons.js"></script> <script defer src="modules/relief-icons.js"></script>

5
modules/ui/options.js
View file

@ -461,8 +461,8 @@ function changeDialogsTheme(themeColor, transparency) {
} }
function changeZoomExtent(value) { function changeZoomExtent(value) {
if(+zoomExtentMin.value > +zoomExtentMax.value) { if (+zoomExtentMin.value > +zoomExtentMax.value) {
[zoomExtentMin.value, zoomExtentMax.value]=[zoomExtentMax.value, zoomExtentMin.value]; [zoomExtentMin.value, zoomExtentMax.value] = [zoomExtentMax.value, zoomExtentMin.value];
} }
const min = Math.max(+zoomExtentMin.value, 0.01); const min = Math.max(+zoomExtentMin.value, 0.01);
const max = Math.min(+zoomExtentMax.value, 200); const max = Math.min(+zoomExtentMax.value, 200);
@ -1008,6 +1008,7 @@ function toggle3dOptions() {
const globe = document.getElementById("canvas3d").dataset.type === "viewGlobe"; const globe = document.getElementById("canvas3d").dataset.type === "viewGlobe";
options3dMesh.style.display = globe ? "none" : "block"; options3dMesh.style.display = globe ? "none" : "block";
options3dGlobe.style.display = globe ? "block" : "none"; options3dGlobe.style.display = globe ? "block" : "none";
options3dOBJSave.style.display = globe ? "none" : "inline-block";
options3dScaleRange.value = options3dScaleNumber.value = ThreeD.options.scale; options3dScaleRange.value = options3dScaleNumber.value = ThreeD.options.scale;
options3dLightnessRange.value = options3dLightnessNumber.value = ThreeD.options.lightness * 100; options3dLightnessRange.value = options3dLightnessNumber.value = ThreeD.options.lightness * 100;
options3dSunX.value = ThreeD.options.sun.x; options3dSunX.value = ThreeD.options.sun.x;

2
versioning.js
View file

@ -1,7 +1,7 @@
"use strict"; "use strict";
// version and caching control // version and caching control
const version = "1.87.10"; // generator version, update each time const version = "1.87.11"; // generator version, update each time
{ {
document.title += " v" + version; document.title += " v" + version;