Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blend Modes in Stage Editor #15735

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Blend Modes in Stage Editor #15735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6a9b60
blend modes in stage editor
DMMaster636 Oct 16, 2024
6fa3e2a
thank vscode for not pushing this :I
DMMaster636 Oct 17, 2024
3366b9c
we want to update the sprites AFTER updating the stage data (fix for …
DMMaster636 Oct 17, 2024
72cfc14
i forgot LuaUtils had that, so let's improve it!
DMMaster636 Oct 18, 2024
cc74f08
whoops... forgot the most important thing
DMMaster636 Oct 18, 2024
bfd88f3
Merge branch 'ShadowMario:main' into main
DMMaster636 Oct 25, 2024
7f6dcf6
Merge branch 'ShadowMario:main' into main
DMMaster636 Nov 2, 2024
44bb04e
Merge branch 'ShadowMario:main' into main
DMMaster636 Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion source/backend/CoolUtil.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import lime.utils.Assets as LimeAssets;

class CoolUtil
{
inline public static function quantize(f:Float, snap:Float){
inline public static function quantize(f:Float, snap:Float)
{
// changed so this actually works lol
var m:Float = Math.fround(f * snap);
//trace(snap);
Expand Down
2 changes: 2 additions & 0 deletions source/backend/StageData.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import openfl.utils.Assets;
import haxe.Json;
import backend.Song;
import psychlua.ModchartSprite;
import psychlua.LuaUtils;

typedef StageFile = {
var directory:String;
Expand Down Expand Up @@ -195,6 +196,7 @@ class StageData {
}
spr.scrollFactor.set(data.scroll[0], data.scroll[1]);
spr.color = CoolUtil.colorFromString(data.color);
spr.blend = LuaUtils.blendModeFromString(data.blend);

for (varName in ['alpha', 'angle'])
{
Expand Down
41 changes: 31 additions & 10 deletions source/states/editors/StageEditorState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,7 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
var showSelectionQuad:Bool = true;
function addHelpScreen()
{
#if FLX_DEBUG
var btn = 'F3';
#else
var btn = 'F2';
#end
final btn = #if FLX_DEBUG 'F3' #else 'F2' #end;

var str:Array<String> = ["E/Q - Camera Zoom In/Out",
"J/K/L/I - Move Camera",
Expand Down Expand Up @@ -768,6 +764,8 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
var lowQualityCheckbox:PsychUICheckBox;
var highQualityCheckbox:PsychUICheckBox;

var blendDropDown:PsychUIDropDownMenu;

function getSelected(blockReserved:Bool = true)
{
var selected:Int = spriteListRadioGroup.checked;
Expand Down Expand Up @@ -936,9 +934,22 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
};
tab_group.add(angleStepper);

final blendList:Array<String> = [
'normal', 'add', 'alpha', 'darken', 'difference', 'erase', 'hardlight', 'invert',
'layer', 'lighten', 'multiply', 'overlay', 'screen', 'shader', 'subtract'
];
tab_group.add(new FlxText(objX + 90, objY - 18, 80, 'Blend Mode:'));
blendDropDown = new PsychUIDropDownMenu(objX + 90, objY, blendList, function(sel:Int, value:String) {
// blend mode
var selected = getSelected();
if(selected != null)
selected.blend = value;
});
blendDropDown.selectedLabel = blendList[0];

function updateFlip()
{
//flip X and flip Y
// flip X and flip Y
var selected = getSelected();
if(selected != null)
{
Expand Down Expand Up @@ -983,6 +994,8 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
highQualityCheckbox.onClick = recalcFilter;
tab_group.add(lowQualityCheckbox);
tab_group.add(highQualityCheckbox);

tab_group.add(blendDropDown);
}

var oppDropdown:PsychUIDropDownMenu;
Expand Down Expand Up @@ -1105,8 +1118,8 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
#end

stageJson = StageData.getStageFile(lastLoadedStage);
updateSpriteList();
updateStageDataUI();
updateSpriteList();
reloadCharacters();
reloadStageDropDown();
});
Expand All @@ -1118,8 +1131,8 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
#end

stageJson = StageData.dummy();
updateSpriteList();
updateStageDataUI();
updateSpriteList();
reloadCharacters();
});
dummyStage.normalStyle.bgColor = FlxColor.RED;
Expand All @@ -1140,8 +1153,8 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
#if DISCORD_ALLOWED
DiscordClient.changePresence('Stage Editor', 'Stage: ' + lastLoadedStage);
#end
updateSpriteList();
updateStageDataUI();
updateSpriteList();
reloadCharacters();
reloadStageDropDown();
}
Expand Down Expand Up @@ -1250,6 +1263,7 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
scrollStepperY.value = selected.scroll[1];
angleStepper.value = selected.angle;
alphaStepper.value = selected.alpha;
blendDropDown.selectedLabel = selected.blend;

// Checkboxes
antialiasingCheckbox.checked = selected.antialiasing;
Expand Down Expand Up @@ -1859,6 +1873,12 @@ class StageEditorMetaSprite
function get_angle() return sprite.angle;
function set_angle(v:Float) return (sprite.angle = v);

public var blend(default, set):String = 'normal';
function set_blend(v:String)
{
sprite.blend = LuaUtils.blendModeFromString(v);
return (blend = v);
}
public var color(default, set):String = 'FFFFFF';
function set_color(v:String)
{
Expand Down Expand Up @@ -1927,7 +1947,7 @@ class StageEditorMetaSprite
switch(this.type)
{
case 'sprite', 'square', 'animatedSprite':
for (v in ['name', 'image', 'scale', 'scroll', 'color', 'filters', 'antialiasing'])
for (v in ['name', 'image', 'scale', 'scroll', 'color', 'blend', 'filters', 'antialiasing'])
{
var dat:Dynamic = Reflect.field(data, v);
if(dat != null) Reflect.setField(this, v, dat);
Expand Down Expand Up @@ -1955,6 +1975,7 @@ class StageEditorMetaSprite
obj.alpha = alpha;
obj.angle = angle;
obj.color = color;
obj.blend = blend;
obj.filters = filters;

if(type != 'square')
Expand Down
Loading