cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-10-31 16:34:48 +00:00
Code Issues Releases Wiki Activity

Fix character camera offsets embedded in stage data (#218)

Browse source 
* Make StageDataCharacter attributes mandatory, and remove defaults.

* Update character files

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
This commit is contained in:
Eric 2023-11-20 10:46:09 -05:00 committed by GitHub
parent 260f1bd265
commit 4406677be7
2 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 3b05b0fdd8e3b2cd09b9e4e415c186bae8e3b7d3
Subproject commit 62ae1154ba7d751c96cea208c8f2e2d841a4f1c6

21
source/funkin/play/stage/StageData.hx
View file

@ -364,12 +364,10 @@ class StageDataParser
if (input.characters.bf == null)
{
input.characters.bf = DEFAULT_CHARACTER_DATA;
input.characters.bf.cameraOffsets = DEFAULT_CAMERA_OFFSETS_BF;
}
if (input.characters.dad == null)
{
input.characters.dad = DEFAULT_CHARACTER_DATA;
input.characters.dad.cameraOffsets = DEFAULT_CAMERA_OFFSETS_DAD;
}
if (input.characters.gf == null)
{
@ -378,23 +376,10 @@ class StageDataParser
for (inputCharacter in [input.characters.bf, input.characters.dad, input.characters.gf])
{
if (inputCharacter.zIndex == null)
{
inputCharacter.zIndex = 0;
}
if (inputCharacter.position == null || inputCharacter.position.length != 2)
{
inputCharacter.position = [0, 0];
}
if (inputCharacter.cameraOffsets == null || inputCharacter.cameraOffsets.length != 2)
{
if (inputCharacter == input.characters.bf) inputCharacter.cameraOffsets = DEFAULT_CAMERA_OFFSETS_BF;
else if (inputCharacter == input.characters.dad) inputCharacter.cameraOffsets = DEFAULT_CAMERA_OFFSETS_DAD;
else
{
inputCharacter.cameraOffsets = [0, 0];
}
}
}
// All good!
@ -547,22 +532,16 @@ typedef StageDataCharacter =
* Again, just like CSS.
* @default 0
*/
@:optional
@:default(0)
var zIndex:Int;
/**
* The position to render the character at.
*/
@:optional
@:default([0, 0])
var position:Array<Float>;
/**
* The camera offsets to apply when focusing on the character on this stage.
* @default [-100, -100] for BF, [100, -100] for DAD/OPPONENT, [0, 0] for GF
*/
@:optional
@:default([0, 0])
var cameraOffsets:Array<Float>;
};