Update noteskin arrow tex using update

tillvit · Jan 10, 2024 · 7743ada · 7743ada
1 parent 41dc27f
commit 7743ada
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/app/src/chart/gameTypes/dance/default/DanceDefaultNoteTexture.ts b/app/src/chart/gameTypes/dance/default/DanceDefaultNoteTexture.ts
@@ -10,7 +10,6 @@ import {
   Sprite,
   Texture,
 } from "pixi.js"
-import { App } from "../../../../App"
 import { Options } from "../../../../util/Options"
 import { NotedataEntry } from "../../../sm/NoteTypes"
 
@@ -60,7 +59,7 @@ export class DanceDefaultNoteTexture {
 
   private static loaded = false
 
-  static async initArrowTex(app: App) {
+  static async initArrowTex() {
     if (this.loaded) return
 
     // Initialize rendertextures in here so we can read options
@@ -162,21 +161,6 @@ export class DanceDefaultNoteTexture {
       DanceDefaultNoteTexture.mineConainer.addChild(mine_frame)
     }
 
-    app.ticker.add(() => {
-      app.renderer.render(DanceDefaultNoteTexture.arrowFrame, {
-        renderTexture: DanceDefaultNoteTexture.arrowFrameTex,
-      })
-      app.renderer.render(DanceDefaultNoteTexture.arrowContainer, {
-        renderTexture: DanceDefaultNoteTexture.arrowTex,
-      })
-      app.renderer.render(DanceDefaultNoteTexture.mineConainer, {
-        renderTexture: DanceDefaultNoteTexture.mineTex,
-      })
-      app.renderer.render(DanceDefaultNoteTexture.liftContainer, {
-        renderTexture: DanceDefaultNoteTexture.liftTex,
-      })
-    })
-
     this.loaded = true
   }
 
@@ -221,7 +205,7 @@ export class DanceDefaultNoteTexture {
       .addIndex(vIndex)
   }
 
-  static setArrowTexTime(beat: number, second: number) {
+  static setArrowTexTime(app: App, beat: number, second: number) {
     if (!this.loaded) return
     for (let i = 0; i < 10; i++) {
       const tapShader: Mesh<Shader> =
@@ -235,6 +219,19 @@ export class DanceDefaultNoteTexture {
       DanceDefaultNoteTexture.mineConainer.children[0]
     )).shader.uniforms.time = second
     DanceDefaultNoteTexture.mineConainer.rotation = (second % 1) * Math.PI * 2
+
+    app.renderer.render(DanceDefaultNoteTexture.arrowFrame, {
+      renderTexture: DanceDefaultNoteTexture.arrowFrameTex,
+    })
+    app.renderer.render(DanceDefaultNoteTexture.arrowContainer, {
+      renderTexture: DanceDefaultNoteTexture.arrowTex,
+    })
+    app.renderer.render(DanceDefaultNoteTexture.mineConainer, {
+      renderTexture: DanceDefaultNoteTexture.mineTex,
+    })
+    app.renderer.render(DanceDefaultNoteTexture.liftContainer, {
+      renderTexture: DanceDefaultNoteTexture.liftTex,
+    })
   }
 
   static setNoteTex(arrow: Sprite, note: NotedataEntry) {

diff --git a/app/src/chart/gameTypes/dance/default/DanceDefaultNoteskin.ts b/app/src/chart/gameTypes/dance/default/DanceDefaultNoteskin.ts
@@ -11,7 +11,7 @@ class DanceDefaultNoteskinObject extends NoteSkin {
   constructor(renderer: ChartRenderer) {
     super(renderer)
 
-    DanceDefaultNoteTexture.initArrowTex(renderer.chartManager.app)
+    DanceDefaultNoteTexture.initArrowTex()
   }
 
   createReceptor(_: number) {
@@ -31,6 +31,7 @@ class DanceDefaultNoteskinObject extends NoteSkin {
 
   update(): void {
     DanceDefaultNoteTexture.setArrowTexTime(
+      this.renderer.chartManager.app,
       this.renderer.getVisualBeat(),
       this.renderer.getVisualTime()
     )