Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

stage loading rework

Browse source
This commit is contained in:
Cameron Taylor 2021-08-27 18:08:01 -04:00
parent d1871761d9
commit a032109efd
2 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
source/PlayState.hx
View file

@ -606,28 +606,7 @@ class PlayState extends MusicBeatState
foregroundSprites.add(fgTank3);
default:
defaultCamZoom *= 0.9;
curStage = 'stage';
var bg:BGSprite = new BGSprite('stageback', -600, -200, 0.9, 0.9);
add(bg);
var stageFront:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront'));
stageFront.setGraphicSize(Std.int(stageFront.width * 1.1));
stageFront.updateHitbox();
stageFront.antialiasing = true;
stageFront.scrollFactor.set(0.9, 0.9);
stageFront.active = false;
add(stageFront);
var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains'));
stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9));
stageCurtains.updateHitbox();
stageCurtains.antialiasing = true;
stageCurtains.scrollFactor.set(1.3, 1.3);
stageCurtains.active = false;
add(stageCurtains);
loadStage('stage');
}
var gfVersion:String = 'gf';
@ -1032,6 +1011,29 @@ class PlayState extends MusicBeatState
});*/
}
function loadStage(path:String)
{
curStage = path;
var json = Assets.getText(Paths.file('data/stagedata/$path.json'));
var parsed:StageData = cast Json.parse(json);
defaultCamZoom *= parsed.camZoom;
for (prop in parsed.propsBackground)
{
var funnyProp:BGSprite = new BGSprite(prop.path, prop.x, prop.y, prop.scrollX, prop.scrollY);
funnyProp.setGraphicSize(Std.int(funnyProp.width * prop.scaleX), Std.int(funnyProp.height * prop.scaleY));
funnyProp.updateHitbox();
funnyProp.scrollFactor.set(prop.scrollX, prop.scrollY);
add(funnyProp);
}
trace(parsed.propsBackground);
}
function gunsIntro()
{
inCutscene = true;
@ -3216,3 +3218,21 @@ class PlayState extends MusicBeatState
var curLight:Int = 0;
}
typedef StageData =
{
var camZoom:Float;
var propsBackground:Array<Props>;
}
typedef Props =
{
var x:Float;
var y:Float;
var scrollX:Float;
var scrollY:Float;
var propname:String;
var path:String;
var scaleX:Float;
var scaleY:Float;
}

2
source/shaderslmfao/OverlayBlend.hx
View file

@ -37,7 +37,7 @@ class OverlayBlend extends FlxShader
{
vec4 mixed = mix(1.0 - 2.0 * (1.0 - base) * (1.0 - blend), 2.0 * base * blend, step(base, vec4(0.5)));
// mixed = mix(mixed, blend, base.a); // proper alpha mixing
// mixed = mix(mixed, blend, base.a); // proper alpha mixing?
return mixed;
}