gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into base-fnf-port-remake

Browse Source
This commit is contained in:
Ne_Eo
2024-10-02 21:27:45 +02:00
parent 78d5e4e285 fc0a39fa6a
commit 4e4ebf5eb1
5 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/FlxAnimate.hx
+6 -3
View File
@@ -25,10 +25,13 @@ class FlxAnimate extends flxanimate.FlxAnimate {
if (limb != _pivot) {
if (frameOffsetAngle != null && frameOffsetAngle != angle)
{
var angleOff = (-angle + frameOffsetAngle) * FlxAngle.TO_RAD;
rMatrix.rotate(-angleOff);
var angleOff = (frameOffsetAngle - angle) * FlxAngle.TO_RAD;
var cos = Math.cos(angleOff);
var sin = Math.sin(angleOff);
// cos doesnt need to be negated
rMatrix.rotateWithTrig(cos, -sin);
rMatrix.translate(-frameOffset.x, -frameOffset.y);
rMatrix.rotate(angleOff);
rMatrix.rotateWithTrig(cos, sin);
}
else
{
source/funkin/backend/assets/Paths.hx
+6 -4
View File
@@ -71,15 +71,17 @@ class Paths
inline static public function voices(song:String, ?difficulty:String, ?prefix:String = "", ?ext:String) {
if (difficulty == null) difficulty = Constants.DEFAULT_DIFFICULTY;
if (ext == null) ext = Constants.SOUND_EXT;
var diff = getPath('songs/${song.toLowerCase()}/song/Voices$prefix-${difficulty.toLowerCase()}.${ext}', null);
return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/song/Voices$prefix.${ext}', null);
song = song.toLowerCase();
var diff = getPath('songs/$song/song/Voices$prefix-${difficulty.toLowerCase()}.${ext}', null);
return OpenFlAssets.exists(diff) ? diff : getPath('songs/$song/song/Voices$prefix.${ext}', null);
}
inline static public function inst(song:String, ?difficulty:String, ?prefix:String = "", ?ext:String) {
if (difficulty == null) difficulty = Constants.DEFAULT_DIFFICULTY;
if (ext == null) ext = Constants.SOUND_EXT;
var diff = getPath('songs/${song.toLowerCase()}/song/Inst$prefix-${difficulty.toLowerCase()}.${ext}', null);
return OpenFlAssets.exists(diff) ? diff : getPath('songs/${song.toLowerCase()}/song/Inst$prefix.${ext}', null);
song = song.toLowerCase();
var diff = getPath('songs/$song/song/Inst$prefix-${difficulty.toLowerCase()}.${ext}', null);
return OpenFlAssets.exists(diff) ? diff : getPath('songs/$song/song/Inst$prefix.${ext}', null);
}
static public function image(key:String, ?library:String, checkForAtlas:Bool = false, ?ext:String) {
source/funkin/backend/chart/FNFLegacyParser.hx
+1 -1
View File
@@ -226,7 +226,7 @@ typedef SwagSong =
typedef SwagSection =
{
var sectionNotes:Array<Dynamic>;
var sectionNotes:Array<Array<Dynamic>>;
var lengthInSteps:Int;
var ?sectionBeats:Float;
var ?typeOfSection:Int;