gitadmin/sunscope
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.9.3.2

Browse Source 
Moon phase fix 2
This commit is contained in:
fraxle
2026-05-27 14:29:01 +01:00
parent 2c0cac5094
commit 6952f0e1c0
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/components.js
+4 -6
View File
@@ -192,9 +192,8 @@ export function SkyScope({ elev, dt, glob = 0, size = 26 }) {
const phase = moonPhaseFraction(dt); const phase = moonPhaseFraction(dt);
const moonR = innerR * 0.55; const moonR = innerR * 0.55;
const phaseOffset = Math.cos(Math.PI * phase) * moonR; const shadowOffset = (1 - Math.abs(2 * phase - 1)) * 2 * moonR;
const moonLitFromRight = phase < 0.5; const shadowCx = r + (phase < 0.5 ? -shadowOffset : shadowOffset);
const shadowCx = r + phaseOffset;
const grass = grassFillForElev(elev); const grass = grassFillForElev(elev);
const uid = `ss-${size}-${Math.round(elev * 10)}-${Math.round(phase * 1000)}-${isRising ? 'r' : 's'}`; const uid = `ss-${size}-${Math.round(elev * 10)}-${Math.round(phase * 1000)}-${isRising ? 'r' : 's'}`;
@@ -437,9 +436,8 @@ export function ScopeReticle({ value, cat, loading, elev = 0, dt = new Date(), g
const sunGlowPeak = 0.30 + radFrac * 0.45 + horizFrac * 0.15; // centre opacity const sunGlowPeak = 0.30 + radFrac * 0.45 + horizFrac * 0.15; // centre opacity
const moonDrawR = 15; const moonDrawR = 15;
const moonY = cy - 45; const moonY = cy - 45;
const phaseOffset = Math.cos(Math.PI * phase) * moonDrawR; const shadowOffset = (1 - Math.abs(2 * phase - 1)) * 2 * moonDrawR;
const moonLitFromRight = phase < 0.5; const moonShadowCx = cx + (phase < 0.5 ? -shadowOffset : shadowOffset);
const moonShadowCx = cx + phaseOffset;
// Readout text colours flip with day/night for legibility against the sky. // Readout text colours flip with day/night for legibility against the sky.
const readoutColor = isDay ? '#1e1208' : '#f5edd6'; const readoutColor = isDay ? '#1e1208' : '#f5edd6';
const readoutMutedColor = isDay ? '#9a7d5a' : '#d4c5a8'; const readoutMutedColor = isDay ? '#9a7d5a' : '#d4c5a8';
assets/js/utils.js
+1 -1
View File
@@ -294,7 +294,7 @@ export function confidenceBand(i) {
export function moonPhaseFraction(date) { export function moonPhaseFraction(date) {
const JD = date.getTime() / 86400000 + 2440587.5; const JD = date.getTime() / 86400000 + 2440587.5;
const syn = 29.530588; const syn = 29.530588;
const ref = 2451550.2597; const ref = 2451560.2054;
let p = ((JD - ref) % syn) / syn; let p = ((JD - ref) % syn) / syn;
if (p < 0) p += 1; if (p < 0) p += 1;
return p; return p;