Merge pull request #3 from maartin0/spirograph-fix

Spirograph fix

.node-version

@@ -0,0 +1 @@
+v18.17.1

.nvmrc

@@ -0,0 +1 @@
+v18.17.1

README.md

@@ -3,6 +3,8 @@
 Submission for the BPhO 2023 Computational Physics Challenge<br>
 A solar system viewer written in [three.js](https://github.com/mrdoob/three.js/)
 
+Functions can be found in [src/entities/algorithms.ts](src/entities/algorithms.ts)
+
 ## Planets
 Currently, the following planets are simulated:
 * The Sun

src/renderer/entities/algorithms.ts → src/entities/algorithms.ts

@@ -1,4 +1,4 @@
-import { AlgorithmProps, PhysicalBody, Timestamp } from '../../types';
+import { AlgorithmProps, PhysicalBody, Timestamp } from '../types';
 import { Vector3 } from 'three';
 
 const mul = Math.PI / 180;

src/renderer/entities/bodies.ts → src/entities/bodies.ts

@@ -1,4 +1,4 @@
-import { PhysicalBody, PhysicalBodyType } from '../../types';
+import { PhysicalBody, PhysicalBodyType } from '../types';
 
 export const SUN: PhysicalBody = {
     id: 10,

src/renderer/index.ts

@@ -15,8 +15,8 @@ import {
 } from 'three';
 import { loopState } from './loop';
 import { LabelProps } from '../widgets/Label';
-import bodies from './entities/bodies';
-import algorithms from './entities/algorithms';
+import bodies from '../entities/bodies';
+import algorithms from '../entities/algorithms';
 
 export const SPEED_OPTIONS = [
     {
@@ -66,6 +66,7 @@ export const controls: {
     selectedAlgorithms: AlgorithmProps[],
     spirograph: {
         options: SpirographOption[],
+        update: SpirographOption[],
     },
     labels: boolean,
 } = {
@@ -81,6 +82,7 @@ export const controls: {
     selectedAlgorithms: Object.values(algorithms).filter(a => a.defaultSelected),
     spirograph: {
         options: [],
+        update: [],
     },
     labels: true,
 }
@@ -115,6 +117,7 @@ export function update() {
         o.lines.forEach(l => l.removeFromParent())
         o.lines = [];
     });
+    controls.spirograph.options = controls.spirograph.update;
     loopState.speed = SPEED_OPTIONS[controls.speedIndex].value;
     nodes.forEach((node: PhysicalBodyNode) => {
         node.mesh.removeFromParent();

src/widgets/Controller.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { useMemo, useSyncExternalStore } from 'react';
 import SelectorWidget from './SelectorWidget';
-import bodies, { SUN } from '../renderer/entities/bodies';
-import algorithms from '../renderer/entities/algorithms';
+import bodies, { SUN } from '../entities/bodies';
+import algorithms from '../entities/algorithms';
 import { AlgorithmProps, PhysicalBody, PhysicalBodyNode, Selectable, SpirographOption } from '../types';
 import { controls, nodes, scheduleUpdate, SPEED_OPTIONS, updateSubscribe } from '../renderer';
 import FpsWidget from './FpsWidget';
@@ -129,7 +129,7 @@ export default ({ show }: Props) => {
                             lastPlot: loopState.lastTick,
                         });
                     }))} setter={(selected: Selectable[]) => {
-                    controls.spirograph.options = selected as SpirographOption[];
+                    controls.spirograph.update = selected as SpirographOption[];
                 }}/>
             </div>
             <div>