From 0f342505a32590b788ef6c852ee8de28557ea150 Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:32:16 -0700 Subject: [PATCH] stuff --- .../images/editors/character/edit-button.png | Bin 213 -> 252 bytes assets/images/editors/character/ghost.png | Bin 248 -> 254 bytes assets/images/editors/character/play.png | Bin 0 -> 210 bytes .../editors/character/CharacterAnimButton.hx | 39 +++++++++++------- .../editors/character/CharacterAnimsWindow.hx | 2 - 5 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 assets/images/editors/character/play.png diff --git a/assets/images/editors/character/edit-button.png b/assets/images/editors/character/edit-button.png index 47991177cde47a074dfaf756c9014ba9fb18df7e..60063bd8d3004ff3fb8008196038200d59ce6909 100644 GIT binary patch literal 252 zcmVPx#wn;=mR49>^ki8CqFcgJ9O=MxBiy>^jgro1_z|2!QFz_CXyaX{ZNN{K;6XJ3m zBu$}F>PhaTGz^#9@(9Rd>a%>#D>>WLNC_{*;5NN(-t={GKWoH#tP) zlp_g6#Jr{f=Nw6z@s*{ysR4s=4CB+0QgK!5{g%o3$57fKptxyusBM70kR86v1pJBIPSq4;gA)V3k_}R P00000NkvXXu0mjfA%$G2 delta 207 zcmV;=05Jdl0r&xsF@Lg2L_t(Ijm4AA4Z|P|g&)0_3sD!z6uICToJ}%CX6%8B7jREV zp#kwD)P52&vdDYpi2#4b6#6>w&5%Y;Ohx3@wAOZ+hY)T}=Ui1oMMME;B<^Fs(Oh$c z5ULte2Jqgis%C4`06BUSh^7(meKvtdNyQkGtR9#d%esMx07w8tgk{~p%=PKN6A-+H z64;M3(b^UFrY; diff --git a/assets/images/editors/character/play.png b/assets/images/editors/character/play.png new file mode 100644 index 0000000000000000000000000000000000000000..3bbac62a91f92217cf4df76c75a8817abcbf6d71 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9DaPU;cPEB*=VV?2IX#{(jv*Qo zr}l5;J>($3@?6!Np^-Vrg)`)XXpQE&BPC7@nnGJ19N}EDWusrkPu2bXpWT-4y?rq* zVOp2vgOJJ = []; @@ -88,15 +87,13 @@ class CharacterAnimButton extends UIButton { members.push(indicesTextBox); addLabelOn(indicesTextBox, "Indices (frames)", 12); - editIcon = new FlxSprite().loadGraphic(Paths.image('editors/character/edit-button'), true, 16, 16); - editIcon.animation.add("open", [0]); - editIcon.animation.add("closed", [1]); - editIcon.animation.play("closed"); - editIcon.antialiasing = false; - editIcon.updateHitbox(); - members.push(editIcon); + playIcon = new FlxSprite(x-(10+16), y+8).loadGraphic(Paths.image("editors/character/play")); + // playIcon.color = 0xFFD60E0E; + playIcon.antialiasing = false; + members.push(playIcon); deleteButton = new UIButton(0, 0, "", null, 28*2,24); + deleteButton.frames = Paths.getFrames("editors/ui/grayscale-button"); deleteButton.color = 0xFFAC3D3D; members.push(deleteButton); @@ -105,7 +102,18 @@ class CharacterAnimButton extends UIButton { deleteIcon.antialiasing = false; members.push(deleteIcon); - ghostButton = new UIButton(0, 0, "", null, 28,24); + editButton = new UIButton(0, 0, "", null, 28,24); + editButton.frames = Paths.getFrames("editors/ui/grayscale-button"); + editButton.color = 0xFFAFAA12; + members.push(editButton); + + editIcon = new FlxSprite().loadGraphic(Paths.image('editors/character/edit-button')); + editIcon.color = 0xFFE8E801; + editIcon.antialiasing = false; + members.push(editIcon); + + ghostButton = new UIButton(0, 0, "", null, 28, 24); + ghostButton.frames = Paths.getFrames("editors/ui/grayscale-button"); ghostButton.color = 0xFFADADAD; ghostButton.alpha = 0.5; members.push(ghostButton); @@ -120,13 +128,16 @@ class CharacterAnimButton extends UIButton { } public override function update(elapsed:Float) { - editIcon.follow(this, 22, 18); - field.follow(this, 22+16+8, 17); + playIcon.follow(this, 22, 19); + field.follow(this, 22+15+8, 16); deleteButton.follow(this, (500-16-32)-16-(28*2), 14); deleteIcon.follow(deleteButton, (deleteButton.bWidth/2)-6.5, (deleteButton.bHeight/2)-6); - ghostButton.follow(this, (500-16-32)-16-(28*2)-16-28, 14); + editButton.follow(this, (500-16-32)-16-(28*2)-12-28, 14); + editIcon.follow(editButton, (editButton.bWidth/2)-8, (editButton.bHeight/2)-6); + + ghostButton.follow(this, (500-16-32)-16-(28*2)-12-28-12-28, 14); ghostIcon.follow(ghostButton, (ghostButton.bWidth/2)-8, (ghostButton.bHeight/2)-6); animationDisplayBG.follow(this, 16, 8+32+8+2+11); diff --git a/source/funkin/editors/character/CharacterAnimsWindow.hx b/source/funkin/editors/character/CharacterAnimsWindow.hx index d801298b..7454079d 100644 --- a/source/funkin/editors/character/CharacterAnimsWindow.hx +++ b/source/funkin/editors/character/CharacterAnimsWindow.hx @@ -44,6 +44,4 @@ class CharacterAnimsWindow extends UIButtonList { for (anim in character.getAnimOrder()) add(new CharacterAnimButton(0,0, character.animDatas.get(anim), this)); } - - } \ No newline at end of file