Merge changes from main (#892)

* repair ScriptableShader.shader = null (#877)

* optimize updateInput (#878)

* optimize updateInput

* resize optimize

* __notePerStrum optimize

* Update StrumLine.hx

* NoteGroup optimize (#881)

* NoteGroup optimize

* CoolUtil.bound faster

* makes commit with github desktop W FRAKITS

* Use fastSinCos for notes (#889)

* Update Strum.hx

* Update Strum.hx

---------

Co-authored-by: HEIHUAa <112499486+HEIHUAa@users.noreply.github.com>
Co-authored-by: Frakits <90983918+Frakits@users.noreply.github.com>

project.xml

@@ -19,7 +19,7 @@
 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
 
-	<!-- DO NOT REMOVE!! -->
+	<!-- DO NOT REMOVE!! ALLOWS ME TO DO REGIONS LIKE IN C# AND KEEP CODE ORGANIZED. REMOVING IT WOULD BREAK THE ENGINE -->
 	<haxedef name="REGION" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
@@ -72,11 +72,7 @@
 
 	<!-- Comment this out to prevent extending classes in hscript.
 		 Reduces compilation time at the cost of limited HScript flexibility. !-->
-	<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE"/>
-
-	<!-- Comment this out to disable support for abstracts in hscript.
-		 Reduces compilation time at the cost of limited HScript flexibility. !-->
-	<define name="HSCRIPT_ABSTRACT_SUPPORT" unless="STRIPPED_COMPILE"/>
+	<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE" />
 
 	<!-- Comment this out to disable multithreading !-->
 	<haxedef name="ALLOW_MULTITHREADING" unless="web || flash" />
@@ -119,24 +115,6 @@
 	<!-- Disable a optimization, to allow reflection to use more functions -->
 	<define name="FLX_NO_GENERIC" />
 
-	<!-- _______________________________ Display Server ______________________________ -->
-
-	<haxedef name="LIME_CMD" value="${project.command}"/>
-	<define name="LIME_DISPLAY" if="${project.command == update} || ${project.command == display} || display || display_details" />
-	<haxedef name="LIME_DISPLAY" if="LIME_DISPLAY" />
-
-	<section if="LIME_DISPLAY">
-		<!-- For display server -->	
-		<undefine name="COMPILE_ALL_CLASSES" />
-		<unset name="COMPILE_ALL_CLASSES" />
-		
-		<undefine name="HSCRIPT_ABSTRACT_SUPPORT" />
-		<unset name="HSCRIPT_ABSTRACT_SUPPORT" />
-
-		<undefine name="CUSTOM_CLASSES" />
-		<unset name="CUSTOM_CLASSES" />
-	</section>
-
 	<!-- _______________________________ Libraries ______________________________ -->
 
 	<!-- KEEP BOTH OF THESE AS THERE ARE SOME PARTICULAR CASES! -->
@@ -194,7 +172,7 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
-	<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()" unless="display" />
+	<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()" />
 
 	<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
 
@@ -241,10 +219,8 @@
 		<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
 	</section>
 
-
 	<section if="COMPILE_ALL_CLASSES">
 		<haxeflag name="-dce" value="no" />
-		
 		<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.addAdditionalClasses()" />
 	</section>
 

source/funkin/backend/FunkinSprite.hx

@@ -374,10 +374,6 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
 
 		super.prepareDrawMatrix(matrix, camera);
 
-		applyZoomFactor(matrix, camera);
-	}
-
-	function applyZoomFactor(matrix:FlxMatrix, camera:FlxCamera) {
 		if(__shouldDoZoomFactor()) {
 			__prepareZoomFactor(_rect2, camera);
 			matrix.setTo(

source/funkin/backend/system/macros/AliasMacro.hx

@@ -25,7 +25,7 @@ class AliasMacro {
     }];
 
     public static function build():Array<Field> {
-        #if LIME_DISPLAY
+        #if display
         return Context.getBuildFields();
         #end
         

source/funkin/backend/system/macros/DefinesMacro.hx

@@ -19,9 +19,9 @@ class DefinesMacro {
 
 	// INTERNAL MACROS
 	#if REGION
-	private static macro function __getDefines():Expr {
+	private static macro function __getDefines() {
 		#if display
-		return macro $v{([]:Map<String, Dynamic>)};
+		return macro $v{[]};
 		#else
 		return macro $v{Context.getDefines()};
 		#end

source/funkin/backend/system/macros/GitCommitMacro.hx

@@ -64,7 +64,7 @@ class GitCommitMacro {
 	// INTERNAL MACROS
 	#if REGION
 	private static macro function __getCommitHash() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{"-"};
 		#else
 		try {
@@ -78,7 +78,7 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getCommitNumber() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{0};
 		#else
 		try {
@@ -92,7 +92,7 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getCommitHashLong() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{"-"};
 		#else
 		try {
@@ -106,7 +106,7 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getCommitMessage() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{"-"};
 		#else
 		try {
@@ -124,7 +124,7 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getCommitAuthor() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{"-"};
 		#else
 		try {
@@ -138,8 +138,8 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getCommitDate() {
-		#if LIME_DISPLAY
-		return macro Date.now();
+		#if display
+		return macro $v{Date.now()};
 		#else
 		try {
 			// get the time in UTC format
@@ -164,7 +164,7 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getCurrentBranch() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{"-"};
 		#else
 		try {
@@ -179,7 +179,7 @@ class GitCommitMacro {
 	}
 
 	private static macro function __getHasUncommittedChanges() {
-		#if LIME_DISPLAY
+		#if display
 		return macro $v{false};
 		#else
 		try {

source/funkin/game/Character.hx

@@ -1,5 +1,6 @@
 package funkin.game;
 
+import sys.FileSystem;
 import flixel.util.FlxSpriteUtil;
 import openfl.display.Graphics;
 import flixel.util.typeLimit.OneOfTwo;
@@ -89,8 +90,6 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		scripts.call("create");
 		buildCharacter(xml);
 		scripts.call("postCreate");
-
-		
 	}
 
 	@:noCompletion var __swappedLeftRightAnims:Bool = false;
@@ -159,9 +158,9 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		if (event.cancelled) return;
 
 		if (isDanceLeftDanceRight)
-			playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, false, DANCE);
+			playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, DANCE);
 		else
-			playAnim('idle' + idleSuffix, false, DANCE);
+			playAnim('idle' + idleSuffix, DANCE);
 	}
 
 	public function tryDance() {