Apply root component RNG options to controller

FelixHenninger · May 7, 2024 · ab0b816 · ab0b816
1 parent 94c74f3
commit ab0b816
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/packages/library/src/base/component.ts b/packages/library/src/base/component.ts
@@ -151,6 +151,10 @@ export class Component {
  this.options.parameters,
  )
  this.internals.armOptions = arm
+
+ // Setup plugins
+ //@ts-ignore Use not-for-public-consumption method
+ plugins.init()
  }
 
  log(message: string) {

diff --git a/packages/library/src/base/plugin.ts b/packages/library/src/base/plugin.ts
@@ -14,7 +14,9 @@ export class PluginAPI<C extends Component = Component, E = string> {
  constructor(context: C, plugins: Array<Plugin<C, E>> = []) {
  this.#context = context
  this.plugins = plugins
+ }
 
+ private init() {
  // Initialize existing plugins
  this.plugins.forEach(p => p.handle(this.#context, 'plugin:add'))
 

diff --git a/packages/library/src/core/component.ts b/packages/library/src/core/component.ts
@@ -127,6 +127,7 @@ export class Component extends BaseComponent {
  this.internals.controller = new Controller({
  root: this,
  el: this.options.el,
+ random: this.options.random,
  })
  }
 

diff --git a/packages/library/src/core/controller.ts b/packages/library/src/core/controller.ts
@@ -40,12 +40,20 @@ export interface ControllerGlobal {
  */
 export class Controller extends BaseController<Component> {
  global!: ControllerGlobal
- #seed: String
+ #random?: RNGOptions
 
  /**
  * Create a new controller
  */
- constructor({ root, el }: { root: Component; el?: Element }) {
+ constructor({
+ root,
+ el,
+ random,
+ }: {
+ root: Component
+ el?: Element
+ random?: RNGOptions
+ }) {
  const audioContext = new (window.AudioContext ??
  window.webkitAudioContext)()
 
@@ -75,17 +83,20 @@ export class Controller extends BaseController<Component> {
 
  super({ root, global, initialContext })
 
- // Generate random seed
- this.#seed = autoSeed()
+ // Setup RNG options
+ this.#random = random
  }
 
  createRNG(seedFragment: String, options: RNGOptions = {}) {
  // Auto-generate seed by combining controller seed + component ID
- const seed = `${this.#seed}-${seedFragment}`
+ const seed = this.#random?.seed
+ ? `${this.#random?.seed}-${seedFragment}`
+ : undefined
 
  return new Random({
  seed,
- ...options, // Allow manual override of component seed
+ ...this.#random,
+ ...options, // Allow manual override of global options
  })
  }
 }