Refactor to use range (#48)

NonSpicyBurrito · Dec 1, 2024 · 9bf8102 · 9bf8102
1 parent a0bd59f
commit 9bf8102
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 107 deletions.
diff --git a/play/src/engine/playData/archetypes/SimLine.mts b/play/src/engine/playData/archetypes/SimLine.mts
@@ -13,11 +13,8 @@ export class SimLine extends Archetype {
 
     targetTime = this.entityMemory(Number)
 
-    visualTime = this.entityMemory({
-        min: Number,
-        max: Number,
-        hidden: Number,
-    })
+    visualTime = this.entityMemory(Range)
+    hiddenTime = this.entityMemory(Number)
 
     spawnTime = this.entityMemory(Number)
 
@@ -31,8 +28,9 @@ export class SimLine extends Archetype {
 
         this.targetTime = bpmChanges.at(this.aImport.beat).time
 
-        this.visualTime.max = timeScaleChanges.at(this.targetTime).scaledTime
-        this.visualTime.min = this.visualTime.max - note.duration
+        this.visualTime.copyFrom(
+            Range.l.mul(note.duration).add(timeScaleChanges.at(this.targetTime).scaledTime),
+        )
 
         this.spawnTime = this.visualTime.min
     }
@@ -51,7 +49,7 @@ export class SimLine extends Archetype {
 
     initialize() {
         if (options.hidden > 0)
-            this.visualTime.hidden = this.visualTime.max - note.duration * options.hidden
+            this.hiddenTime = this.visualTime.max - note.duration * options.hidden
 
         let l = this.aImport.lane
         let r = this.bImport.lane
@@ -74,7 +72,7 @@ export class SimLine extends Archetype {
             this.despawn = true
         if (this.despawn) return
 
-        if (options.hidden > 0 && time.scaled > this.visualTime.hidden) return
+        if (options.hidden > 0 && time.scaled > this.hiddenTime) return
 
         this.render()
     }

diff --git a/play/src/engine/playData/archetypes/notes/flatNotes/FlatNote.mts b/play/src/engine/playData/archetypes/notes/flatNotes/FlatNote.mts
@@ -1,5 +1,6 @@
 import { approach } from '../../../../../../../shared/src/engine/data/note.mjs'
 import { perspectiveLayout } from '../../../../../../../shared/src/engine/data/utils.mjs'
+import { toBucketWindows, Windows } from '../../../../../../../shared/src/engine/data/windows.mjs'
 import { options } from '../../../../configuration/options.mjs'
 import { sfxDistance } from '../../../effect.mjs'
 import { getHitbox, lane } from '../../../lane.mjs'
@@ -35,20 +36,14 @@ export abstract class FlatNote extends Note {
     abstract slotEffect: SlotEffect
     abstract slotGlowEffect: SlotGlowEffect
 
-    abstract windows: JudgmentWindows
+    abstract windows: Windows
 
     abstract bucket: Bucket
 
-    visualTime = this.entityMemory({
-        min: Number,
-        max: Number,
-        hidden: Number,
-    })
+    visualTime = this.entityMemory(Range)
+    hiddenTime = this.entityMemory(Number)
 
-    inputTime = this.entityMemory({
-        min: Number,
-        max: Number,
-    })
+    inputTime = this.entityMemory(Range)
 
     spriteLayouts = this.entityMemory({
         left: Quad,
@@ -60,27 +55,19 @@ export abstract class FlatNote extends Note {
     y = this.entityMemory(Number)
 
     globalPreprocess() {
-        const toMs = ({ min, max }: RangeLike) => ({
-            min: Math.round(min * 1000),
-            max: Math.round(max * 1000),
-        })
-
-        this.bucket.set({
-            perfect: toMs(this.windows.perfect),
-            great: toMs(this.windows.great),
-            good: toMs(this.windows.good),
-        })
+        this.bucket.set(toBucketWindows(this.windows))
 
         this.life.miss = -80
     }
 
     preprocess() {
         super.preprocess()
 
-        this.visualTime.max = timeScaleChanges.at(this.targetTime).scaledTime
-        this.visualTime.min = this.visualTime.max - note.duration
+        this.visualTime.copyFrom(
+            Range.l.mul(note.duration).add(timeScaleChanges.at(this.targetTime).scaledTime),
+        )
 
-        this.inputTime.min = this.targetTime + this.windows.good.min + input.offset
+        this.inputTime.copyFrom(this.windows.good.add(this.targetTime).add(input.offset))
 
         this.spawnTime = Math.min(
             this.visualTime.min,
@@ -92,7 +79,7 @@ export abstract class FlatNote extends Note {
 
     initialize() {
         if (options.hidden > 0)
-            this.visualTime.hidden = this.visualTime.max - note.duration * options.hidden
+            this.hiddenTime = this.visualTime.max - note.duration * options.hidden
 
         this.inputTime.max = this.targetTime + this.windows.good.max + input.offset
 
@@ -126,7 +113,7 @@ export abstract class FlatNote extends Note {
         if (this.despawn) return
 
         if (time.scaled < this.visualTime.min) return
-        if (options.hidden > 0 && time.scaled > this.visualTime.hidden) return
+        if (options.hidden > 0 && time.scaled > this.hiddenTime) return
 
         this.render()
     }

diff --git a/...e/playData/archetypes/notes/slideTickNotes/visibleSlideTickNotes/VisibleSlideTickNote.mts b/...e/playData/archetypes/notes/slideTickNotes/visibleSlideTickNotes/VisibleSlideTickNote.mts
@@ -21,11 +21,8 @@ export abstract class VisibleSlideTickNote extends SlideTickNote {
 
     abstract effect: ParticleEffect
 
-    visualTime = this.entityMemory({
-        min: Number,
-        max: Number,
-        hidden: Number,
-    })
+    visualTime = this.entityMemory(Range)
+    hiddenTime = this.entityMemory(Number)
 
     spriteLayout = this.entityMemory(Quad)
     z = this.entityMemory(Number)
@@ -35,8 +32,9 @@ export abstract class VisibleSlideTickNote extends SlideTickNote {
     preprocess() {
         super.preprocess()
 
-        this.visualTime.max = timeScaleChanges.at(this.targetTime).scaledTime
-        this.visualTime.min = this.visualTime.max - note.duration
+        this.visualTime.copyFrom(
+            Range.l.mul(note.duration).add(timeScaleChanges.at(this.targetTime).scaledTime),
+        )
 
         this.spawnTime = Math.min(
             this.visualTime.min,
@@ -50,7 +48,7 @@ export abstract class VisibleSlideTickNote extends SlideTickNote {
         super.initialize()
 
         if (options.hidden > 0)
-            this.visualTime.hidden = this.visualTime.max - note.duration * options.hidden
+            this.hiddenTime = this.visualTime.max - note.duration * options.hidden
 
         const b = 1 + note.h
         const t = 1 - note.h
@@ -81,7 +79,7 @@ export abstract class VisibleSlideTickNote extends SlideTickNote {
         if (this.despawn) return
 
         if (time.scaled < this.visualTime.min) return
-        if (options.hidden > 0 && time.scaled > this.visualTime.hidden) return
+        if (options.hidden > 0 && time.scaled > this.hiddenTime) return
 
         this.render()
     }

diff --git a/play/src/engine/playData/archetypes/slideConnectors/SlideConnector.mts b/play/src/engine/playData/archetypes/slideConnectors/SlideConnector.mts
@@ -65,8 +65,8 @@ export abstract class SlideConnector extends Archetype {
 
     visualTime = this.entityMemory({
         min: Number,
-        hidden: Number,
     })
+    hiddenTime = this.entityMemory(Number)
 
     spawnTime = this.entityMemory(Number)
 
@@ -113,7 +113,7 @@ export abstract class SlideConnector extends Archetype {
         this.tail.r = this.tail.lane + this.tailImport.size
 
         if (options.hidden > 0)
-            this.visualTime.hidden = this.tail.scaledTime - note.duration * options.hidden
+            this.hiddenTime = this.tail.scaledTime - note.duration * options.hidden
 
         this.z = getZ(layer.note.connector, this.start.time, this.startImport.lane)
 
@@ -223,7 +223,7 @@ export abstract class SlideConnector extends Archetype {
     }
 
     renderConnector() {
-        if (options.hidden > 0 && time.scaled > this.visualTime.hidden) return
+        if (options.hidden > 0 && time.scaled > this.hiddenTime) return
 
         const hiddenDuration = options.hidden > 0 ? note.duration * options.hidden : 0
 

diff --git a/play/src/engine/playData/archetypes/slotGlowEffects/SlotGlowEffect.mts b/play/src/engine/playData/archetypes/slotGlowEffects/SlotGlowEffect.mts
@@ -12,14 +12,8 @@ export abstract class SlotGlowEffect extends SpawnableArchetype({
     endTime = this.entityMemory(Number)
 
     layout = this.entityMemory({
-        l: {
-            min: Number,
-            max: Number,
-        },
-        r: {
-            min: Number,
-            max: Number,
-        },
+        l: Range,
+        r: Range,
         h: Number,
     })
     z = this.entityMemory(Number)

diff --git a/shared/src/engine/data/windows.mts b/shared/src/engine/data/windows.mts
@@ -1,10 +1,24 @@
+export type Windows = {
+    perfect: Range
+    great: Range
+    good: Range
+}
+
+const toMs = ({ min, max }: Range) => new Range(Math.round(min * 1000), Math.round(max * 1000))
+
+export const toBucketWindows = (windows: Windows) => ({
+    perfect: toMs(windows.perfect),
+    great: toMs(windows.great),
+    good: toMs(windows.good),
+})
+
 type Frames = number | [min: number, max: number]
 
 const fromFrames = (perfect: Frames, great: Frames, good: Frames) => {
     const toWindow = (frames: Frames) =>
         typeof frames === 'number'
-            ? { min: -frames / 60, max: frames / 60 }
-            : { min: -frames[0] / 60, max: frames[1] / 60 }
+            ? Range.one.mul(frames).div(60)
+            : new Range(-frames[0], frames[1]).div(60)
 
     return {
         perfect: toWindow(perfect),

diff --git a/watch/src/engine/watchData/archetypes/SimLine.mts b/watch/src/engine/watchData/archetypes/SimLine.mts
@@ -13,11 +13,8 @@ export class SimLine extends Archetype {
 
     targetTime = this.entityMemory(Number)
 
-    visualTime = this.entityMemory({
-        min: Number,
-        max: Number,
-        hidden: Number,
-    })
+    visualTime = this.entityMemory(Range)
+    hiddenTime = this.entityMemory(Number)
 
     initialized = this.entityMemory(Boolean)
 
@@ -29,8 +26,9 @@ export class SimLine extends Archetype {
 
         this.targetTime = bpmChanges.at(this.aImport.beat).time
 
-        this.visualTime.max = timeScaleChanges.at(this.targetTime).scaledTime
-        this.visualTime.min = this.visualTime.max - note.duration
+        this.visualTime.copyFrom(
+            Range.l.mul(note.duration).add(timeScaleChanges.at(this.targetTime).scaledTime),
+        )
     }
 
     spawnTime() {
@@ -55,7 +53,7 @@ export class SimLine extends Archetype {
     }
 
     updateParallel() {
-        if (options.hidden > 0 && time.scaled > this.visualTime.hidden) return
+        if (options.hidden > 0 && time.scaled > this.hiddenTime) return
 
         this.render()
     }
@@ -78,7 +76,7 @@ export class SimLine extends Archetype {
 
     globalInitialize() {
         if (options.hidden > 0)
-            this.visualTime.hidden = this.visualTime.max - note.duration * options.hidden
+            this.hiddenTime = this.visualTime.max - note.duration * options.hidden
 
         let l = this.aImport.lane
         let r = this.bImport.lane

diff --git a/watch/src/engine/watchData/archetypes/notes/flatNotes/FlatNote.mts b/watch/src/engine/watchData/archetypes/notes/flatNotes/FlatNote.mts
@@ -1,6 +1,7 @@
 import { lane } from '../../../../../../../shared/src/engine/data/lane.mjs'
 import { approach } from '../../../../../../../shared/src/engine/data/note.mjs'
 import { perspectiveLayout } from '../../../../../../../shared/src/engine/data/utils.mjs'
+import { toBucketWindows, Windows } from '../../../../../../../shared/src/engine/data/windows.mjs'
 import { options } from '../../../../configuration/options.mjs'
 import { sfxDistance } from '../../../effect.mjs'
 import { note } from '../../../note.mjs'
@@ -35,19 +36,16 @@ export abstract class FlatNote extends Note {
     abstract slotEffect: SlotEffect
     abstract slotGlowEffect: SlotGlowEffect
 
-    abstract windows: JudgmentWindows
+    abstract windows: Windows
 
     abstract bucket: Bucket
 
     sharedMemory = this.defineSharedMemory({
         despawnTime: Number,
     })
 
-    visualTime = this.entityMemory({
-        min: Number,
-        max: Number,
-        hidden: Number,
-    })
+    visualTime = this.entityMemory(Range)
+    hiddenTime = this.entityMemory(Number)
 
     initialized = this.entityMemory(Boolean)
 
@@ -61,25 +59,17 @@ export abstract class FlatNote extends Note {
     y = this.entityMemory(Number)
 
     globalPreprocess() {
-        const toMs = ({ min, max }: RangeLike) => ({
-            min: Math.round(min * 1000),
-            max: Math.round(max * 1000),
-        })
-
-        this.bucket.set({
-            perfect: toMs(this.windows.perfect),
-            great: toMs(this.windows.great),
-            good: toMs(this.windows.good),
-        })
+        this.bucket.set(toBucketWindows(this.windows))
 
         this.life.miss = -80
     }
 
     preprocess() {
         super.preprocess()
 
-        this.visualTime.max = timeScaleChanges.at(this.targetTime).scaledTime
-        this.visualTime.min = this.visualTime.max - note.duration
+        this.visualTime.copyFrom(
+            Range.l.mul(note.duration).add(timeScaleChanges.at(this.targetTime).scaledTime),
+        )
 
         this.sharedMemory.despawnTime = timeScaleChanges.at(this.hitTime).scaledTime
 
@@ -119,7 +109,7 @@ export abstract class FlatNote extends Note {
     }
 
     updateParallel() {
-        if (options.hidden > 0 && time.scaled > this.visualTime.hidden) return
+        if (options.hidden > 0 && time.scaled > this.hiddenTime) return
 
         this.render()
     }
@@ -162,7 +152,7 @@ export abstract class FlatNote extends Note {
 
     globalInitialize() {
         if (options.hidden > 0)
-            this.visualTime.hidden = this.visualTime.max - note.duration * options.hidden
+            this.hiddenTime = this.visualTime.max - note.duration * options.hidden
 
         const l = this.import.lane - this.import.size
         const r = this.import.lane + this.import.size

diff --git a/watch/src/engine/watchData/archetypes/notes/flatNotes/slideStartNotes/SlideStartNote.mts b/watch/src/engine/watchData/archetypes/notes/flatNotes/slideStartNotes/SlideStartNote.mts
@@ -1,8 +1,6 @@
 import { FlatNote } from '../FlatNote.mjs'
 
 export abstract class SlideStartNote extends FlatNote {
-    abstract windows: JudgmentWindows
-
     render() {
         if (time.scaled > this.visualTime.max) return