Update Split Line

SonolusHaniwa · Apr 26, 2024 · e76acf4 · e76acf4
1 parent 5585aba
commit e76acf4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 dist/*
 !dist/thumbnail.jpg
-!dist/banner.jpg
+!dist/banner.jpg
+main
diff --git a/engine/play/SplitLine.cpp b/engine/play/SplitLine.cpp
@@ -10,7 +10,7 @@ class SplitLine: public Archetype {
 	defineImports(color);
 
     SonolusApi spawnOrder() { return 1000 + beat - splitLineAnimationStart + appearTime; }
-    SonolusApi shouldSpawn() { return times.scaled > beat - splitLineAnimationStart; }
+    SonolusApi shouldSpawn() { return times.scaled > TimeToScaledTime(beat) - splitLineAnimationStart; }
 
     SonolusApi preprocess() {
     	FUNCBEGIN
@@ -23,11 +23,11 @@ class SplitLine: public Archetype {
     	FUNCBEGIN
     	IF (split < 1 && split > 6) Return(0); FI
         getSplitLine(color);
-        IF (times.scaled > endBeat) {
-            drawDisappearLine(times.scaled - endBeat, split);
+        IF (times.scaled > TimeToScaledTime(endBeat)) {
+            drawDisappearLine(times.scaled - TimeToScaledTime(endBeat), split);
         } ELSE {
-	        IF (times.scaled < beat) {
-	            drawAppearLine(splitLineAnimationStart - beat + times.scaled, split);
+	        IF (times.scaled < TimeToScaledTime(beat)) {
+	            drawAppearLine(splitLineAnimationStart - TimeToScaledTime(beat) + times.scaled, split);
 	        } ELSE {
 	            drawSplitLine(split);
 	        } FI
@@ -37,7 +37,7 @@ class SplitLine: public Archetype {
 
     SonolusApi updateParallel() {
     	FUNCBEGIN
-        IF (times.scaled > endBeat + splitLineAnimationEnd) {
+        IF (times.now > TimeToScaledTime(endBeat) + splitLineAnimationEnd) {
             EntityDespawn.set(0, 1);
         } FI
 	    return VOID;

diff --git a/engine/watch/SplitLine.cpp b/engine/watch/SplitLine.cpp
@@ -9,8 +9,8 @@ class SplitLine: public Archetype {
 	defineImports(split);
 	defineImports(color);
 
-    SonolusApi spawnTime() { return beat - splitLineAnimationStart; }
-    SonolusApi despawnTime() { return endBeat + splitLineAnimationEnd; }
+    SonolusApi spawnTime() { return TimeToScaledTime(beat) - splitLineAnimationStart; }
+    SonolusApi despawnTime() { return TimeToScaledTime(endBeat) + splitLineAnimationEnd; }
 
     SonolusApi preprocess() {
     	FUNCBEGIN
@@ -23,11 +23,11 @@ class SplitLine: public Archetype {
     	FUNCBEGIN
 		IF (split < 1 || split > 6) Return(0); FI
         getSplitLine(color);
-        IF (times.scaled > endBeat) {
-            drawDisappearLine(times.scaled - endBeat, split);
+        IF (times.scaled > TimeToScaledTime(endBeat)) {
+            drawDisappearLine(times.scaled - TimeToScaledTime(endBeat), split);
         } ELSE {
-	        IF (times.scaled < beat) {
-	            drawAppearLine(splitLineAnimationStart - beat + times.scaled, split);
+	        IF (times.scaled < TimeToScaledTime(beat)) {
+	            drawAppearLine(splitLineAnimationStart - TimeToScaledTime(beat) + times.scaled, split);
 	        } ELSE {
 	            drawSplitLine(split);
 	        } FI

diff --git a/main b/main