Polish

allowGPU -> allowUncompressedTextures + new argument for funkin.Assets.getBitmapData func

Co-Authored-By: Mihai Alexandru <[email protected]>

Author: PurSnake

source/funkin/Preferences.hx

@@ -34,7 +34,7 @@ class Preferences
   {
     #if desktop
     Save.instance.options.vramCaching = value;
-    openfl.utils.Assets.allowGPU = FunkinMemory.allowVRAMCaching = value;
+    openfl.utils.Assets.allowUncompressedTextures = FunkinMemory.allowVRAMCaching = value;
     Save.instance.flush();
     return value;
     #else
@@ -542,7 +542,7 @@ class Preferences
     #end
 
     #if desktop
-    openfl.utils.Assets.allowGPU = FunkinMemory.allowVRAMCaching = Preferences.vramCaching;
+    openfl.utils.Assets.allowUncompressedTextures = FunkinMemory.allowVRAMCaching = Preferences.vramCaching;
     #end
   }
 

source/funkin/ui/debug/charting/ChartEditorState.hx

@@ -2635,7 +2635,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     playheadBlock.y = -PLAYHEAD_HEIGHT / 2;
     gridPlayhead.add(playheadBlock);
 
-    openfl.utils.Assets.allowGPU = false;
+    openfl.utils.Assets.allowUncompressedTextures = false;
     // Character icons.
     healthIconDad = new HealthIcon(currentSongMetadata.playData.characters.opponent);
     healthIconDad.autoUpdate = false;
@@ -2650,7 +2650,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     add(healthIconBF);
     healthIconBF.zIndex = 30;
 
-    openfl.utils.Assets.allowGPU = FunkinMemory.allowVRAMCaching;
+    openfl.utils.Assets.allowUncompressedTextures = FunkinMemory.allowVRAMCaching;
     add(audioWaveforms);
   }
 
@@ -5673,7 +5673,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
   {
     if (healthIconsDirty)
     {
-      openfl.utils.Assets.allowGPU = false;
+      openfl.utils.Assets.allowUncompressedTextures = false;
       var charDataBF = CharacterDataParser.fetchCharacterData(currentSongMetadata.playData.characters.player);
       var charDataDad = CharacterDataParser.fetchCharacterData(currentSongMetadata.playData.characters.opponent);
       if (healthIconBF != null)
@@ -5698,7 +5698,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
       healthIconsDirty = false;
     }
 
-    openfl.utils.Assets.allowGPU = FunkinMemory.allowVRAMCaching;
+    openfl.utils.Assets.allowUncompressedTextures = FunkinMemory.allowVRAMCaching;
     // Right align, and visibly center, the BF health icon.
     if (healthIconBF != null)
     {

source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx

@@ -46,7 +46,7 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
 
   function initialize(charType:CharacterType, lockPosition:Bool)
   {
-    openfl.utils.Assets.allowGPU = false;
+    openfl.utils.Assets.allowUncompressedTextures = false;
     currentCharId = switch (charType)
     {
       case BF: chartEditorState.currentSongMetadata.playData.characters.player;
@@ -137,7 +137,7 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu
     }
 
     charIconName.text = defaultText;
-    openfl.utils.Assets.allowGPU = FunkinMemory.allowVRAMCaching;
+    openfl.utils.Assets.allowUncompressedTextures = FunkinMemory.allowVRAMCaching;
   }
 
   public static function build(chartEditorState:ChartEditorState, charType:CharacterType, lockPosition:Bool = false):ChartEditorCharacterIconSelectorMenu

source/funkin/ui/freeplay/backcards/BackingCard.hx

@@ -45,13 +45,13 @@ class BackingCard extends FlxSpriteGroup implements IBPMSyncedScriptedClass impl
 
     this.currentCharacter = currentCharacter;
 
-    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/cardGlow'), false), FreeplayState.CUTOUT_WIDTH);
+    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/cardGlow'), false, false), FreeplayState.CUTOUT_WIDTH);
     cardGlow = new FlxSprite(-30, -30).loadGraphic(bitmap);
 
     confirmGlow = new FlxSprite((FreeplayState.CUTOUT_WIDTH * FreeplayState.DJ_POS_MULTI) + -30, 240).loadGraphic(Paths.image('freeplay/confirmGlow'));
     confirmTextGlow = new FlxSprite((FreeplayState.CUTOUT_WIDTH * FreeplayState.DJ_POS_MULTI) + -8, 115).loadGraphic(Paths.image('freeplay/glowingText'));
 
-    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/pinkBack'), false), FreeplayState.CUTOUT_WIDTH);
+    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/pinkBack'), false, false), FreeplayState.CUTOUT_WIDTH);
     pinkBack = new FunkinSprite();
     pinkBack.loadGraphic(bitmap);
 

source/funkin/ui/freeplay/backcards/NewCharacterCard.hx

@@ -130,7 +130,7 @@ class NewCharacterCard extends BackingCard
     friendFoe2 = new BGScrollingText(0, 402, 'COULD IT BE A NEW FRIEND? OR FOE??', FlxG.width, true, 43);
     newUnlock3 = new BGScrollingText(0, 458, 'NEW UNLOCK!', FlxG.width / 2, true, 80);
 
-    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/darkback'), false),
+    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/darkback'), false, false),
       FreeplayState.CUTOUT_WIDTH);
     darkBg = new FlxSprite(0, 0).loadGraphic(bitmap);
     add(darkBg);
@@ -159,7 +159,7 @@ class NewCharacterCard extends BackingCard
     newUnlock3.speed = 2;
     add(newUnlock3);
 
-    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/multiplyBar'), false),
+    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/multiplyBar'), false, false),
       FreeplayState.CUTOUT_WIDTH);
     multiplyBar = new FlxSprite(-10, 440).loadGraphic(bitmap);
     multiplyBar.blend = BlendMode.MULTIPLY;
@@ -170,7 +170,8 @@ class NewCharacterCard extends BackingCard
     lightLayer.blend = BlendMode.ADD;
     add(lightLayer);
 
-    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/red'), false), FreeplayState.CUTOUT_WIDTH);
+    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/red'), false, false),
+      FreeplayState.CUTOUT_WIDTH);
     multiply1 = new FlxSprite(-15, -125).loadGraphic(bitmap);
     multiply1.blend = BlendMode.MULTIPLY;
     add(multiply1);
@@ -184,7 +185,7 @@ class NewCharacterCard extends BackingCard
     lightLayer2.blend = BlendMode.ADD;
     add(lightLayer2);
 
-    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/yellow bg piece'), false),
+    var bitmap = BitmapUtil.scalePartByWidth(Assets.getBitmapData(Paths.image('freeplay/backingCards/newCharacter/yellow bg piece'), false, false),
       FreeplayState.CUTOUT_WIDTH);
     yellow = new FlxSprite(0, 0).loadGraphic(bitmap);
     yellow.blend = BlendMode.MULTIPLY;