Skip to content

Commit

Permalink
Base game note splashes
Browse files Browse the repository at this point in the history 
GPU Caching -> VRAM Only Sprites
Remove two unused files
  • Loading branch information
@what-is-a-git
what-is-a-git committed Sep 23, 2024
1 parent c1ae970 commit 0bb36a7
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 104 deletions.
2 changes: 0 additions & 2 deletions Project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@

<assets path="CHANGELOG.md" rename='changelog.txt' />

<assets path="console.bat" if="windows" />

<assets path="version.txt" />
<!--https://github.com/FunkinCrew/Funkin/pull/3318-->
<assets path="alsoft.ini" if="lime_openal"/> <!--this is important i think-->
Expand Down
4 changes: 0 additions & 4 deletions TODO.md
View file

This file was deleted.

Binary file modified assets/shared/images/ui skins/default/arrows/Note_Splashes.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
150 changes: 55 additions & 95 deletions assets/shared/images/ui skins/default/arrows/Note_Splashes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,95 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="Note_Splashes.png">
<!-- Created with Adobe Animate version 23.0.1.70 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="note splash down0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash down20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash down20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash left0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash left20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash left20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash plus0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash plus0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash plus0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash plus0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash plus0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rdown0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rdown20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rdown20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash right0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash right20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash right20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rleft0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rleft20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rleft20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rright0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rright20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rright20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rup0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash rup20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash rup20004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash square0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash square0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash square0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash square0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash square0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash up0000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up0001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up0002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up0003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up0004" x="194" y="200" width="188" height="198"/>
<SubTexture name="note splash up20000" x="5" y="5" width="108" height="118" frameX="-31" frameY="-37" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up20001" x="118" y="5" width="164" height="184" frameX="-11" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up20002" x="287" y="5" width="182" height="190" frameX="-1" frameY="-2" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up20003" x="5" y="200" width="184" height="192" frameX="-1" frameY="-1" frameWidth="188" frameHeight="198"/>
<SubTexture name="note splash up20004" x="194" y="200" width="188" height="198"/>
</TextureAtlas>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
-->
<TextureAtlas imagePath="Note_Splashes.png" width="924" height="302">
<SubTexture name="note splash left0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash left0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash left0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash left0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash down0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash down0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash down0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash down0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash up0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash up0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash up0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash up0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash right0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash right0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash right0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash right0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash square0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash square0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash square0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash square0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash rleft0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rleft0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rleft0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rleft0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash rdown0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rdown0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rdown0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rdown0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash rup0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rup0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rup0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rup0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash rright0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rright0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rright0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash rright0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>

<SubTexture name="note splash plus0000" x="217" y="2" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash plus0001" x="2" y="2" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash plus0002" x="408" y="2" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash plus0003" x="662" y="2" width="260" height="298" frameX="-0" frameY="-0" frameWidth="260" frameHeight="298"/>
</TextureAtlas>
1 change: 0 additions & 1 deletion console.bat
View file

This file was deleted.

4 changes: 2 additions & 2 deletions source/states/OptionsMenu.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class OptionsMenu extends MusicBeatState {
new BoolOption("Animated Backgrounds", "animatedBGs"),
new BoolOption("Preload Stage Events", "preloadChangeBGs"),
new BoolOption("Persistent Cached Data", "memoryLeaks"),
new BoolOption("GPU caching", "gpuCaching"),
new BoolOption("VRAM Only Sprites", "gpuCaching"),
#if MODCHARTING_TOOLS
new BoolOption("Optimized Modcharts", "optimizedModcharts"),
#end
Expand Down Expand Up @@ -181,7 +181,7 @@ class OptionsMenu extends MusicBeatState {
else
menuBG = new FlxSprite().loadGraphic(Paths.image('ui skins/' + ui_Skin + '/backgrounds' + '/menuDesat'));
else
menuBG = new FlxSprite().makeGraphic(128630, FlxColor.fromString("#E1E1E1"), false, "optimizedMenuDesat");
menuBG = new FlxSprite().makeGraphic(1286, 730, FlxColor.fromString("#E1E1E1"), false, "optimizedMenuDesat");

menuBG.color = 0xFFea71fd;
menuBG.setGraphicSize(Std.int(menuBG.width * 1.1));
Expand Down

0 comments on commit 0bb36a7

Please sign in to comment.