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

optimize animation - stop on speed = 0

Browse source
This commit is contained in:
Azgaar 2021-07-17 17:24:14 +03:00
parent dd1492ca72
commit 4cb7b55e03
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/ui/3d.js
View file

@ -7,7 +7,7 @@
const options = {scale: 50, lightness: 0.7, shadow: 0.5, sun: {x: 100, y: 600, z: 1000}, rotateMesh: 0, rotateGlobe: 0.5, skyColor: "#9ecef5", waterColor: "#466eab", extendedWater: 0, labels3d: 0, resolution: 2}; const options = {scale: 50, lightness: 0.7, shadow: 0.5, sun: {x: 100, y: 600, z: 1000}, rotateMesh: 0, rotateGlobe: 0.5, skyColor: "#9ecef5", waterColor: "#466eab", extendedWater: 0, labels3d: 0, resolution: 2};
// set variables // set variables
let Renderer, scene, camera, controls, animationFrame, material, texture, geometry, mesh, ambientLight, spotLight, waterPlane, waterMaterial, waterMesh, objexporter, square_geometry, texture_loader, raycaster; let Renderer, scene, camera, controls, animationFrame, material, texture, geometry, mesh, ambientLight, spotLight, waterPlane, waterMaterial, waterMesh, square_geometry, texture_loader, raycaster;
const drawCtx = document.createElement("canvas").getContext("2d"); const drawCtx = document.createElement("canvas").getContext("2d");
const drawSVG = document.createElementNS("http://www.w3.org/2000/svg", "svg"); const drawSVG = document.createElementNS("http://www.w3.org/2000/svg", "svg");
document.body.appendChild(drawSVG); document.body.appendChild(drawSVG);
@ -47,14 +47,13 @@
if (waterMaterial) waterMaterial.dispose(); if (waterMaterial) waterMaterial.dispose();
deleteLabels(); deleteLabels();
Renderer.renderLists.dispose(); // is it required? Renderer.renderLists.dispose();
Renderer.dispose(); Renderer.dispose();
scene.remove(mesh); scene.remove(mesh);
scene.remove(spotLight); scene.remove(spotLight);
scene.remove(ambientLight); scene.remove(ambientLight);
scene.remove(waterMesh); scene.remove(waterMesh);
// not sure it's required
Renderer = undefined; Renderer = undefined;
scene = undefined; scene = undefined;
controls = undefined; controls = undefined;
@ -104,7 +103,14 @@
if (options.isGlobe) options.rotateGlobe = speed; if (options.isGlobe) options.rotateGlobe = speed;
else options.rotateMesh = speed; else options.rotateMesh = speed;
controls.autoRotateSpeed = speed; controls.autoRotateSpeed = speed;
controls.autoRotate = Boolean(controls.autoRotateSpeed);
const startAnimation = !controls.autoRotate && Boolean(speed);
const endAnimation = controls.autoRotate && !Boolean(speed);
controls.autoRotate = Boolean(speed);
if (startAnimation) animate();
if (endAnimation) cancelAnimationFrame(animationFrame);
}; };
const toggleSky = function () { const toggleSky = function () {
@ -195,7 +201,8 @@
controls.maxPolarAngle = Math.PI / 2; controls.maxPolarAngle = Math.PI / 2;
controls.autoRotate = Boolean(options.rotateMesh); controls.autoRotate = Boolean(options.rotateMesh);
controls.autoRotateSpeed = options.rotateMesh; controls.autoRotateSpeed = options.rotateMesh;
animate(); if (controls.autoRotate) animate();
controls.addEventListener("change", render); controls.addEventListener("change", render);
return true; return true;
@ -403,7 +410,7 @@
mesh.receiveShadow = true; mesh.receiveShadow = true;
scene.add(mesh); scene.add(mesh);
render(); // needed for Raycaster to work, but why ? render();
deleteLabels(); deleteLabels();
if (options.labels3d) { if (options.labels3d) {
await createLabels(); await createLabels();
@ -517,8 +524,7 @@
} }
async function getOBJ() { async function getOBJ() {
objexporter = await OBJExporter(); const objexporter = await OBJExporter();
const data = await objexporter.parse(mesh); const data = await objexporter.parse(mesh);
return data; return data;
} }
@ -533,19 +539,18 @@
// render 3d scene and camera, do only on controls change // render 3d scene and camera, do only on controls change
function render() { function render() {
console.log("render");
Renderer.render(scene, camera); Renderer.render(scene, camera);
} }
// animate 3d scene and camera // animate 3d scene and camera
function animate() { function animate() {
console.log("animate");
animationFrame = requestAnimationFrame(animate); animationFrame = requestAnimationFrame(animate);
controls.update(); controls.update();
for (const mesh of textMeshs) { for (const mesh of textMeshs) {
if (mesh.animate) { if (mesh.animate) mesh.animate();
mesh.animate();
}
} }
Renderer.render(scene, camera);
} }
function loadTHREE() { function loadTHREE() {