Merge remote-tracking branch 'dev/main'

pablo-mayrgundter · pablo-mayrgundter · commit 28a090be2919 · 2025-01-22T22:05:15.000+01:00
diff --git a/js/Celestiary.js b/js/Celestiary.js
@@ -90,7 +90,7 @@ export default class Celestiary {
           this.scene.toggleStarLabels()
           this.firstTime = false
         }
-      }, 1000)
+      }, this.firstTime ? 1000 : 0)
     }
 
     let path
diff --git a/js/Planet.js b/js/Planet.js
@@ -103,7 +103,6 @@ export default class Planet extends Object {
    */
   newOrbit(scene, orbit) {
     const group = named(new Group(), 'orbit')
-    group.visible = true
     const ellipseCurve = new EllipseCurve(
         0, 0,
         1, ellipseSemiMinorAxisCurve(assertInRange(orbit.eccentricity, 0, 1)),
@@ -192,7 +191,8 @@ export default class Planet extends Object {
 
     const labelLOD = new LOD()
     const name = capitalize(this.name)
-    const labelSheet = new SpriteSheet(1, name)
+    // TODO: single sheet for all planets/moons
+    const labelSheet = named(new SpriteSheet(1, name), 'label')
     labelSheet.add(0, 0, 0, name, labelTextColor)
     labelLOD.addLevel(FAR_OBJ, labelTooNearDist)
     labelLOD.addLevel(labelSheet.compile(), labelTooNearDist)
@@ -269,9 +269,9 @@ export default class Planet extends Object {
     }
     const group = new Group
     group.add(surface)
-    const internalGuidesRadius = this.props.radius.scalar * 0.7
+    const internalGuidesRadius = this.props.radius.scalar * 0.9
     group.add(new AxesHelper(internalGuidesRadius))
-    group.add(sphere({radius: internalGuidesRadius, wireframe: true, color: 0x808080}))
+    // group.add(sphere({radius: internalGuidesRadius, wireframe: true, color: 0x808080}))
     return named(group, 'planet surface and guides')
   }
 
diff --git a/js/Scene.js b/js/Scene.js
@@ -12,8 +12,6 @@ import * as Shared from './shared.js'
 import * as Utils from './utils.js'
 
 
-const
-  lengthScale = Shared.LENGTH_SCALE
 const INITIAL_STEP_BACK_MULT = 10
 
 
@@ -190,7 +188,7 @@ export default class Scene {
     tPos.setFromMatrixPosition(obj.matrixWorld)
     const pPos = new Vector3
     const cPos = new Vector3
-    const surfaceAltitude = obj.props.radius.scalar // * lengthScale
+    const surfaceAltitude = obj.props.radius.scalar
     pPos.set(0, 0, 0) // TODO(pablo): maybe put platform at surfaceAltitude
     const camDist = obj.initialCameraDistance || (surfaceAltitude * INITIAL_STEP_BACK_MULT)
     const elevationAngleRad = 15 / 360 * Math.PI * 2
@@ -366,7 +364,7 @@ export default class Scene {
 
   /** */
   togglePlanetLabels() {
-    Utils.visitToggleProperty(this.objects['sun'], 'name', 'label', 'visible')
+    Utils.visitToggleProperty(this.objects['sun'], 'name', 'label LOD', 'visible')
   }
 
 
diff --git a/js/Stars.js b/js/Stars.js
@@ -15,7 +15,7 @@ import StarsBufferGeometry from './StarsBufferGeometry.js'
 import StarsCatalog, {FAVES} from './StarsCatalog.js'
 import {assertDefined} from './assert.js'
 import * as Material from './material.js'
-import {FAR_OBJ, STAR_VOLUME_METERS} from './shared.js'
+import {FAR_OBJ, STARS_RADIUS_METER, SUN_RADIUS_METER} from './shared.js'
 import {named} from './utils.js'
 
 
@@ -42,7 +42,7 @@ export default class Stars extends Object {
     this.labelLOD = named(new LOD, 'LabelsLOD')
     this.labelLOD.visible = showLabels
     this.labelLOD.addLevel(this.labelsGroup, 1)
-    this.labelLOD.addLevel(FAR_OBJ, STAR_VOLUME_METERS)
+    this.labelLOD.addLevel(FAR_OBJ, STARS_RADIUS_METER)
     this.add(this.labelLOD)
     this.geom = null
 
@@ -75,7 +75,6 @@ export default class Stars extends Object {
   show() {
     this.geom = new StarsBufferGeometry(this.catalog)
     const starImage = Material.pathTexture('star_glow', '.png')
-    const sunSizeMeters = 6.957e8
     const starsMaterial = new ShaderMaterial({
       uniforms: {
         texSampler: {value: starImage},
@@ -87,7 +86,7 @@ export default class Stars extends Object {
         // surface just meet the glow in the png image.
         // STAR_MAGNIFY_2: {value: 2e4}, // 2e4, 2e9
         // CAMERA_EXPOSURE: {value: 3e16 * 3.7e-38},
-        STAR_MAGNIFY_2: {value: 1/sunSizeMeters * 1e1},
+        STAR_MAGNIFY_2: {value: 1/SUN_RADIUS_METER * 1e1},
         CAMERA_EXPOSURE: {value: 1},
         MIN_BRIGHT: {value: 1},
         MAX_BRIGHT: {value: 2e16}, // half-float max
diff --git a/js/StarsBufferGeometry.js b/js/StarsBufferGeometry.js
@@ -1,6 +1,5 @@
 import {BufferAttribute, BufferGeometry} from 'three'
 import {StarSpectra} from './StarsCatalog.js'
-import {METERS_PER_LIGHTYEAR} from './shared.js'
 
 
 /** Pack the data from a StarsCatalog into a BufferGeometry. */
diff --git a/js/StarsCatalog.js b/js/StarsCatalog.js
@@ -1,4 +1,4 @@
-import {LENGTH_SCALE, METERS_PER_LIGHTYEAR} from './shared.js'
+import {LENGTH_SCALE, LIGHTYEAR_METER} from './shared.js'
 import {assertEquals, assertNotNullOrUndefined} from './utils.js'
 
 // Format description at https://en.wikibooks.org/wiki/Celestia/Binary_Star_File
@@ -49,7 +49,7 @@ export default class StarsCatalog {
     minMag = -8.25390625,
     maxMag = 15.4453125,
     // 1E1 looks decent.  2E1 much more intriguing but a little fake.
-    starScale = METERS_PER_LIGHTYEAR,
+    starScale = LIGHTYEAR_METER,
     lengthScale = LENGTH_SCALE) {
     /** @type {StarByHip} */
     this.starByHip = starByHip
@@ -150,9 +150,9 @@ export default class StarsCatalog {
       /** @type {StarProps} */
       const star = {
         hipId: hipId,
-        x: x * METERS_PER_LIGHTYEAR,
-        y: y * METERS_PER_LIGHTYEAR,
-        z: z * METERS_PER_LIGHTYEAR,
+        x: x * LIGHTYEAR_METER,
+        y: y * LIGHTYEAR_METER,
+        z: z * LIGHTYEAR_METER,
         absMag: absMag,
         kind: kind,
         spectralType: type,
diff --git a/js/ThreeUI.js b/js/ThreeUI.js
@@ -25,7 +25,7 @@ import {Pass} from 'three/addons/postprocessing/Pass.js';
 import {RenderPass} from 'three/addons/postprocessing/RenderPass.js';
 import {ShaderPass} from 'three/addons/postprocessing/ShaderPass.js';
 import Fullscreen from '@pablo-mayrgundter/fullscreen.js/fullscreen.js'
-import {INITIAL_FOV, METERS_PER_LIGHTYEAR} from './shared.js'
+import {INITIAL_FOV, SMALLEST_SIZE_METER, STARS_RADIUS_METER, SUN_RADIUS_METER} from './shared.js'
 import {named} from './utils.js'
 
 
@@ -94,9 +94,13 @@ export default class ThreeUi {
 
   /** Sets camera near and far to deimos and local star cluster. */
   configLargeScene() {
-    this.camera.near = 6e5 // Little less than radius of deimos
-    this.camera.far = METERS_PER_LIGHTYEAR * 2e4 // Celestia catalog max
+    this.camera.near = SMALLEST_SIZE_METER
+    this.camera.far = STARS_RADIUS_METER * 2
     this.camera.updateProjectionMatrix()
+
+    // This is a bit of a hack.  Starting the camera away from center so there's
+    // less obvious jumping around, e.g. seeing inside of sun.
+    this.camera.position.z = SUN_RADIUS_METER * 1e3
   }
 
 
diff --git a/js/guide/Orbit.jsx b/js/guide/Orbit.jsx
@@ -176,7 +176,7 @@ function setup() {
       const orbit = curPlanet.orbit.props
       // console.log('has orbit!', orbit);
       // TODO: orig code read this as semiMajorAxis.scalar
-      const aRadius = 1// orbit.semiMajorAxis * LENGTH_SCALE;
+      const aRadius = 1
       const bRadius = aRadius * Math.sqrt(1.0 - Math.pow(orbit.eccentricity, 2.0))
       const angle = 1.0 * simTimeSecs / orbit.siderealOrbitPeriod.scalar * Shared.twoPi
       const x = aRadius * Math.cos(angle)
diff --git a/js/guide/Stars.jsx b/js/guide/Stars.jsx
@@ -2,7 +2,7 @@ import React, {ReactElement, useEffect} from 'react'
 import ThreeUi from '../ThreeUI'
 import StarsFromApp from '../Stars'
 import {getSunProps} from '../StarsCatalog'
-import {METERS_PER_LIGHTYEAR, ASTRO_UNIT_METER} from '../shared'
+import {ASTRO_UNIT_METER} from '../shared'
 import {ui as uiId} from './index.module.css'
 
 
diff --git a/js/shapes.js b/js/shapes.js
@@ -1,6 +1,7 @@
 import {
   AdditiveBlending,
   ArrowHelper,
+  BackSide,
   BoxGeometry,
   BufferAttribute,
   BufferGeometry,
@@ -77,7 +78,8 @@ export function sphere(opts) {
         depthTest: true,
         depthWrite: false,
         toneMapped: false,
-        transparent: true,
+        transparent: false,
+        side: BackSide,
       }) :
       new MeshPhongMaterial({
         flatShading: true,
diff --git a/js/shared.js b/js/shared.js
@@ -6,44 +6,31 @@ import {
 import {named} from './utils.js'
 
 
-// This size is chosen to allow for the maximum object and distance
-// size range in the scene.  The smallest object in the scene is
-// Mars's moon Deimos, which is 6.2E3 m.  The smallest size I found
-// that three/webgl supports is 1E-4.  So rounding Deimos down to 1E3,
-// and then dividing it down to the smallest size.
-
-// Deimos size in meters.
-const SMALLEST_REAL_SIZE = 1E3
-// Smallest renderable size.
-// const SMALLEST_RENDER_SIZE = 1E-4
-const SMALLEST_RENDER_SIZE = 1E-4
-
-
-export const
-  FAR_OBJ = named(new Object3D, 'LODFarObj') // for invisible LOD.
+// Geom
 export const twoPi = Math.PI * 2.0
 export const halfPi = Math.PI / 2.0
 export const toDeg = 180.0 / Math.PI
 export const toRad = Math.PI / 180.0
 
-export const ASTRO_UNIT_METER = 149.60e9
-// When I hardcode LENGTH_SCALE to 1E-5, LOD starts to flake out
-// when zoomed to small sizes, supporting the 1E-4 minimum.
-// SMALLEST_RENDER_SIZE / SMALLEST_REAL_SIZE = 1E-7, but can't use
-// the calculation since it actually yields 1.0000000000000001e-7.
-// export const LENGTH_SCALE = 1E-11
-// export const LENGTH_SCALE = SMALLEST_RENDER_SIZE / SMALLEST_REAL_SIZE
-export const LENGTH_SCALE = 1e-5 // one scene unit per million meters
-
+// Phys
 // Celestia star data file measures star distances in lightyears
-export const METERS_PER_LIGHTYEAR = 9.461e15
-export const STAR_VOLUME_METERS = METERS_PER_LIGHTYEAR * 2e4 // largest coords for stars
-// export const STARS_SCALE = METERS_PER_LIGHTYEAR * LENGTH_SCALE
-export const STARS_SCALE = METERS_PER_LIGHTYEAR
-// export const STARS_SCALE = 9.461E12 * 1E3 * LENGTH_SCALE
+export const LIGHTYEAR_METER = 9.461e15
 
-export const INITIAL_FOV = 45
+// Astro
+// https://en.wikipedia.org/wiki/Astronomical_unit
+export const ASTRO_UNIT_METER = 149.597870700e9
 
+// Camera
+export const INITIAL_FOV = 45
+// largest coords for stars in Celestia dataset
+export const STARS_RADIUS_METER = LIGHTYEAR_METER * 1e4
+// This size is chosen to allow for the maximum object and distance size range
+// in the scene.  The smallest object in the scene is Mars's moon Deimos, which
+// is 6.2e3m, but going a bit smaller to allow zoom in on it as well.
+export const SMALLEST_SIZE_METER = 6e5
+export const SUN_RADIUS_METER = 6.957e8
+
+// three.js Objects
 export const targets = {
   origin: new Vector3,
   cur: null,
@@ -52,7 +39,13 @@ export const targets = {
   track: null,
   follow: null,
 }
+// for invisible LOD.
+export const FAR_OBJ = named(new Object3D, 'LODFarObj')
 
 // Colors
 export const labelTextColor = '#7fa0e0'
 export const labelTextFont = 'medium arial'
+
+// Deprecated: moving to real sizes
+export const LENGTH_SCALE = 1e-5 // one scene unit per million meters
+export const STARS_SCALE = LIGHTYEAR_METER
diff --git a/js/utils.js b/js/utils.js
@@ -105,13 +105,13 @@ export function visit(elt, cb1, cb2, cb3, level = 1) {
  */
 export function visitFilterProperty(elt, propName, propValue, cb) {
   visit(
-      elt,
-      /** @param {Object<string, any>} child */
-      (child) => {
-        if (child[propName] === propValue) {
-          cb(child)
-        }
-      })
+    elt,
+    /** @param {Object<string, any>} child */
+    (child) => {
+      if (child[propName] === propValue) {
+        cb(child)
+      }
+    })
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ export default class Celestiary {`
`90`	`90`	`this.scene.toggleStarLabels()`
`91`	`91`	`this.firstTime = false`
`92`	`92`	`}`
`93`		`- }, 1000)`
	`93`	`+ }, this.firstTime ? 1000 : 0)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`let path`